commit 8c118b4ec5f81c5fc32da59f73e456cb439ea651
Author: liaoxinyu <liaoxinyu@xingtongworld.com>
Date:   Fri Nov 22 17:39:32 2024 +0800

    初始化项目

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d4f7eaf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,47 @@
+# ---> Node
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+#node_modules
+dist
+
+.idea
+.vscode
+.buildpath
+.project
+.settings
+.DS_Store
+.hbuilderx
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+Thumbs.db
+yarn.lock
+#package-lock.json
+src/unpackage
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..472524f
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,1136 @@
+<script>
+	var siteInfo = require("./siteinfo.js");
+	export default {
+		globalData: {
+			pre_url: '',
+			baseurl: '',
+			session_id:'',
+			aid: 0,
+			mid: 0,
+			pid:0,
+			uploadSize:2,
+			needAuth: 0,
+			platform: 'wx',
+			platform2:'',
+			isdouyin:0,
+			sysset:[],
+			indexurl: '/pages/index/index',
+			menudata: [],
+			menu2data: [],
+			currentIndex:-1,
+			initdata:{},
+			textset: [],
+			isinit:false,
+			socketOpen:false,
+			socket_token:'',
+			socketMsgQueue:[],
+			socketConnecttimes:0,
+			scene:0,
+			homeNavigationCustom:0,
+			usercenterNavigationCustom:0,
+			navigationBarBackgroundColor:'#ffffff',
+			navigationBarTextStyle:'black',
+			event_url: siteInfo.siteroot,
+			imdmg: true,
+			imglist: [],
+			imginx: 0,
+		},
+		onLaunch: function(options) {
+			var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
+			if (extConfig && extConfig.aid) {
+				this.globalData.aid = extConfig.aid;
+				this.globalData.pre_url = extConfig.baseurl;
+				this.globalData.homeNavigationCustom = extConfig.homeNavigationCustom || 0;
+				this.globalData.usercenterNavigationCustom = extConfig.usercenterNavigationCustom || 0;
+				this.globalData.navigationBarBackgroundColor = extConfig.navigationBarBackgroundColor || '#ffffff';
+				this.globalData.navigationBarTextStyle = extConfig.navigationBarTextStyle || 'black';
+			} else {
+				var siteInfo = require("./siteinfo.js");
+				this.globalData.aid = siteInfo.uniacid;
+				this.globalData.pre_url = siteInfo.siteroot;
+				this.globalData.homeNavigationCustom = siteInfo.homeNavigationCustom || 0;
+				this.globalData.usercenterNavigationCustom = siteInfo.usercenterNavigationCustom || 0;
+				this.globalData.navigationBarBackgroundColor = siteInfo.navigationBarBackgroundColor || '#ffffff';
+				this.globalData.navigationBarTextStyle = siteInfo.navigationBarTextStyle || 'black';
+			}
+			this.globalData.baseurl = this.globalData.pre_url + '/?s=/';
+			this.globalData.session_id = uni.getStorageSync('session_id');
+			var opts = this.getopts(options.query);
+			if (opts && opts.pid){
+				this.globalData.pid = opts.pid;
+			}
+			// #ifdef APP-PLUS
+			this.globalData.platform = 'app';
+			var app = this;
+			uni.getSystemInfo({
+				success: function (res) {
+					app.globalData.platform2 = res.platform;
+				}
+			})
+			// #endif
+			// #ifdef H5
+			this.globalData.platform = 'h5'; 
+			if (navigator.userAgent.indexOf('MicroMessenger')>-1) {
+				this.globalData.platform = 'mp';
+			}
+			// #endif
+			// #ifdef MP-WEIXIN
+			this.globalData.platform = 'wx';
+			this.checkUpdateVersion();
+			// #endif
+			// #ifdef MP-ALIPAY
+			this.globalData.platform = 'alipay';
+			// #endif
+			// #ifdef MP-BAIDU
+			this.globalData.platform = 'baidu';
+			// #endif
+			// #ifdef MP-TOUTIAO
+			this.globalData.platform = 'toutiao';
+			var sysinfo = tt.getSystemInfoSync();
+			if(sysinfo.appName == 'Douyin'){
+				this.globalData.isdouyin = 1;
+			}
+			// #endif
+			// #ifdef MP-QQ
+			this.globalData.platform = 'qq';
+			// #endif
+			console.log(this.globalData.platform);
+		},
+		onShow: function(options) {
+			this.getUploadSize()
+			var that = this;
+			console.log('onShow');
+			console.log(options);
+			console.log('---------xxxx');
+			if(options && options.scene){
+				this.globalData.scene = options.scene;
+			}
+			// #ifdef MP-WEIXIN
+			// 分享卡片/订阅消息/扫码二维码/广告/朋友圈等场景才能调用getShareParams接口获取以下参数
+			const sceneList = [1007, 1008, 1014, 1044, 1045, 1046, 1047, 1048, 1049, 1073, 1154, 1155];
+			if(sceneList.includes(this.globalData.scene)){
+				console.log('---------00')
+				try{
+					let livePlayer = requirePlugin('live-player-plugin');
+					console.log(livePlayer)
+					console.log('---------11');
+					livePlayer.getShareParams().then(res => {
+						let custom_params = res.custom_params;
+						console.log(custom_params)
+						if(custom_params && custom_params.pid){
+							that.globalData.pid = custom_params.pid;
+						}
+					}).catch(err => {
+							console.log('get share params err ', err);
+					});
+				}catch(e){
+					console.log('live-player-plugin err ', e);
+				}
+			}
+			// #endif
+		},
+		methods:{
+			getUploadSize(){
+				
+				this.post('apiHome/getSet',{},(res)=>{
+					
+					this.globalData.uploadSize =Number(res.data.UploadSize);
+				})
+			},
+			getopts:function(opt){
+				if(opt && opt.scene){
+					var scene = opt.scene
+					var scenes = scene.split('-');
+					var opts = {};
+					for(var i in scenes){
+						var thisscenes = scenes[i].split('_');
+						opts[thisscenes[0]] = thisscenes[1];
+					}
+					return opts;
+				}else{
+					return opt
+				}
+			},
+			alert: function(content, confirmfun) {
+				uni.showModal({
+					title: '提示信息',
+					showCancel: false,
+					content: content.toString(),
+					success: function(res) {
+						if (res.confirm) {
+							typeof confirmfun == 'function' && confirmfun();
+						}
+					}
+				});
+			},
+			confirm: function(content, confirmfun, cancelfun) {
+				uni.showModal({
+					title: '操作确认',
+					content: content.toString(),
+					showCancel: true,
+					success: function(res) {
+						if (res.confirm) {
+							typeof confirmfun == 'function' && confirmfun();
+						} else {
+							typeof cancelfun == 'function' && cancelfun();
+						}
+					}
+				});
+			},
+			success: function(title,successfun) {
+				if (undefined == title) title = '操作成功';
+				var title = title.toString();
+				uni.showToast({
+					title: title,
+					icon: (title.length > 8 ? 'none' : 'success'),
+					success: function(res) {
+						typeof successfun == 'function' && successfun();
+					}
+				});
+			},
+			error: function(title, duration) {
+				if (title === false) {
+					uni.hideToast();
+				} else {
+					if (this.isNull(duration)) duration = 2500;
+					if (undefined == title) title = '操作失败';
+					uni.showToast({
+						title: title.toString(),
+						icon: 'none',
+						duration: duration
+					});
+				}
+			},
+			showLoading: function(title) {
+				if (title === false) {
+					uni.hideLoading();
+				} else {
+					if (undefined == title) title = '加载中';
+					uni.showLoading({
+						title: title.toString(),
+						mask: true
+					});
+				}
+			},
+			inArray: function(search, array) {
+				for (var i in array) {
+					if (array[i] == search) {
+						return true;
+					}
+				}
+				return false;
+			},
+			isNull: function(e) {
+				return e == undefined || e == "undefined" || e == null || e == "";
+			},
+			parseJSON: function(e) {
+				try {
+					return JSON.parse(e);
+				} catch (t) {
+					return undefined;
+				}
+			},
+			getparams:function(url){
+				if(url.indexOf('?') === -1) return {};
+				var query = url.split('?')[1];
+				var vars = query.split("&");
+				var params = {};
+				for (var i=0;i<vars.length;i++) {
+					var pair = vars[i].split("=");
+					params[pair[0]] = pair[1];
+				}
+				return params;
+			},
+			goto: function(tourl, opentype) {
+				var app = this;
+				var params = app.getparams(tourl);
+				console.log(params);
+				if(params && params.reloadthispage == 1){
+					var thispage = getCurrentPages().pop();
+					thispage.$vm.opt = params;
+					thispage.$vm.getdata();
+					return;
+				}
+				if (app.isNull(opentype) && tourl) {
+					//var currentIndex = -1;
+					var tablist = app.globalData.menudata['list'];
+					if (tablist) {
+						for (var i = 0; i < tablist.length; i++) {
+							if (tablist[i]['pagePath'] == tourl) {
+								opentype = 'reLaunch';
+							}
+						}
+					}
+				}
+				if (tourl.indexOf('pages/') === 0) tourl = '/' + tourl;
+				if(app.globalData.isdouyin == 1 && tourl.indexOf('/pages/shop/product') === 0){
+					app.showLoading('加载中');
+					app.post('ApiShop/getDouyinProductId',{proid:params.id},function(res){
+						app.showLoading(false);
+						if(res.status == 1){
+							tt.openEcGood({promotionId:res.douyin_product_id,fail:function(res2){
+								app.alert(res2.errMsg)
+							}});
+						}else{
+							app.alert(res.msg)
+						}
+					});
+					return;
+				}
+				if(app.globalData.platform == 'wx' && tourl.indexOf('https://work.weixin.qq.com/kfid/') === 0){
+					wx.openCustomerServiceChat({extInfo:{url:tourl},corpId:app.globalData.initdata.corpid});return;
+				}
+				if(tourl == 'scan::'){
+					if(app.globalData.platform == 'h5'){
+						app.alert('请使用微信扫一扫功能扫码');return;
+					}else if(app.globalData.platform == 'mp'){
+						var jweixin = require('jweixin-module');
+						jweixin.ready(function () {   //需在用户可能点击分享按钮前就先调用
+							jweixin.scanQRCode({
+								needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+								scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+								success: function (res) {
+									var content = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+									//app.goto(content);
+								}
+							});
+						});
+					}else{
+						uni.scanCode({
+							success: function (res) {
+								console.log(res);
+								if(res.path){
+									app.goto('/'+res.path);
+								}else{
+									var content = res.result;
+									app.goto(content);
+								}
+							}
+						});
+					}
+					return;
+				}
+				if(tourl == 'share::'){
+					if(app.globalData.platform=='h5'||app.globalData.platform=='mp'){
+						app.error('点击右上角发送给好友或分享到朋友圈');
+					}
+					if(app.globalData.platform=='app'){
+						uni.showActionSheet({
+							itemList: ['发送给微信好友', '分享到微信朋友圈'],
+							success: function (res){
+								if(res.tapIndex >= 0){
+									var scene = 'WXSceneSession';
+									if (res.tapIndex == 1) {
+										scene = 'WXSenceTimeline';
+									}
+									var sharedata = {};
+									sharedata.provider = 'weixin';
+									sharedata.type = 0;
+									sharedata.scene = scene;
+									sharedata.title = app.globalData.initdata.name;
+									var fullurl = app._fullurl();
+									if(app.globalData.mid>0){
+										fullurl += (fullurl.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid
+									}
+									sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+fullurl;
+									sharedata.imageUrl = app.globalData.initdata.logo;
+									sharedata.summary = app.globalData.initdata.desc;
+									uni.share(sharedata);
+								}
+							}
+						});
+					}
+					return;
+				}
+				if (!tourl || tourl == 'contact::' || tourl == 'share::') return;
+				if (tourl.indexOf('tel::') === 0) {
+					//打电话
+					tourl = tourl.slice(5);
+					uni.makePhoneCall({
+						phoneNumber: tourl
+					});
+					return;
+				}
+				if (tourl.indexOf('tel:') === 0) {
+					//打电话
+					tourl = tourl.slice(4);
+					uni.makePhoneCall({
+						phoneNumber: tourl
+					});
+					return;
+				}
+				if (tourl.indexOf('url::') === 0) {  //外部链接
+					if(app.globalData.platform=='h5'||app.globalData.platform=='mp'){
+						location.href = tourl.slice(5);
+					}else{
+						tourl = '/pages/index/webView?url=' + encodeURIComponent(tourl.slice(5));
+					}
+				}
+				if (tourl.indexOf('https://') === 0 || tourl.indexOf('http://') === 0) {  //外部链接
+					if(app.globalData.platform=='h5'||app.globalData.platform=='mp'){
+						location.href = tourl;
+					}else{
+						tourl = '/pages/index/webView?url=' + encodeURIComponent(tourl);
+					}
+				}
+				if (tourl.indexOf('miniProgram::') === 0) {
+					//其他小程序
+					tourl = tourl.slice(13);
+					var tourlArr = tourl.split('|'); //console.log(tourlArr)
+			
+					uni.navigateToMiniProgram({
+						appId: tourlArr[0],
+						path: tourlArr[1] ? tourlArr[1] : '',
+						complete:function(){
+							if(tourlArr[2]){
+								app.goto(tourlArr[2]);
+							}
+						}
+					});
+					return;
+				}
+				if (tourl == 'getmembercard::') {
+					//领取会员卡
+					app.post('ApiCoupon/getmembercardparam', {
+						card_id: ''
+					}, function(res) {
+						if (res.status == 0) {
+							app.alert(res.msg);
+							return;
+						}
+						if(app.globalData.platform=='wx'){
+							uni.navigateToMiniProgram({
+								appId: 'wxeb490c6f9b154ef9',
+								// 固定为此appid，不可改动
+								extraData: res.extraData,
+								// 包括encrypt_card_id outer_str biz三个字段，须从step3中获得的链接中获取参数
+								success: function() {},
+								fail: function() {},
+								complete: function() {}
+							});
+						}else{
+							location.href = res.ret_url;
+						}
+					});
+					return;
+				}
+				if (tourl.indexOf('location::') === 0) {
+					//坐标导航
+					tourl = tourl.slice(10);
+					var tourlArr = tourl.split('|');
+					var jwd = tourlArr[1].split(',');
+					uni.openLocation({
+						latitude: parseFloat(jwd[1]),
+						longitude: parseFloat(jwd[0]),
+						name: tourlArr[0],
+						scale: 13
+					});
+					return;
+				}
+				if(tourl.indexOf('plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin') === 0){
+					//小程序直播 带参数
+					tourl = tourl + '&custom_params='+encodeURIComponent(JSON.stringify({pid:app.globalData.mid}));
+				}
+				if (app.isNull(opentype)){
+					var mv = tourl.split("?");
+					var urlpath = mv[0];
+					if (app.globalData.platform=='h5' && urlpath == app._fullurl()) {
+						opentype = 'reLaunch';
+					} else {
+						opentype = 'navigate';
+					}
+				}
+				if (opentype == 'switchTab') {
+					var args = new Object();
+					var name, value;
+					var url = tourl; //跳转链接
+					var num = url.indexOf("?");
+					if (num >= 0) {
+						var urlbase = url.substr(0, num);
+						var str = url.substr(num + 1); //取得所有参数
+			
+						var arr = str.split("&"); //各个参数放到数组里
+			
+						for (var i = 0; i < arr.length; i++) {
+							num = arr[i].indexOf("=");
+			
+							if (num > 0) {
+								name = arr[i].substring(0, num);
+								value = arr[i].substr(num + 1);
+								args[name] = value;
+							}
+						}
+						uni.switchTab({
+							url: urlbase,
+							success: function(e) {
+								var page = getCurrentPages().pop();
+								if (page == undefined || page == null) return;
+								page.onLoad(args);
+							}
+						});
+					} else {
+						uni.switchTab({
+							url: tourl
+						});
+					}
+				} else if (opentype == 'redirect' || opentype == 'redirectTo') {
+					uni.redirectTo({
+						url: tourl
+					});
+				} else if (opentype == 'reLaunch') {
+					uni.reLaunch({
+						url: tourl
+					});
+				} else {
+					var pages = getCurrentPages();
+			
+					if (pages.length >= 10) {
+						uni.redirectTo({
+							url: tourl
+						});
+					} else {
+						uni.navigateTo({
+							url: tourl
+						});
+					}
+				}
+			},
+			goback: function(isreload) {
+				var app = this;
+				var pages = getCurrentPages();
+				if (isreload && pages.length > 1) {
+					var prePage = pages[pages.length - 2];
+					prePage.$vm.getdata();
+				}
+				if (pages.length == 1) {
+					app.goto(app.globalData.indexurl,'reLaunch');
+				}else{
+					uni.navigateBack({
+						fail: function() {
+							app.goto(app.globalData.indexurl,'reLaunch');
+						}
+					});
+				}
+			},
+			post: function(url, param, callback) {
+				this.request('POST',url, param, callback);
+			},
+			get: function(url, param, callback){
+				this.request('GET',url, param, callback);
+			},
+			request:function(method, url, param, callback){
+				var oldurl = url;
+				var app = this;
+				if (url.substring(0, 8) != 'https://') {
+					url = app.globalData.baseurl + url;
+					url += (url.indexOf('?') > 0 ? '&' : '?') + 'aid=' + app.globalData.aid + '&platform=' + app.globalData.platform + '&session_id=' + app.globalData.session_id+'&pid='+app.globalData.pid;
+					if(app.globalData.isdouyin == 1){
+						url += '&isdouyin=1';
+					}
+					if(!app.globalData.isinit){
+						url += '&needinit=1';
+					}
+				}
+				uni.request({
+					url: url,
+					//仅为示例，并非真实的接口地址
+					data: param,
+					method: method,
+					success: function(res) {
+						app.setinitdata(res);
+						if (res.data && res.data.status == -1) { //跳转登录页
+							app.showLoading(false);
+							var pages = getCurrentPages();
+							var currentPage = pages[pages.length - 1];
+							currentPage.$vm.loading = false;
+							var frompage = '';
+							var nowurl = app._url();
+							
+							if(nowurl != '/pages/index/login' && nowurl != '/pages/index/reg' && nowurl != '/pages/index/getpwd'){
+								var frompage = encodeURIComponent(app._fullurl());
+							}
+							if(res.data.authlogin == 1){
+								app.authlogin(function(res2){
+									if(res2.status == 1){
+										if(res2.msg) app.success(res2.msg);
+										currentPage.$vm.getdata();
+									}else if(res2.status == 2){
+											app.goto('/pages/index/login?frompage='+frompage+'&logintype=4&login_bind=1', 'reLaunch');
+									}else{
+										console.log(res2);
+										app.goto('/pages/index/login?frompage='+frompage, 'reLaunch');
+									}
+								});
+							}else{
+								app.goto('/pages/index/login?frompage='+frompage, 'reLaunch');
+								return;
+							}
+						} else if (res.data && res.data.status == -10) { //跳转管理员登录
+							app.showLoading(false);
+							var pages = getCurrentPages();
+							var currentPage = pages[pages.length - 1];
+							currentPage.$vm.loading = false
+							//管理员登录
+							app.goto('/admin/index/login', 'redirect');
+						} else if (res.data && res.data.status == -2) { //公众号或h5跳转
+							app.showLoading(false);
+							var pages = getCurrentPages();
+							var currentPage = pages[pages.length - 1];
+							currentPage.$vm.loading = false
+							//跳转
+							location.href = res.data.url
+						} else if (res.data && res.data.status == -3) { //跳转到指定页
+							app.showLoading(false);
+							var pages = getCurrentPages();
+							var currentPage = pages[pages.length - 1];
+							currentPage.$vm.loading = false
+							//跳转
+							app.goto(res.data.url, 'redirect');
+						} else if (res.data && res.data.status == -4) {  //弹窗提示并跳转到指定页
+							app.showLoading(false);
+							var pages = getCurrentPages();
+							var currentPage = pages[pages.length - 1];
+							currentPage.$vm.loading = false
+							//弹出提示
+							app.alert(res.data.msg,function(){
+								if(res.data.url){
+									app.goto(res.data.url, 'redirect');
+								}
+							});
+						} else {
+							typeof callback == "function" && callback(res.data);
+						}
+					},
+					fail: function(res) {
+						try {
+							if(oldurl != 'ApiIndex/linked'){
+								if(res.errMsg != 'request:fail timeout'){
+									console.log(res);
+									//app.alert('请求失败：' + JSON.stringify(res));
+								}
+							}
+						} catch (e) {}
+					}
+				});
+			},
+			authlogin:function(callback,params){
+				var app = this;
+				if(app.globalData.platform == 'wx'){
+					wx.getUserProfile({lang:'zh_CN',desc:'用于展示头像昵称',success:function(res2){
+						console.log(res2)
+						var userinfo = res2.userInfo;
+						wx.login({success (res1){
+							var code = res1.code;
+							app.post('ApiIndex/wxlogin',{code:code,userinfo:userinfo,pid:app.globalData.pid},function(res){
+								typeof callback == "function" && callback(res);
+							});
+						}});
+					},fail:function(res2){
+						console.log(res2)
+						if(res2.errMsg == 'getUserProfile:fail auth deny'){
+							
+						}else{
+							typeof callback == "function" && callback({status:0,msg:res2.errMsg});
+						}
+					}});
+				}else if(app.globalData.platform == 'mp' || app.globalData.platform == 'h5'){
+					var frompage = '';
+					var nowurl = app._url();
+					if(nowurl != '/pages/index/login' && nowurl != '/pages/index/reg' && nowurl != '/pages/index/getpwd'){
+						frompage = encodeURIComponent(app._fullurl());
+					}
+					if(params && params.frompage) {
+						frompage = params.frompage;
+					}
+					location.href = app.globalData.pre_url+'/index.php?s=ApiIndex/shouquan&aid='+app.globalData.aid+'&session_id='+app.globalData.session_id+'&pid='+app.globalData.pid+'&frompage='+encodeURIComponent(frompage);
+				}else if(app.globalData.platform=='app'){
+					plus.oauth.getServices(function(services){
+						console.log(services)
+						let s = services[0]
+						for (var i in services) {  
+							var service = services[i];
+							if(service.id == 'weixin'){
+								s = service;
+							}
+						}
+						console.log(s)
+						console.log('x----')
+						s.authorize(function(e){
+							console.log(e);
+							var code = e.code;
+							app.post('ApiIndex/appwxlogin',{code:code,pid:app.globalData.pid},function(res){
+								typeof callback == "function" && callback(res);
+							});
+						});
+					});
+				}else if(app.globalData.platform=='baidu'){
+					swan.getLoginCode({
+						success: res => {
+							console.log('getLoginCode success', res);
+							var code = res.code;
+							app.post('ApiIndex/baidulogin',{code:code,pid:app.globalData.pid},function(res){
+								typeof callback == "function" && callback(res);
+							});
+						},
+						fail: err => {
+							typeof callback == "function" && callback({status:0,msg:err.errMsg});
+						}
+					});
+				}else if(app.globalData.platform=='qq'){
+					qq.login({
+						success(res) {
+							if (res.code) {
+								app.post('ApiIndex/qqlogin',{code:res.code,pid:app.globalData.pid},function(res){
+									typeof callback == "function" && callback(res);
+								});
+							} else {
+								typeof callback == "function" && callback({status:0,msg:res.errMsg});
+							}
+						},
+						fail(res){
+							typeof callback == "function" && callback({status:0,msg:res.errMsg});
+						}
+					})
+				}else if(app.globalData.platform=='toutiao'){
+					tt.login({
+						force: true,
+						success(res) {
+							if (res.code) {
+								app.post('ApiIndex/toutiaologin',{code:res.code,pid:app.globalData.pid},function(res){
+									typeof callback == "function" && callback(res);
+								});
+							} else {
+								typeof callback == "function" && callback({status:0,msg:res.errMsg});
+							}
+						},
+						fail(res){
+							typeof callback == "function" && callback({status:0,msg:res.errMsg});
+						}
+					})
+				}else if(app.globalData.platform == 'alipay'){
+					my.getAuthCode({
+						scopes: 'auth_base',
+						success: (res) => {
+							console.log(res)
+							if(res.authCode){
+								app.post('ApiIndex/alipaylogin',{code:res.authCode,pid:app.globalData.pid},function(res){
+									typeof callback == "function" && callback(res);
+								});
+							}
+						},
+						fail: (res) => {
+							typeof callback == "function" && callback({status:0,msg:res.errMsg});
+						}
+					});
+				}
+			},
+			setinitdata:function(res){
+				var app = this;
+				var oldmid = app.globalData.mid;
+				if(res && res.data && (res.data.mid || res.data.mid===0) && app.globalData.mid != res.data.mid){
+					app.globalData.mid = res.data.mid;
+					if(res.data.session_id){
+						uni.setStorageSync('session_id',res.data.session_id);
+						app.globalData.session_id = res.data.session_id;
+					}
+					if(app.globalData.mid){
+						app.globalData.socket_token = res.data.socket_token
+						app.openSocket();
+					}
+				}
+				if(res && res.data && res.data._initdata){
+					app.globalData.isinit = true;
+					res.data._initdata.pre_url = app.globalData.pre_url;
+					app.globalData.initdata = res.data._initdata;
+					app.globalData.mid = res.data._initdata.mid;
+					app.globalData.isdouyin = res.data._initdata.isdouyin;
+					uni.setStorageSync('session_id',res.data._initdata.session_id);
+					app.globalData.session_id = res.data._initdata.session_id;
+					if(app.globalData.platform == 'mp'){
+						var share_package = res.data.share_package;
+						var jweixin = require('jweixin-module');
+						jweixin.config({
+							debug:false,
+							appId: share_package.appId,
+							timestamp: share_package.timestamp,
+							nonceStr: share_package.nonceStr,
+							signature: share_package.signature,
+							jsApiList: [
+							'checkJsApi',
+							'onMenuShareAppMessage',
+							'onMenuShareTimeline',
+							'updateAppMessageShareData',
+							'updateTimelineShareData',
+							'chooseImage',
+							'previewImage',
+							'uploadImage',
+							'openLocation',
+							'getLocation',
+							'closeWindow',
+							'scanQRCode',
+							'chooseWXPay',
+							'addCard',
+							'chooseCard',
+							'openCard'
+							],
+							'openTagList':['wx-open-launch-weapp']
+						});
+					}
+					if(app.globalData.mid){
+						app.globalData.socket_token = res.data.socket_token
+						app.openSocket();
+					}
+				}
+				if(app.globalData.mid && app.globalData.mid != oldmid ){
+					if(app.globalData.platform == 'wx'){
+						wx.login({
+							success: function (res) {
+								if (res.code) {
+									app.post('ApiIndex/setwxopenid', {code: res.code},function(){})
+								}
+							}
+						});
+					}else if(app.globalData.platform == 'alipay'){
+						my.getAuthCode({
+							scopes: ['auth_base'],
+							success: (res) => {
+								if (res.authCode) {
+									app.post('ApiIndex/setalipayopenid', {code: res.authCode},function(){})
+								}
+							},
+						});
+					}else if(app.globalData.platform == 'baidu'){
+						swan.getLoginCode({
+							success: (res) => {
+								if (res.code) {
+									app.post('ApiIndex/setbaiduopenid', {code: res.code},function(){})
+								}
+							},
+							fail: err => {
+								console.log('getLoginCode fail', err);
+							}
+						});
+					}
+				}
+				
+			},
+			//启用socket连接
+			openSocket:function(){
+				console.log('openSocket');
+				//#ifndef MP-TOUTIAO
+				var app = this;
+				if(app.globalData.platform != 'toutiao'){
+					uni.closeSocket();
+				}
+				uni.connectSocket({
+					url: (app.globalData.pre_url).replace('https://', "wss://") + '/wss'
+				});
+				uni.onSocketOpen(function (res) {
+					app.globalData.socketOpen = true;
+					for (var i = 0; i < app.globalData.socketMsgQueue.length; i++) {
+						app.sendSocketMessage(app.globalData.socketMsgQueue[i]);
+					}
+					app.globalData.socketMsgQueue = [];
+				});
+				app.sendSocketMessage({type: 'khinit',data: {aid: app.globalData.aid,mid: app.globalData.mid,platform:app.globalData.platform} });
+				setInterval(function () {
+					app.sendSocketMessage({type: 'connect'});
+				}, 25000);
+				uni.onSocketMessage(function (res) {
+					console.log('收到服务器内容：' + res.data);
+					try {
+            var data = JSON.parse(res.data);
+						var needpopup = true;
+						var pages = getCurrentPages();
+						var currentPage = pages[pages.length - 1];
+						if(!currentPage) return;
+						console.log(currentPage.$vm.hasOwnProperty('receiveMessage'));
+						if(currentPage && currentPage.$vm.hasOwnProperty('receiveMessage')){
+							console.log(data);
+							var rs =currentPage.$vm.receiveMessage(data);
+							needpopup = !rs;
+						}
+						if(needpopup && (data.type=='tokefu' || data.type=='tokehu' || data.type=='peisong' || data.type=='notice')){ //需要弹窗提示
+							currentPage.$vm.$refs.popmsg.open(data);
+						}
+          } catch (e) {}
+				});
+				//#endif
+			},
+			sendSocketMessage:function(msg){
+				var app = this;
+				if(!msg.token) msg.token = this.globalData.socket_token;
+				if (this.globalData.socketOpen) {
+					console.log(msg);
+					uni.sendSocketMessage({
+						data: JSON.stringify(msg),
+						fail:function(){
+							if(app.globalData.socketConnecttimes < 1){
+								app.globalData.socketConnecttimes++;
+								app.globalData.socketMsgQueue.push(msg);
+								console.log('openSocket 重连');
+								app.openSocket();
+							}
+						}
+					});
+				} else {
+					this.globalData.socketMsgQueue.push(msg);
+				}
+			},
+			imges(imgslist, callback) {
+				var app = this;
+				this.globalData.imglist = []
+				let olx = imgslist.length - 1
+				let linglist = 0
+				let unoq = null
+				unoq = setInterval(() => {
+					if(!this.globalData.imdmg) {
+						// 阻断
+						// console.log(this.globalData.imdmg, ',.....yyy')
+						return
+					}
+					app.imggss(imgslist, this.globalData.imginx, callback)
+					if(olx == this.globalData.imginx) {
+						clearInterval(unoq)
+					}
+					
+				}, 80)
+
+			},
+			imggss(imgslist, index,callback){
+				var app = this;
+				app.globalData.imdmg = false
+				app.globalData.imglist
+				uni.uploadFile({
+						url: app.globalData.baseurl + 'ApiImageupload/uploadImg/aid/' + app.globalData.aid + '/platform/' + app.globalData.platform + '/session_id/' +
+							app.globalData.session_id,
+						filePath: imgslist[index],
+						name: 'file',
+						success: function(res) {						
+							var data = JSON.parse(res.data);
+							if (data.status == 1) {
+								app.globalData.imglist.push(data.url);
+							
+								if (app.globalData.imglist.length == imgslist.length) {
+									typeof callback == 'function' && callback(app.globalData.imglist);
+								}
+							} else {
+								app.alert(data.msg);
+							}
+						},
+						complete:()=>{
+							app.globalData.imdmg = true
+							this.globalData.imginx++
+							if(index == imgslist.length-1){
+						     app.showLoading(false);
+							}
+						},
+						fail: function(res) {
+							// app.showLoading(false);
+							app.alert(res.errMsg);
+						}
+					});
+			},
+			chooseImage: function(callback, count) {
+				var app = this;
+				this.globalData.imginx = 0
+				uni.chooseImage({
+					count: count || 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album', 'camera'],
+					success: function(res) {
+						var tempFilePaths = res.tempFilePaths,
+							imageUrls = [];
+ 
+							let sizeList = res.tempFiles;
+							
+						    let arr = []
+							sizeList.forEach((item,index)=>{
+								if (item.size > (app.globalData.uploadSize*1024*1024)) {
+														uni.showToast({
+															title: "上传图片不能超过"+app.globalData.uploadSize+"MB",
+															icon: 'none'
+														});
+														
+													}else{
+														arr.push(tempFilePaths[index])
+													}
+							})
+							tempFilePaths =  JSON.parse(JSON.stringify(arr))
+			
+		               if(tempFilePaths.length){
+						   app.showLoading();
+					   }
+					   app.imges(tempFilePaths, callback) // 新的方法
+					   
+			// 			for (let i = 0; i < tempFilePaths.length; i++) {      // 旧方法
+							
+			// 			uni.uploadFile({
+			// 					url: app.globalData.baseurl + 'ApiImageupload/uploadImg/aid/' + app.globalData.aid + '/platform/' + app.globalData.platform + '/session_id/' +
+			// 						app.globalData.session_id,
+			// 					filePath: tempFilePaths[i],
+			// 					name: 'file',
+			// 					success: function(res) {
+			// 						console.log(res, 'upimg-------------------8888')
+			// 						var data = JSON.parse(res.data);
+			
+			// 						if (data.status == 1) {
+			// 							imageUrls.push(data.url);
+			
+			// 							if (imageUrls.length == tempFilePaths.length) {
+			// 								typeof callback == 'function' && callback(imageUrls);
+			// 							}
+			// 						} else {
+			// 							app.alert(data.msg);
+			// 						}
+			// 					},
+			// 					complete:()=>{
+			// 						if(i == tempFilePaths.length-1){
+			// 					     app.showLoading(false);
+			// 						}
+			// 					},
+			// 					fail: function(res) {
+			// 						// app.showLoading(false);
+			// 						app.alert(res.errMsg);
+			// 					}
+			// 				});
+			// 			}
+							// app.hideLoading();
+					},
+					fail: function(res) { //alert(res.errMsg);
+					}
+				});
+			},
+			getLocation:function(callback1,callback2){
+				if(this.globalData.platform == 'mp'){
+					var jweixin = require('jweixin-module');
+					jweixin.ready(function () {
+						jweixin.getLocation({
+							type: 'gcj02',
+							success: function (res) {
+								typeof callback1 == 'function' && callback1(res);
+							},
+							fail:function(res){
+								typeof callback2 == 'function' && callback2(res);
+							}
+						});
+					});
+				}else if(this.globalData.platform == 'alipay'){
+					uni.getLocation({
+						success: function (res) {
+							typeof callback1 == 'function' && callback1(res);
+						},
+						fail:function(res){
+							typeof callback2 == 'function' && callback2(res);
+						}
+					});
+				}else{
+					uni.getLocation({
+						type: 'gcj02',
+						success: function (res) {
+							typeof callback1 == 'function' && callback1(res);
+						},
+						fail:function(res){
+							typeof callback2 == 'function' && callback2(res);
+						}
+					});
+				}
+			},
+			setCache: function(key, value) {
+				return uni.setStorageSync(key, value);
+			},
+			getCache: function(key) {
+				return uni.getStorageSync(key);
+			},
+			removeCache: function(key) {
+				var $ = this;
+				if ($.isNull(key)) {
+					uni.clearStorageSync();
+				} else {
+					uni.removeStorageSync(key);
+				}
+			},
+			_url: function() {
+				//获取当前页url
+				var pages = getCurrentPages(); //获取加载的页面
+				var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+				var url = '/' + (currentPage.route ? currentPage.route : currentPage.__route__); //当前页面url 
+				return url;
+			},
+			_fullurl:function(){
+				var pages = getCurrentPages(); //获取加载的页面
+				var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+				var url = '/' + (currentPage.route ? currentPage.route : currentPage.__route__); //当前页面url 
+				var opts = currentPage.$vm.opt;
+				console.log(opts)
+				var params = [];
+				for(var i in opts){
+					params.push(i+'='+opts[i]);
+				}
+				if(params.length > 0){
+					url+= '?' +params.join('&');
+				}
+				console.log(url)
+				return url;
+			},
+			checkUpdateVersion() {
+        if (wx.canIUse('getUpdateManager')) {
+					//创建 UpdateManager 实例
+					const updateManager = wx.getUpdateManager();
+          //console.log('是否进入模拟更新');
+          //检测版本更新
+          updateManager.onCheckForUpdate(function(res) {
+						//console.log('是否获取版本');
+						// 请求完新版本信息的回调
+						if (res.hasUpdate) {
+							//监听小程序有版本更新事件
+							updateManager.onUpdateReady(function() {
+								//TODO 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 （ 此处进行了自动更新操作）
+								updateManager.applyUpdate();
+							})
+							updateManager.onUpdateFailed(function() {
+								// 新版本下载失败
+								//wx.showModal({
+								//	title: '已经有新版本喽~',
+								//	content: '请您删除当前小程序，到微信 “发现-小程序” 页，重新搜索打开哦~',
+								//})
+							})
+						}
+          })
+        } else {
+          //TODO 此时微信版本太低（一般而言版本都是支持的）
+          //wx.showModal({
+          //  title: '溫馨提示',
+          //  content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+          //})
+        }
+			},
+			// 店铺首页跳转(精品,商品,活动,新品)
+			skipTo(e){
+				if (e === 0) {
+					app.goto("/pagesA/shop/index", "navigateTo");
+				} else if (e === 1) {
+					app.goto("/pagesA/shop/goods", "navigateTo");
+				} else if (e === 2) {
+					app.goto("/pagesA/shop/activity", "navigateTo");
+				}else if (e === 3) {
+					app.goto("/pagesA/shop/newProduct", "navigateTo");
+				}
+			}
+		}
+	};
+</script>
+<style>
+	@import "./common.css";
+	@import "./iconfont.css";
+	@import "@/static/css/iconfont.css";
+	@import '@/components/parse/parse.css';
+	 .icon-xia{
+		    position: absolute;
+		    top: 13rpx;
+		    padding: 0 6rpx;
+		    font-size: 18rpx;
+			margin-right: 2rpx;
+		    color: #7D7D7D;
+	}
+</style>
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8741bf2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,18 @@
+# zhiwei-front
+
+知味日记-前端
+
+## 接口域名
+
+- https://zhiwei.kingfarming.cn/ 生产环境
+- https://dev.lansoft.shop 开发环境
+
+## 小程序
+
+- 知味日志AppID(小程序ID) wx3c09cbc4619152de
+
+## 多商城配置
+
+修改`siteinfo.js`里面的uniacid为对应的商城ID
+
+- 知味日志 1
diff --git a/activity/collage/buy.vue b/activity/collage/buy.vue
new file mode 100644
index 0000000..ea7dd82
--- /dev/null
+++ b/activity/collage/buy.vue
@@ -0,0 +1,732 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="topay">
+		<view v-if="needaddress==0" class="address-add">
+			<view class="linkitem">
+				<text class="f1">联 系 人：</text>
+				<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+			<view class="linkitem">
+				<text class="f1">联系电话：</text>
+				<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+		</view>
+		<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/address?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+			<view class="f1"><image class="img" :src="event_rul + '/static/img/static/img/address.png'"/></view>
+			<view class="f2 flex1" v-if="address.name">
+				<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+				<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+			</view>
+			<view v-else class="f2 flex1">请选择收货地址</view>
+			<image :src="event_rul + '/static/img/static/img/arrowright.png'" class="f3"/>
+		</view>
+		<view class="buydata">
+			<view class="btitle"><image class="img" :src="event_rul + '/static/img/static/img/ico-shop.png'"/>{{business.name}}</view>
+			<view class="bcontent">
+				<view class="product">
+					<view class="item flex">
+						<view class="img">
+							<image class="img" v-if="guige.pic" :src="guige.pic"></image>
+							<image class="img" v-else :src="product.pic"></image>
+						</view>
+						<view class="info flex1">
+							<view class="f1">{{product.name}}</view>
+							<view class="f2">规格：{{guige.name}}</view>
+							<view class="f3">￥{{guige.sell_price}}<text v-if="buytype!=1" class="collage_icon">拼团价</text> × {{totalnum}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="freight">
+					<view class="f1">配送方式</view>
+					<view class="freight-ul">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <block v-for="(item, idx2) in freightList" :key="idx2">
+						 <view class="freight-li" :style="freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<view class="freighttips" v-if="freightList[freightkey].minpriceset==1 && freightList[freightkey].minprice > 0 && freightList[freightkey].minprice*1 > product_price*1">满{{freightList[freightkey].minprice}}元起送，还差{{freightList[freightkey].minprice - product_price}}元</view>
+					<view class="freighttips" v-if="freightList[freightkey].isoutjuli==1">超出配送范围</view>
+				</view>
+				<view class="price" v-if="freightList[freightkey].pstimeset==1">
+					<view class="f1">{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</view>
+					<view class="f2" @tap="choosePstime">{{pstimetext==''?'请选择时间':pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+				<view class="storeitem" v-if="freightList[freightkey].pstype==1">
+					<view class="panel">
+						<view class="f1">取货地点</view>
+						<view class="f2" @tap="openMendian" :data-freightkey="freightkey" :data-storekey="freightList[freightkey].storekey"><text class="iconfont icondingwei"></text>{{freightList[freightkey].storedata[freightList[freightkey].storekey].name}}</view>
+					</view>
+					<block v-for="(item, idx) in freightList[freightkey].storedata" :key="idx">
+						<view class="radio-item" @tap.stop="choosestore" :data-index="idx" v-if="idx<5 || storeshowall==true">
+							<view class="f1">{{item.name}} </view>
+							<text style="color:#f50;">{{item.juli}}</text>
+							<view class="radio" :style="freightList[freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+					<view v-if="storeshowall==false && (freightList[freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+				</view>
+				<view class="price">
+					<text class="f1">商品金额</text>
+					<text class="f2">¥{{product_price}}</text>
+				</view>
+				<view class="price" v-if="leadermoney*1>0">
+					<text class="f1">团长优惠</text>
+					<text class="f2">-¥{{leadermoney}}</text>
+				</view>
+				<view class="price" v-if="leveldk_money*1>0">
+					<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+					<text class="f2">-¥{{leveldk_money}}</text>
+				</view>
+				<view class="price">
+					<text class="f1">运费</text>
+					<text class="f2">+¥{{freight_price}}</text>
+				</view>
+				<view class="price">
+					<view class="f1">{{t('优惠券')}}</view>
+					<view v-if="couponList.length>0" class="f2" @tap="showCouponList"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{couponrid!=0?couponList[couponkey].couponname:couponList.length+'张可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+					<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+				</view>
+
+				<view style="display:none">{{test}}</view>
+				<view class="form-item" v-for="(item,idx) in freightList[freightkey].formdata" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="radio-group" :name="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="checkbox-group">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector" :name="'form'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata[idx]">
+								<view class="form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix"/></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx"></view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<view class="scoredk flex" v-if="userinfo.score2money > 0">
+			<checkbox-group @change="scoredk" class="flex" style="width:100%">
+				<view class="f1">
+					<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+					<view style="font-size:22rpx;color:#999" v-if="userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+				</view>
+				<view class="f2">使用{{t('积分')}}抵扣
+					<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+				</view>
+			</checkbox-group>
+		</view>
+		<view style="width: 100%;height:110rpx"></view>
+		<view class="footer flex notabbarbot">
+			<view class="text1 flex1">总计：
+				<text style="font-weight:bold;font-size:36rpx">￥{{totalprice}}</text>
+			</view>
+			<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</button>
+		</view>
+		</form>
+
+		<view v-if="couponvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+					<image :src="event_rul + '/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<couponlist :couponlist="couponList" :choosecoupon="true" :selectedrid="couponrid" :bid="product.bid" @chooseCoupon="chooseCoupon"></couponlist>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</text>
+					<image :src="event_rul + '/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in freightList[freightkey].pstimeArr" :key="index" @tap="pstimeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		test:'test',
+
+		business:{},
+		productList: [],
+		freightList: [],
+		couponList: [],
+		couponrid: 0,
+		coupontype: 1,
+		address: [],
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		freightkey: 0,
+		freight_price: 0,
+		pstimetext: '',
+		freight_time: '',
+		usescore: 0,
+		totalprice: '0.00',
+		product_price: 0,
+		leveldk_money: 0,
+		scoredk_money: 0,
+		coupon_money: 0,
+		storedata: [],
+		storeid: '',
+		storename: '',
+		latitude: '',
+		longitude: '',
+		isload: 0,
+		leadermoney: 0,
+		couponvisible: false,
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		product: "",
+		guige: "",
+		userinfo: "",
+		buytype: "",
+		scorebdkyf: "",
+		totalnum: "",
+		havetongcheng: "",
+		weight: "",
+		goodsnum: "",
+		beizhu: "",
+		couponkey: 0,
+		storeshowall:false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this; //获取产品信息
+			that.loading = true;
+			app.get('ApiCollage/buy', {proid: that.opt.proid,ggid: that.opt.ggid,num: that.opt.num,buytype: that.opt.buytype}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg, function(){
+						app.goback()
+					});
+					return;
+				}
+				var product = res.product;
+				var freightList = res.freightList;
+				var userinfo = res.userinfo;
+				var couponList = res.couponList;
+				that.product = product;
+				that.guige = res.guige;
+				that.business = res.business;
+				that.freightList = freightList;
+				that.userinfo = userinfo;
+				that.couponList = couponList;
+				that.buytype = res.buytype;
+				that.address = res.address;
+				that.scorebdkyf = res.scorebdkyf;
+				that.totalnum = res.totalnum;
+				that.havetongcheng = res.havetongcheng;
+				that.linkman = res.linkman;
+				that.tel = res.tel;
+				var leadermoney = 0; //商品总价 重量
+
+				var product_price = res.product_price;
+
+				if (res.buytype == 2 && product.leadermoney * 1 > 0) {
+					leadermoney = product.leadermoney * 1;
+				}
+				leadermoney = leadermoney.toFixed(2); //会员折扣
+				var leveldk_money = 0;
+				if (userinfo.discount > 0 && userinfo.discount < 10) {
+					leveldk_money = (product_price - leadermoney) * (1 - userinfo.discount * 0.1);
+					leveldk_money = leveldk_money.toFixed(2);
+				}
+				that.product_price = res.product_price;
+				that.leadermoney = leadermoney;
+				that.leveldk_money = leveldk_money;
+				that.scoredk_money = userinfo.scoredk_money;
+				that.calculatePrice();
+				that.loaded();
+
+				if (res.needLocation == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						for (var j in freightList) {
+							if (freightList[j].pstype == 1) {
+								var storedata = freightList[j].storedata;
+
+								if (storedata) {
+									for (var x in storedata) {
+										if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+											var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+											storedata[x].juli = juli;
+										}
+									}
+									storedata.sort(function (a, b) {
+										return a["juli"] - b["juli"];
+									});
+									for (var x in storedata) {
+										if (storedata[x].juli) {
+											storedata[x].juli = storedata[x].juli + '千米';
+										}
+									}
+									freightList[j].storedata = storedata;
+								}
+							}
+						}
+						that.freightList = freightList;
+					});
+				}
+			});
+		},
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var product_price = parseFloat(that.product_price); //+商品总价
+      var leadermoney = parseFloat(that.leadermoney); //-团长优惠
+      var leveldk_money = parseFloat(that.leveldk_money); //-会员折扣
+      var coupon_money = parseFloat(that.coupon_money); //-优惠券抵扣 
+      var address = that.address; //算运费
+      var freightdata = that.freightList[that.freightkey];
+      if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+        var needaddress = 1;
+      } else {
+        var needaddress = 0;
+      }
+      that.needaddress = needaddress;
+      var freight_price = freightdata.freight_price;
+      if (that.coupontype == 4) {
+        freight_price = 0;
+        coupon_money = 0;
+      }
+      var totalprice = product_price - leadermoney - leveldk_money - coupon_money;
+      if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+      var oldtotalprice = totalprice;
+      if (that.usescore) {
+        var scoredk_money = parseFloat(that.scoredk_money); //-积分抵扣
+      } else {
+        var scoredk_money = 0;
+      }
+      totalprice = totalprice + freight_price - scoredk_money;
+      if (that.scorebdkyf == '1' && scoredk_money > 0 && totalprice < freight_price) {
+        //积分不抵扣运费
+        totalprice = freight_price;
+        scoredk_money = oldtotalprice - freight_price;
+      }
+      var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+
+      if (scoredk_money > 0 && scoredkmaxpercent > 0 && scoredkmaxpercent < 100 && scoredk_money > oldtotalprice * scoredkmaxpercent * 0.01) {
+        scoredk_money = oldtotalprice * scoredkmaxpercent * 0.01;
+        totalprice = oldtotalprice - scoredk_money;
+      }
+      if (totalprice < 0) totalprice = 0;
+      freight_price = freight_price.toFixed(2);
+      totalprice = totalprice.toFixed(2);
+      that.totalprice = totalprice
+			that.freight_price = freight_price;
+    },
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    changeFreight: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			this.freightkey = index;
+			that.calculatePrice();
+    },
+    chooseCoupon: function (e) {
+			var couponrid = e.rid;
+      var couponkey = e.key;
+
+      if (couponrid == this.couponrid) {
+        this.couponkey = 0;
+        this.couponrid = 0;
+        this.coupontype = 1;
+        this.coupon_money = 0;
+        this.couponvisible = false;
+      } else {
+        var couponList = this.couponList;
+        var coupon_money = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        if (coupontype == 4) {
+          coupon_money = this.freightprice;
+        }
+        this.couponkey = couponkey;
+        this.couponrid = couponrid;
+        this.coupontype = coupontype;
+        this.coupon_money = coupon_money;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+    },
+    choosePstime: function () {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      if (itemlist.length > 6) {
+        that.pstimeDialogShow = true;
+        that.pstimeIndex = -1;
+      } else {
+        uni.showActionSheet({
+          itemList: itemlist,
+          success: function (res) {
+						if(res.tapIndex >= 0){
+							var choosepstime = pstimeArr[res.tapIndex];
+							that.pstimetext = choosepstime.title;
+							that.freight_time = choosepstime.value;
+						}
+          }
+        });
+      }
+    },
+    pstimeRadioChange: function (e) {
+      var pstimeIndex = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var choosepstime = pstimeArr[pstimeIndex];
+      this.pstimetext = choosepstime.title;
+			this.freight_time = choosepstime.value;
+      this.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false
+    },
+    choosestore: function (e) {
+      var storekey = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey
+			var freightList = this.freightList
+			freightList[freightkey].storekey = storekey
+      this.freightList = freightList;
+    },
+    //提交并支付
+    topay: function (e) {
+      var that = this;
+      var buytype = this.buytype;
+      var freightkey = this.freightkey;
+      var freightid = this.freightList[freightkey].id;
+      var prodata = this.opt.prodata;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+      var usescore = this.usescore;
+      var couponkey = this.couponkey;
+      var couponrid = this.couponrid;
+			if(this.freightList[freightkey].pstype==1){
+				var storekey = this.freightList[freightkey].storekey
+				var storeid = this.freightList[freightkey].storedata[storekey].id;
+			}else{
+				var storeid = 0;
+			}
+      var freight_time = that.freight_time;
+
+      var needaddress = that.needaddress;
+      if (needaddress == 0) addressid = 0;
+
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+
+      if (this.freightList[freightkey].pstimeset == 1 && freight_time == '') {
+        app.error('请选择' + (this.freightList[freightkey].pstype == 0 ? '配送' : '提货') + '时间');
+        return;
+      }
+
+			var formdataSet = this.freightList[freightkey].formdata;
+      var formdata = e.detail.value;
+			var newformdata = {};
+			for (var i = 0; i < formdataSet.length;i++){
+				if (formdataSet[i].val3 == 1 && (formdata['form' + i] === '' || formdata['form' + i] === undefined || formdata['form' + i].length==0)){
+						app.alert(formdataSet[i].val1+' 必填');return;
+				}
+				if (formdataSet[i].key == 'selector') {
+						formdata['form' + i] = formdataSet[i].val2[formdata['form' + i]]
+				}
+				newformdata['form'+i] = formdata['form' + i];
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiCollage/createOrder', {
+        proid: that.opt.proid,
+        ggid: that.opt.ggid,
+        num: that.opt.num,
+        buytype: buytype,
+        teamid: that.opt.teamid,
+        storeid: storeid,
+        couponrid: couponrid,
+        freightid: freightid,
+        freight_time: freight_time,
+        addressid: addressid,
+        usescore: usescore,
+        linkman: linkman,
+        tel: tel,
+				formdata: newformdata
+      }, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.error(data.msg);
+          return;
+        }
+        app.goto('/pages/pay/pay?id=' + data.payorderid);
+      });
+    },
+    showCouponList: function () {
+      this.couponvisible = true;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+    },
+		openMendian: function(e) {
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			console.log(storeinfo)
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		openLocation:function(e){
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			var latitude = parseFloat(storeinfo.latitude);
+			var longitude = parseFloat(storeinfo.longitude);
+			var address = storeinfo.name;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			app.chooseImage(function(data){
+				editorFormdata[idx] = data[0];
+				console.log(editorFormdata)
+				that.editorFormdata = editorFormdata
+				that.test = Math.random();
+			})
+		},
+		editorBindPickerChange:function(e){
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var val = e.detail.value;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			console.log(editorFormdata)
+			this.editorFormdata = editorFormdata
+			this.test = Math.random();
+		},
+		doStoreShowAll:function(){
+			this.storeshowall = true;
+		},
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product .img{ width:140rpx;height:140rpx}
+.collage_icon{ color:#fe7203;border:1px solid #feccaa;display:flex;align-items:center;font-size:20rpx;padding:0 6rpx;margin-left:6rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 96%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 2%;display: flex;align-items: center;z-index: 8;box-sizing:content-box}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.storeviewmore{width:100%;text-align:center;color:#889;height:40rpx;line-height:40rpx;margin-top:10rpx}
+</style>
\ No newline at end of file
diff --git a/activity/collage/comment.vue b/activity/collage/comment.vue
new file mode 100644
index 0000000..6b0c7db
--- /dev/null
+++ b/activity/collage/comment.vue
@@ -0,0 +1,200 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form-content">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.propic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.proname}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiCollage/comment', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiCollage/comment', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/collage/commentlist.vue b/activity/collage/commentlist.vue
new file mode 100644
index 0000000..0e50316
--- /dev/null
+++ b/activity/collage/commentlist.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+				<text class="t3">规格：{{item.ggname}}</text>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		event_rul: app.globalData.event_url
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiCollage/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/activity/collage/index.vue b/activity/collage/index.vue
new file mode 100644
index 0000000..61fe8aa
--- /dev/null
+++ b/activity/collage/index.vue
@@ -0,0 +1,168 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container">
+			<swiper v-if="pics.length>0" class="swiper" :indicator-dots="pics[1]?true:false" autoplay="true" :interval="5000">
+				<block v-for="(item, index) in pics" :key="index">
+					<swiper-item class="swiper-item">
+						<image :src="item" mode="widthFix"></image>
+					</swiper-item>
+				</block>
+			</swiper>
+			<scroll-view class="category" scroll-x="true" v-if="clist.length>0">
+				<block v-for="(item, index) in clist" :key="index">
+					<view class="item" @tap="changetab" :data-st="item.id">
+						<image :src="item.pic"></image>
+						<text class="t1">{{item.name}}</text>
+					</view>
+				</block>
+				<view class="item" @tap="changetab" data-st>
+					<image :src="event_rul + '/static/img/static/img/all.png'" style="border-radius:0"></image>
+					<text class="t1">全部</text>
+				</view>
+			</scroll-view>
+			<view class="datalist">
+				<block v-for="(item, index) in datalist" :key="index">
+				<view :data-url="'product?id=' + item.id" @tap="goto" class="collage-product">
+					<view class="product-pic">
+						<image :src="item.pic" mode="widthFix"></image>
+					</view> 
+					<view class="product-info">
+						<view class="p1">{{item.name}}</view>
+						<view class="p2">
+							<view class="p2-1">
+								<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+								<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+							</view>
+						</view>
+						<view class="p3">
+							<view class="t1">已拼成<text style="font-size:32rpx;color:#f40;padding:0 2rpx;">{{item.sales}}</text>件</view>
+							<view class="t2" :style="{borderColor:t('color1'),color:t('color1')}">
+								<text class="x1">{{item.teamnum}}人团</text>
+								<text class="x2" :style="{backgroundColor:t('color1')}">去拼团</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				</block>
+			</view>
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+		<button class="covermy" @tap="goto" data-url="orderlist">我的拼团</button>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+				
+		bid:'',
+		pics: [],
+		pagenum: 1,
+		st: '',
+		datalist: [],
+		nomore: false,
+		nodata:false,
+		event_rul: app.globalData.event_url
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+		getdata: function (loadmore) {
+			var that = this;
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiCollage/index', {bid:that.bid,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.pics = res.pics;
+					that.clist = res.clist;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+				that.loaded();
+      });
+		},
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.pagenum = 1;
+			this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+	}
+}
+</script>
+<style>
+.container{background:#f4f4f4}
+.swiper {width:94%;margin:0 3%;height: 350rpx;margin-top: 20rpx;border-radius:20rpx;overflow:hidden}
+.swiper image {width: 100%;height: 350rpx;overflow: hidden;}
+
+.category{width:94%;margin:0 3%;padding-top: 10px;padding-bottom: 10px;flex-direction:row;white-space: nowrap; display:flex;}
+.category .item{width: 150rpx;display: inline-block; text-align: center;}
+.category .item image{width: 80rpx;height: 80rpx;margin: 0 auto;border-radius: 50%;}
+.category .item .t1{display: block;color: #666;}
+
+.datalist{width:94%;margin:0 3%;}
+.collage-product {display:flex;height:220rpx; background: #fff; padding:20rpx 20rpx;margin-top: 20rpx;border-radius:20rpx}
+.collage-product .product-pic {width: 180rpx;height: 180rpx; background: #ffffff;overflow:hidden}
+.collage-product .product-pic image{width: 100%;height:180rpx;}
+.collage-product .product-info {padding: 5rpx 10rpx;flex:1}
+.collage-product .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.collage-product .product-info .p2{font-size: 32rpx;height:40rpx;line-height: 40rpx}
+.collage-product .product-info .p2 .t1{color: #f40;}
+.collage-product .product-info .p2 .t2 {margin-left: 10rpx;font-size: 26rpx;color: #888;text-decoration: line-through;}
+.collage-product .product-info .p3{font-size: 24rpx;height:50rpx;line-height:50rpx;overflow:hidden;display:flex;}
+.collage-product .product-info .p3 .t1{color:#aaa;font-size:24rpx;flex:1}
+.collage-product .product-info .p3 .t2{height: 50rpx;line-height: 50rpx;overflow: hidden;border: 1px #FF3143 solid;border-radius:10rpx;}
+.collage-product .product-info .p3 .t2 .x1{padding: 10rpx 24rpx;}
+.collage-product .product-info .p3 .t2 .x2{padding: 14rpx 24rpx;background: #FF3143;color:#fff;}
+
+.covermy{position:absolute;z-index:99999;cursor:pointer;display:flex;flex-direction:column;align-items:center;justify-content:center;overflow:hidden;z-index:9999;top:260rpx;right:0;color:#fff;background-color:rgba(17,17,17,0.3);width:140rpx;height:60rpx;font-size:26rpx;border-radius:30rpx 0px 0px 30rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/collage/orderdetail.vue b/activity/collage/orderdetail.vue
new file mode 100644
index 0000000..34e0020
--- /dev/null
+++ b/activity/collage/orderdetail.vue
@@ -0,0 +1,341 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择货到付款' : '已成功付款'}}</view>
+
+				<block v-if="detail.buytype!=1">
+					<view class="t2" v-if="team.status==1">拼团中</view>
+					<view class="t2" v-if="team.status==2 && detail.freight_type!=1">拼团成功,我们会尽快为您发货</view>
+					<view class="t2" v-if="team.status==2 && detail.freight_type==1">拼团成功,请尽快前往自提地点取货</view>
+					<view class="t2" v-if="team.status==3">拼团失败,已退款</view>
+				</block>
+				<block v-else>
+					<view class="t2" v-if="detail.freight_type!=1">我们会尽快为您发货</view>
+					<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+				</block>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<text class="t2" user-select="true" selectable="true">发货信息：{{detail.express_com}} {{detail.express_no}}</text>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openMendian" :data-storeinfo="storeinfo" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==0 && shopset.comment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.leveldk_money > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.coupon_money > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk_money > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<block v-if="detail.status==1">
+					<block v-if="detail.buytype!=1">
+						<text v-if="team.status==1" class="t2">拼团中</text>
+						<text v-if="team.status==2 && detail.freight_type!=1" class="t2">拼团成功,待发货</text>
+						<text v-if="team.status==2 && detail.freight_type==1" class="t2">拼团成功,待提货</text>
+						<text v-if="team.status==3" class="t2">拼团失败,已退款</text>
+					</block>
+					<block v-else>
+						<text v-if="detail.freight_type!=1" class="t2">待发货</text>
+						<text v-if="detail.freight_type==1" class="t2">待提货</text>
+					</block>
+				</block>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot" v-if="detail.status!=3">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+			<block v-if="detail.status==1">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+			</block>
+			
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">查看物流</view>
+			</block>
+			<block v-if="detail.status==2">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+				<view class="btn1" @tap="orderCollect" :data-id="detail.id">确认收货</view>
+			</block>
+			<block v-if="([1,2,3]).includes(detail.status) && invoice && team.status==2">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=collage&orderid=' + detail.id">发票</view>
+			</block>
+			<block v-if="(detail.buytype==1 || team.status==2) && (detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3">
+				<view class="btn2">已完成</view>
+			</block>
+			<block v-if="detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul + '/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		textset:{},
+		detail:{},
+		team:{},
+		storeinfo:{},
+		shopset:{},
+		invoice:0,
+		event_rul: app.globalData.event_url,
+    }
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function (option) {
+			var that = this;
+			that.loading = true;
+			app.get('ApiCollage/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.shopset = res.shopset;
+				that.textset = app.globalData.textset;
+				that.invoice = res.invoice;
+				that.loaded();
+			});
+		},
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiCollage/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiCollage/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiCollage/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height:80rpx;line-height:40rpx;color: #000;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;background:#FB4343;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/activity/collage/orderlist.vue b/activity/collage/orderlist.vue
new file mode 100644
index 0000000..59ada84
--- /dev/null
+++ b/activity/collage/orderlist.vue
@@ -0,0 +1,235 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+			<view class="order-box" @tap.stop="goto" :data-url="'orderdetail?id=' + item.id">
+				<view class="head">
+					<text class="flex1">订单号：{{item.ordernum}}</text>
+					<text v-if="item.status==0" class="st0">待付款</text>
+					<block v-if="item.status==1">
+						<block v-if="item.buytype!=1">
+							<text v-if="item.team && item.team.status==1" class="st1">拼团中</text>
+							<text v-if="item.team && item.team.status==2 && item.freight_type!=1" class="st1">拼团成功,待发货</text>
+							<text v-if="item.team && item.team.status==2 && item.freight_type==1" class="st1">拼团成功,待提货</text>
+							<text v-if="item.team && item.team.status==3" class="st4">拼团失败,已退款</text>
+						</block>
+						<block v-else>
+							<text v-if="item.freight_type!=1" class="st1">待发货</text>
+							<text v-if="item.freight_type==1" class="st1">待提货</text>
+						</block>
+					</block>
+
+					<text v-if="item.status==2" class="st2">待收货</text>
+					<text v-if="item.status==3" class="st3">已完成</text>
+					<text v-if="item.status==4" class="st4">已关闭</text>
+				</view>
+
+				<view class="content" style="border-bottom:none">
+					<view @tap.stop="goto" :data-url="'product?id=' + item.proid">
+						<image :src="item.propic"></image>
+					</view>
+					<view class="detail">
+						<text class="t1">{{item.proname}}</text>
+						<text class="t2">{{item.ggname}}</text>
+						<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+					</view>
+				</view>
+				<view class="bottom">
+					<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+					<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+				</view>
+				<view class="op">
+					<block v-if="([1,2,3]).includes(item.status) && item.invoice && item.team && item.team.status==2">
+						<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=collage&orderid=' + item.id">发票</view>
+					</block>
+					<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+					<view @tap.stop="goto" :data-url="'team?teamid=' + item.teamid" class="btn2" v-if="item.buytype!=1 && item.teamid">查看团</view>
+					<block v-if="item.status==0">
+						<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+					</block>
+					<block v-if="item.status==1">
+						<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+					</block>
+					<block v-if="item.status==2">
+						<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+						<view class="btn2" @tap.stop="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">查看物流</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id">确认收货</view>
+					</block>
+					<block v-if="item.status==4">
+						<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+					</block>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      nodata: false
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiCollage/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiCollage/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiCollage/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiCollage/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.order-tab{position:fixed;top:var(--window-top);z-index:11;display:flex;width:100%; height:90rpx;border-bottom: 1px #f4f4f4 solid;background: #fff; margin-bottom: 10rpx;}
+.order-tab .item{flex:1;font-size:28rpx; text-align: center; color:#666; height: 90rpx; line-height: 90rpx; overflow: hidden;position:relative}
+.order-tab .on{color: #323233;}
+.order-tab .on:after{content:'';position:absolute;left:50%;margin-left:-40rpx;bottom:0;height:3px;border-radius:1.5px;background:#ff4a03;width:80rpx}
+
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 204rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 204rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;flex-wrap: wrap;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+/*.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px; font-size: 14px; position: absolute; bottom: 10px; right: 10px; background: #fff; }*/
+.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px;}
+
+.zan-tex{clear:both; display: block; width: 100%; color: #565656; font-size: 12px; height: 30px; line-height: 30px; text-align: center;  }
+.ind-bot{ width: 100%; float: left; text-align: center; height: 50px; line-height: 50px; font-size: 13px; color: #ccc; background:#F2F2F2}
+
+</style>
\ No newline at end of file
diff --git a/activity/collage/product.vue b/activity/collage/product.vue
new file mode 100644
index 0000000..d03c757
--- /dev/null
+++ b/activity/collage/product.vue
@@ -0,0 +1,628 @@
+<template>
+<view>
+	<block v-if="isload">
+	<view class="container">
+		<view class="swiper-container">
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+				<block v-for="(item, index) in product.pics" :key="index">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+					</swiper-item>
+				</block>
+			</swiper>
+			<view class="imageCount">{{current+1}}/{{product.pics.length}}</view>
+		</view>
+		<view class="collage_title">
+			<view class="f1">
+				<view class="t1">
+					<view class="x1">￥</view>
+					<view class="x2">{{product.sell_price}}</view>
+					<view class="x3">{{product.teamnum}}人团</view>
+				</view>
+				<view class="t2">单买价：￥{{product.market_price}}</view>
+			</view>
+			<view class="f2">已拼{{product.sales}}件</view>
+		</view>
+
+		<view class="header"> 
+			<view class="title">
+				<view class="lef">
+					<text>{{product.name}}</text>
+				</view>
+				<view class="share" @tap="shareClick">
+					<image :src="event_rul + '/static/img/static/img/share.png'"></image>
+					<text>分享</text>
+				</view>
+			</view>
+		</view>
+		<view class="teamlist" v-if="teamCount > 0">
+			<view class="label">{{teamCount}}人在拼单，可直接参与</view>
+			<scroll-view :scroll-y="true" class="content">
+				<view v-for="(item, index) in teamList" :key="index" class="item">
+					<view class="f1">
+						<image :src="item.headimg"></image>
+						<view class="t1">{{item.nickname}}</view>
+					</view>
+					<view class="f2">
+						<view class="t1">还差{{item.teamnum - item.num}}人拼成</view>
+						<view class="t2">剩余{{item.djs}}</view>
+					</view>
+					<button class="f3" @tap="buydialogShow" data-btntype="3" :data-teamid="item.id">去拼单</button>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="commentbox" v-if="shopset.comment==1 && commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评度 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul + '/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"/></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		<view class="shop" v-if="shopset.showjd==1">
+			<image :src="business.logo" class="p1"/>
+			<view class="p2 flex1">
+				<view class="t1">{{business.name}}</view>
+				<view class="t2">{{business.desc}}</view>
+			</view>
+			<button class="p4" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" :data-url="product.bid==0?'/pages/index/index':'/pages/business/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+		</view>
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+		
+
+		<view style="width:100%;height:70px;"></view>
+
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':'notabbarbot'" v-if="product.status==1">
+			<view class="cart flex-col flex-x-center flex-y-center" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+				<image class="img" :src="event_rul + '/static/img/static/img/kefu.png'"/>
+				<view class="t1">客服</view>
+			</view>
+			<button class="cart flex-col flex-x-center flex-y-center" v-else open-type="contact">
+				<image class="img" :src="event_rul + '/static/img/static/img/kefu.png'"/>
+				<view class="t1">客服</view>
+			</button>
+			<view class="favorite flex-col flex-x-center flex-y-center" @tap="addfavorite">
+				<image class="img" :src="event_rul + '/static/img/static/img/shoucang.png'"/>
+				<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+			</view>
+			<view class="tocart" :style="{background:t('color2')}" @tap="buydialogShow" data-btntype="1"><text>￥{{product.market_price}}</text><text>单独购买</text></view>
+			<view class="tobuy" :style="{background:t('color1')}" @tap="buydialogShow" data-btntype="2"><text>￥{{product.sell_price}}</text><text>发起拼团</text></view>
+		</view>
+
+
+		<view :hidden="buydialogHidden">
+			<view class="buydialog-mask">
+				<view class="buydialog" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<view class="close" @tap="buydialogChange">
+						<image :src="event_rul + '/static/img/static/img/close.png'" class="image"></image>
+					</view>
+					<view class="title">
+						<image :src="guigelist[ks].pic?guigelist[ks].pic:product.pic" class="img" @tap="previewImage" :data-url="guigelist[ks].pic?guigelist[ks].pic:product.pic"></image>
+						<!-- <text class="name">{{product.name}}</text> -->
+						<view class="price" v-if="btntype==1"><text class="t1">￥</text>{{guigelist[ks].market_price}}</view>
+						<view class="price" v-else><text class="t1">￥</text>{{guigelist[ks].sell_price}} <text v-if="guigelist[ks].market_price > guigelist[ks].sell_price" class="t2">￥{{guigelist[ks].market_price}}</text></view>
+						<view class="choosename">已选规格: {{guigelist[ks].name}}</view>
+						<view class="stock">剩余{{guigelist[ks].stock}}件</view>
+					</view>
+
+					<view v-for="(item, index) in guigedata" :key="index" class="guigelist flex-col">
+						<view class="name">{{item.title}}</view>
+						<view class="item flex flex-y-center">
+							<block v-for="(item2, index2) in item.items" :key="index2">
+								<view :data-itemk="item.k" :data-idx="item2.k" :class="'item2 ' + (ggselected[item.k]==item2.k ? 'on':'')" @tap="ggchange">{{item2.title}}</view>
+							</block>
+						</view>
+					</view>
+					<view class="buynum flex flex-y-center">
+						<view class="flex1">购买数量：</view>
+						<view class="addnum">
+							<view class="minus"><image class="img" :src="event_rul + '/static/img/static/img/cart-minus.png'" @tap="gwcminus"/></view>
+							<input class="input" type="number" :value="gwcnum" @input="gwcinput"></input>
+							<view class="plus"><image class="img" :src="event_rul + '/static/img/static/img/cart-plus.png'" @tap="gwcplus"/></view>
+						</view>
+					</view>
+					<view class="op">
+						<block v-if="btntype==1">
+							<button class="tobuy" :style="{background:t('color2')}" @tap="tobuy" data-type="1">确定</button>
+						</block>
+						<block v-if="btntype==2">
+							<button class="tobuy" :style="{background:t('color1')}" @tap="tobuy" data-type="2">下一步</button>
+						</block>
+						<block v-if="btntype==3">
+							<button class="tobuy" :style="{background:t('color1')}" @tap="tobuy" data-type="3">确 定</button>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<view v-if="sharetypevisible" class="popup__container">
+		<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+		<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+			<!-- <view class="popup__title">
+				<text class="popup__title-text">请选择分享方式</text>
+				<image src="https://dev.lansoft.shop/static/img/static/img/close.png" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+			</view> -->
+			<view class="popup__content">
+				<view class="sharetypecontent">
+					<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+						<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+						<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+						<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<button class="f1" open-type="share" v-else>
+						<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</button>
+					<view class="f2" @tap="showPoster">
+						<image class="img" :src="event_rul + '/static/img/static/img/sharepic.png'"/>
+						<text class="t1">生成分享图片</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="posterDialog" v-if="showposter">
+		<view class="main">
+			<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul + '/static/img/static/img/close.png'"/></view>
+			<view class="content">
+				<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+			</view>
+		</view>
+	</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		indexurl:app.globalData.indexurl,
+		tabnum: 1,
+		buydialogHidden: true,
+		num: 1,
+		teamCount:0,
+		sysset:{},
+		shopset:{},
+		isfavorite: false,
+		btntype: 1,
+		ggselected: [],
+		guigedata:[],
+		guigelist:[],
+		ks: '',
+		gwcnum: 1,
+		nodata: 0,
+		product:{},
+		userinfo: [],
+		current: 0,
+		pagecontent: "",
+		business:{},
+		commentcount:0,
+		commentlist:[],
+		nowtime: "",
+		teamList: [],
+		teamid: "",
+		sharetypevisible: false,
+		showposter: false,
+		posterpic: "",
+		kfurl:'',
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiCollage/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var pagecontent = JSON.parse(res.product.detail);
+				that.pagecontent = pagecontent;
+				that.business = res.business;
+				that.commentcount = res.commentcount;
+				that.commentlist = res.commentlist;
+				that.ggselected = res.ggselected;
+				that.guigedata = res.guigedata;
+				that.guigelist = res.guigelist;
+				that.isfavorite = res.isfavorite;
+				that.ks = res.ks;
+				that.nowtime = res.nowtime;
+				that.product = res.product;
+				that.shopset = res.shopset;
+				that.sysset = res.sysset;
+				that.teamCount = res.teamCount;
+				that.teamList = res.teamList;
+				setInterval(function () {
+					that.nowtime = that.nowtime + 1;
+					that.getdjs();
+				}, 1000);
+				uni.setNavigationBarTitle({
+					title: res.product.name
+				});
+				that.kfurl = '/pages/kefu/index?bid='+res.product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:res.product.name,pic:res.product.pic});
+			});
+		},
+    swiperChange: function (e) {
+      var that = this;
+      that.current = e.detail.current;
+    },
+    getdjs: function () {
+      var that = this;
+      var nowtime = that.nowtime;
+      for (var i in that.teamList) {
+        var thisteam = that.teamList[i];
+        var totalsec = thisteam.createtime * 1 + thisteam.teamhour * 3600 - nowtime * 1;
+        if (totalsec <= 0) {
+          that.teamList[i].djs = '00时00分00秒';
+        } else {
+          var houer = Math.floor(totalsec / 3600);
+          var min = Math.floor((totalsec - houer * 3600) / 60);
+          var sec = totalsec - houer * 3600 - min * 60;
+          var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+          that.teamList[i].djs = djs;
+        }
+        that.teamList = that.teamList
+      }
+    },
+    //加入购物车
+    buydialogShow: function (e) {
+      var btntype = e.currentTarget.dataset.btntype;
+      if (btntype == 3) {
+        this.teamid = e.currentTarget.dataset.teamid
+      }
+      this.btntype = btntype;
+      this.buydialogHidden = !this.buydialogHidden;
+    },
+    buydialogChange: function (e) {
+      this.buydialogHidden = !this.buydialogHidden;
+    },
+    //选择规格
+    ggchange: function (e) {
+      var idx = e.currentTarget.dataset.idx;
+      var itemk = e.currentTarget.dataset.itemk;
+      var ggselected = this.ggselected;
+      ggselected[itemk] = idx;
+      var ks = ggselected.join(',');
+      this.ggselected = ggselected;
+      this.ks = ks;
+    },
+    tobuy: function (e) {
+      var type = e.currentTarget.dataset.type;
+      var that = this;
+      var ks = that.ks;
+      var proid = that.product.id;
+      var ggid = that.guigelist[ks].id;
+      var num = that.gwcnum;
+      app.goto('buy?proid=' + proid + '&ggid=' + ggid + '&num=' + num + '&buytype=' + type + (type == 3 ? '&teamid=' + that.teamid : ''));
+    },
+    //加
+    gwcplus: function (e) {
+      var gwcnum = this.gwcnum + 1;
+      var ggselected = this.ks;
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        app.error('库存不足');
+        return;
+      }
+      this.gwcnum = this.gwcnum + 1
+    },
+    //减
+    gwcminus: function (e) {
+      var gwcnum = this.gwcnum - 1;
+      var ggselected = this.ks;
+      if (gwcnum <= 0) {
+        return;
+      }
+      this.gwcnum = this.gwcnum - 1
+    },
+    //输入
+    gwcinput: function (e) {
+      var ggselected = this.ks;
+      var gwcnum = parseInt(e.detail.value);
+      if (gwcnum < 1) return 1;
+
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        return this.guigelist[ggselected].stock;
+      }
+      this.gwcnum = gwcnum;
+    },
+    //收藏操作
+    addfavorite: function () {
+      var that = this;
+      var proid = that.product.id;
+			app.showLoading('收藏中');
+      app.post('ApiCollage/addfavorite', {proid: proid,type: 'collage'}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          that.isfavorite = !that.isfavorite
+        }
+        app.success(data.msg);
+      });
+    },
+    tabClick: function (e) {
+      this.tabnum = e.currentTarget.dataset.num;
+    },
+    shareClick: function () {
+      this.sharetypevisible = true;
+    },
+    handleClickMask: function () {
+      this.sharetypevisible = false;
+    },
+    showPoster: function () {
+      var that = this;
+      that.showposter = true;
+      that.sharetypevisible = false;
+      app.showLoading('努力生成中');
+			app.post('ApiCollage/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.alert(data.msg);
+        } else {
+          that.posterpic = data.poster;
+        }
+      });
+    },
+    posterDialogClose: function () {
+      this.showposter = false;;
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/collage/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/collage/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+	}
+}
+</script>
+<style>
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+
+.header {width: 100%;padding: 0 3%;background: #fff;}
+.header .title {padding: 10px 0px;line-height:44rpx;font-size:32rpx;display:flex;}
+.header .title .lef{display:flex;flex-direction:column;justify-content: center;flex:1;color:#222222;font-weight:bold}
+.header .title .lef .t2{ font-size:26rpx;color:#999;padding-top:10rpx;font-weight:normal}
+.header .title .share{width:88rpx;height:88rpx;padding-left:20rpx;border-left:0 solid #f5f5f5;text-align:center;font-size:24rpx;color:#222;display:flex;flex-direction:column;align-items:center}
+.header .title .share image{width:32rpx;height:32rpx;margin-bottom:4rpx}
+
+.header .price{height: 86rpx;overflow: hidden;line-height: 86rpx;border-top: 1px solid #eee;}
+.header .price .t1 .x1{ color: #e94745; font-size: 34rpx;}
+.header .price .t1 .x2{ color: #939393; margin-left: 10rpx; text-decoration: line-through;font-size:24rpx}
+.header .price .t2{color: #aaa; font-size: 24rpx;}
+.header .fuwupoint{width:100%;font-size:24rpx;color:#999;display:flex;flex-wrap:wrap;border-top:1px solid #eee;padding:10rpx 0}
+.header .fuwupoint .t{ padding:4rpx 20rpx 4rpx 0}
+.header .fuwupoint .t:before{content: "";	display: inline-block;	vertical-align: middle;	margin-top: -4rpx;	margin-right: 10rpx;	width: 24rpx;	height: 24rpx;	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;	background-size: 24rpx auto; }
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 80rpx; line-height: 80rpx; padding: 0 3%; color: #505050; }
+.choose .f2{ width: 40rpx; height: 40rpx;}
+
+.teamlist{ width:100%;background:#fff;padding:10rpx 20rpx;font-size:26rpx;margin-top:20rpx;display:flex;flex-direction:column}
+.teamlist .label{ width:100%;color:#222222;font-weight:bold;padding:10rpx 0;border-bottom:1px solid #eee}
+.teamlist .content{ width:100%;max-height:300rpx;overflow:scroll}
+.teamlist .item{width:100%;display:flex;align-items:center;padding:12rpx 3px;border-bottom:0px solid #f5f5f5}
+.teamlist .item .f1{width:300rpx;overflow:hidden;flex:auto;display:flex;align-items:center}
+.teamlist .item .f1 image{width:80rpx;height:80rpx;}
+.teamlist .item .f1 .t1{padding-left:6rpx;font-size:30rpx;color:#333}
+.teamlist .item .f2{ text-align:right;margin:0 8rpx}
+.teamlist .item .f2 .t1{font-size:24rpx;color:#333}
+.teamlist .item .f2 .t2{font-size:22rpx;color:#999}
+.teamlist .item .f3{ background: linear-gradient(90deg, #FF3143 0%, #FE6748 100%);color:#fff;border-radius:26rpx;padding:0 20rpx;height:50rpx;border:0;text-align:right;font-size:26rpx;display:flex;align-items:center}
+.teamlist .item .f3:after{border:0}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:100%;background:#fff;padding:0 3%;margin-top:20rpx}
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{ width: 100%; position: fixed;bottom: 0px; left: 0px; background: #fff;}
+.bottombar .favorite{width: 15%;color:#707070;font-size:26rpx}
+.bottombar .favorite .fa{ font-size:40rpx;height:50rpx;line-height:50rpx}
+.bottombar .favorite .img{ width:50rpx;height:50rpx}
+.bottombar .favorite .t1{font-size:24rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .cart{width: 15%;font-size:26rpx;color:#707070}
+.bottombar .cart .img{ width:50rpx;height:50rpx}
+.bottombar .cart .t1{font-size:24rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .tocart{ width: 30%; height: 100rpx;color: #fff; background: #fa938a; font-size: 28rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.bottombar .tobuy{ width:40%; height: 100rpx;color: #fff; background: #df2e24; font-size:28rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+
+
+
+.buydialog-mask{ position: fixed; top: 0px; left: 0px; width: 100%; background: rgba(0,0,0,0.5); bottom: 0px;z-index:10}
+.buydialog{ position: fixed; width: 100%; left: 0px; bottom: 0px; background: #fff;z-index:11;border-radius:20rpx 20rpx 0px 0px}
+.buydialog .close{ position: absolute; top: 0; right: 0;padding:20rpx;z-index:12}
+.buydialog .close .image{ width: 30rpx; height:30rpx; }
+.buydialog .title{ width: 94%;position: relative; margin: 0 3%; padding:20rpx 0px; border-bottom:0; height: 190rpx;}
+.buydialog .title .img{ width: 160rpx; height: 160rpx; position: absolute; top: 20rpx; border-radius: 10rpx; border: 0 #e5e5e5 solid;background-color: #fff}
+.buydialog .title .price{ padding-left:180rpx;width:100%;font-size: 36rpx;height:70rpx; color: #FC4343;overflow: hidden;}
+.buydialog .title .price .t1{ font-size:26rpx}
+.buydialog .title .price .t2{ font-size:26rpx;text-decoration:line-through;color:#aaa}
+.buydialog .title .choosename{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+.buydialog .title .stock{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+
+.buydialog .guigelist{ width: 94%; position: relative; margin: 0 3%; padding:0px 0px 10px 0px; border-bottom: 0; }
+.buydialog .guigelist .name{ height:70rpx; line-height: 70rpx;}
+.buydialog .guigelist .item{ font-size: 30rpx;color: #333;flex-wrap:wrap}
+.buydialog .guigelist .item2{ height:60rpx;line-height:60rpx;margin-bottom:4px;border:0; border-radius:4rpx; padding:0 40rpx;color:#666666; margin-right: 10rpx; font-size:26rpx;background:#F4F4F4}
+.buydialog .guigelist .on{color:#FC4343;background:rgba(252,67,67,0.1);font-weight:bold}
+.buydialog .buynum{ width: 94%; position: relative; margin: 0 3%; padding:10px 0px 10px 0px; }
+.buydialog .addnum {font-size: 30rpx;color: #666;width:auto;display:flex;align-items:center}
+.buydialog .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .img{width:24rpx;height:24rpx}
+.buydialog .addnum .input{flex:1;width:70rpx;border:0;text-align:center;color:#2B2B2B;font-size:24rpx}
+.buydialog .op{width:90%;margin:20rpx 5%;border-radius:36rpx;overflow:hidden;display:flex;margin-top:100rpx;}
+.buydialog .addcart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none; font-size:28rpx;font-weight:bold}
+.buydialog .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;}
+.buydialog .nostock{flex:1;height: 72rpx; line-height: 72rpx; background:#aaa; color: #fff; border-radius: 0px; border: none;}
+
+.collage_title{width:100%;height:110rpx;background: linear-gradient(90deg, #FF3143 0%, #FE6748 100%);display:flex;align-items:center;padding:0 40rpx}
+.collage_title .f1{flex:1;display:flex;flex-direction:column;}
+.collage_title .f1 .t1{display:flex;align-items:center;height:60rpx;line-height:60rpx}
+.collage_title .f1 .t1 .x1{font-size:28rpx;color:#fff}
+.collage_title .f1 .t1 .x2{font-size:48rpx;color:#fff;padding-right:20rpx}
+.collage_title .f1 .t1 .x3{font-size:24rpx;font-weight:bold;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:20rpx;background:#fff;color:#ED533A}
+.collage_title .f1 .t2{color:rgba(255,255,255,0.6);font-size:20rpx;}
+.collage_title .f2{color:#fff;font-size:28rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+</style>
\ No newline at end of file
diff --git a/activity/collage/refund.vue b/activity/collage/refund.vue
new file mode 100644
index 0000000..5c27be1
--- /dev/null
+++ b/activity/collage/refund.vue
@@ -0,0 +1,99 @@
+<template>
+<view class="container">
+	<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-item">
+			<text class="label">退款原因</text>
+			<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+		</view>
+		<view class="form-item">
+			<text class="label">退款金额(元)</text>
+			<view class="flex"><input name="money" type="digit" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+		</view>
+		<button class="ref-btn" form-type="submit">确定</button>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: 0,
+      totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		var that = this;
+		that.orderid = that.opt.orderid;
+		that.totalprice = that.opt.price;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loaded();
+		},
+    formSubmit: function (e) {
+      //console.log(e);return;
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+
+      if (money < 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			
+			app.showLoading('提交中');
+      app.post('ApiCollage/refund', {
+        orderid: orderid,
+        reason: reason,
+        money: money
+      }, function (data) {
+				app.showLoading(false);
+        app.alert(data.msg);
+        var pages = getCurrentPages();
+
+        if (pages.length > 1) {
+          var prePage = pages[pages.length - 2];
+          prePage.onLoad();
+        }
+
+        setTimeout(function () {
+          app.goback();
+        }, 1000);
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-item{ width:100%;background: #fff; padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.ref-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; text-align: center; color: #fff; font-size: 16px; border-radius: 8px;border: none; background: #ff8758; }
+</style>
\ No newline at end of file
diff --git a/activity/collage/team.vue b/activity/collage/team.vue
new file mode 100644
index 0000000..83fac47
--- /dev/null
+++ b/activity/collage/team.vue
@@ -0,0 +1,413 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container">
+			<view class="topbg">
+				<image :src="pre_url + '/static/img/collage_teambg.png'" class="image"/>
+			</view>
+			<view class="topbox" @tap="goto" :data-url="'product?id=' + product.id">
+				<view class="left">
+					<image :src="product.pic"></image>
+				</view>
+				<view class="right">
+					<view class="f1">{{product.name}}</view>
+					<view class="f2"><view class="t1">{{product.teamnum}}人团</view></view>
+					<view class="f3">
+						<view class="t1">￥</view>
+						<view class="t2">{{product.sell_price}}</view>
+						<view class="t3">{{product.sales}}人已拼</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="teambox">
+				<view class="userlist">
+					<view v-for="(item, index) in userlist" :key="index" class="item">
+						<image :src="item.headimg?item.headimg: event_rul +'/static/img/static/img/wh.png'" class="f1"></image>
+						<text class="f2" v-if="item.id == team.mid">团长</text>
+					</view>
+				</view>
+				<view class="join-text" v-if="team.status==1">
+					<view>仅剩<text class="join-te1">{{team.teamnum-team.num}}</text>个名额</view>
+					<view style="font-size:28rpx;color:#f80"> {{rtimeformat}} 后结束</view>
+				</view>
+				<view class="join-text" v-if="team.status==2">已满员,拼团成功</view>
+				<view class="join-text" v-if="team.status==3">拼团失败</view>
+				<button class="join-btn" @tap="shareClick" v-if="team.status==1 && haveme==1">邀请好友参团</button>
+				<button class="join-btn" @tap="buydialogChange" v-if="team.status==1 && haveme==0">我要参团</button>
+			</view>
+			<view :hidden="buydialogHidden">
+				<view class="buydialog-mask">
+					<view class="buydialog">
+						<view class="close" @tap="buydialogChange">
+							<image :src="event_rul + '/static/img/static/img/close.png'" class="buydialog-canimg"></image>
+						</view>
+						<view class="title">
+							<image :src="guigelist[ks].pic?guigelist[ks].pic:product.pic" class="img" @tap="previewImage" :data-url="guigelist[ks].pic?guigelist[ks].pic:product.pic"></image>
+							<view class="price"><text class="t1">￥</text>{{guigelist[ks].sell_price}} <text v-if="guigelist[ks].market_price > guigelist[ks].sell_price" class="t2">￥{{guigelist[ks].market_price}}</text></view>
+							<view class="choosename">已选规格: {{guigelist[ks].name}}</view>
+							<view class="stock">剩余{{guigelist[ks].stock}}件</view>
+						</view>
+
+						<view v-for="(item, index) in guigedata" :key="index" class="guigelist flex-col">
+							<view class="name">{{item.title}}</view>
+							<view class="item flex flex-y-center">
+								<block v-for="(item2, index2) in item.items" :key="index2">
+									<view :data-itemk="item.k" :data-idx="item2.k" :class="'item2 ' + (ggselected[item.k]==item2.k ? 'on':'')" @tap="ggchange">{{item2.title}}</view>
+								</block>
+							</view>
+						</view>
+						<view class="buynum flex flex-y-center">
+							<view class="flex1">购买数量：</view>
+							<view class="f2 flex flex-y-center">
+								<text class="minus flex-x-center" @tap="gwcminus">-</text>
+								<input class="flex-x-center" type="number" :value="gwcnum" @input="gwcinput"></input>
+								<text class="plus flex-x-center" @tap="gwcplus">+</text>
+							</view>
+						</view>
+						<block>
+						<button class="tobuy" @tap="tobuy" data-type="3">确 定</button>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image src="https://dev.lansoft.shop/static/img/static/img/close.png" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul+ '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul+ '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul+ '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul+ '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul + '/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul + '/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		tabnum: 1,
+		ggselected: [],
+		guigedata: [],
+		guigelist:[],
+		haveme:0,
+		ks: '',
+		gwcnum: 1,
+		showdetail: false,
+		buydialogHidden: true,
+		team: [],
+		userlist: [],
+		product: [],
+		rtime: '',
+		rtimeformat: '',
+		isfavorite: "",
+		sharetypevisible: false,
+		showposter: false,
+		posterpic: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		console.log(opt)
+		console.log(this.opt)
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:'就差你了，快来一起拼团~ ' + this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:'就差你了，快来一起拼团~ ' + this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var teamid = that.opt.teamid;
+			that.loading = true;
+			app.get('ApiCollage/team', {teamid: teamid}, function (res) {
+				that.loading = false;
+
+				that.ggselected  = res.ggselected;
+				that.guigedata  = res.guigedata;
+				that.guigelist  = res.guigelist;
+				that.haveme  = res.haveme;
+				that.ks  = res.ks;
+				that.product  = res.product;
+				that.rtime  = res.rtime;
+				that.shopset  = res.shopset;
+				that.sysset  = res.sysset;
+				that.team  = res.team;
+				that.userlist  = res.userlist;
+				that.getrtime();
+				setInterval(function () {
+					that.getrtime();
+				}, 1000);
+				that.loaded({title:'就差你了，快来一起拼团~ ',desc:res.product.name,pic:res.product.pic});
+			});
+		},
+    buydialogChange: function (e) {
+      this.buydialogHidden = !this.buydialogHidden
+    },
+    //选择规格
+    ggchange: function (e) {
+      var idx = e.currentTarget.dataset.idx;
+      var itemk = e.currentTarget.dataset.itemk;
+      var ggselected = this.ggselected;
+      ggselected[itemk] = idx;
+      var ks = ggselected.join(',');
+      this.ggselected = ggselected;
+      this.ks = ks;
+    },
+    //加
+    gwcplus: function (e) {
+      var gwcnum = this.gwcnum + 1;
+      var ggselected = this.ks;
+
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        app.error('库存不足');
+        return;
+      }
+      this.gwcnum = this.gwcnum + 1;
+    },
+    //减
+    gwcminus: function (e) {
+      var gwcnum = this.gwcnum - 1;
+      var ggselected = this.ks;
+
+      if (gwcnum <= 0) {
+        return;
+      }
+      this.gwcnum = this.gwcnum - 1;
+    },
+    //输入
+    gwcinput: function (e) {
+      var ggselected = this.ks;
+      var gwcnum = parseInt(e.detail.value);
+      if (gwcnum < 1) return 1;
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        return this.guigelist[ggselected].stock;
+      }
+      this.gwcnum = gwcnum;
+    },
+    tobuy: function (e) {
+      var type = e.currentTarget.dataset.type;
+      var that = this;
+      var ggselected = that.ks;
+      var proid = that.product.id;
+      var ggid = that.guigelist[ggselected].id;
+      var num = that.gwcnum; //var prodata = proid + ',' + ggid + ',' + num;
+
+      app.goto('buy?proid=' + proid + '&num=' + num + '&ggid=' + ggid + '&buytype=' + type + '&teamid=' + that.team.id);
+    },
+    getrtime: function () {
+      var rtime = this.rtime - 1;
+      if (rtime < 0) {
+        this.rtimeformat = '0秒';
+        this.rtime = rtime;
+      } else {
+        var hours = Math.floor(rtime / 3600); //计算相差分钟数  
+        var leave2 = rtime % 3600; //计算小时数后剩余的毫秒数  
+        var minutes = Math.floor(leave2 / 60); //计算相差秒数  
+        var seconds = leave2 % 60; //计算分钟数后剩余的毫秒数
+        var rtimeformat = hours + "小时" + minutes + "分" + seconds + "秒";
+        this.rtimeformat = rtimeformat;
+        this.rtime = rtime;
+      }
+    },
+    shareClick: function () {
+      this.sharetypevisible = true;
+    },
+    handleClickMask: function () {
+      this.sharetypevisible = false;
+    },
+    showPoster: function () {
+      var that = this;
+      that.showposter = true;
+      that.sharetypevisible = false;
+			app.showLoading('努力生成中');
+      app.post('ApiCollage/getTeamPoster', {proid: that.product.id,teamid: that.team.id}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.alert(data.msg);
+        } else {
+          that.posterpic = data.poster;
+        }
+      });
+    },
+    posterDialogClose: function () {
+      this.showposter = false;
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/collage/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/collage/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+  }
+};
+</script>
+<style>
+.topbg{width:100%;height:248rpx;position:relative;z-index:0}
+.topbg .image{width:100%;height:100%}
+.topbox{width:94%;margin:0 3%;margin-top:-140rpx;background:#fff;border-radius:16rpx;padding:24rpx;display:flex;position:relative;z-index:1}
+.topbox .left{flex-shrink:0;width:240rpx;height:240rpx;}
+.topbox .left image{width:100%;height:100%}
+.topbox .right{flex:1;padding-left:20rpx;padding-right:20rpx;display:flex;flex-direction:column}
+.topbox .right .f1{color:#32201B;height:80rpx;line-height:40rpx;font-size:30rpx;font-weight:bold;overflow:hidden}
+.topbox .right .f2{display:flex;margin-top:10rpx}
+.topbox .right .f2 .t1{display:flex;background:rgba(255, 49, 67,0.2);border-radius:20rpx;padding:0 20rpx;height:40rpx;line-height:40rpx;color:#FF3143;font-size:24rpx;}
+.topbox .right .f3{display:flex;align-items:center;color:#FF3143;margin-top:40rpx}
+.topbox .right .f3 .t1{font-size:28rpx}
+.topbox .right .f3 .t2{font-size:40rpx;font-weight:bold;flex:1}
+.topbox .right .f3 .t3{font-size:26rpx;font-weight:bold;}
+
+.teambox{width:94%;margin:0 3%;margin-top:20rpx;background:#fff;border-radius:16rpx;padding:24rpx;display:flex;flex-direction:column}
+
+.userlist{width: 100%;background: #fff;text-align: center;padding-top:40rpx;margin-top:20rpx;}
+.userlist .item{display: inline-block;width:120rpx; height:120rpx;position: relative;}
+.userlist .item .f1{width:100rpx; height:100rpx;border-radius: 50%;border: 1px #ffc32a solid;}
+.userlist .item .f2{background: #ffab33;border-radius:100rpx;padding:4rpx 16rpx;border:1px #fff solid;position: absolute;top: 0px; left: -20rpx;color: #9f7200;font-size: 30rpx;}
+
+.join-text{color:#000;padding: 30rpx 0;font-size:36rpx;font-weight: 600;background: #fff; text-align: center;width: 100%;}
+
+.join-btn{width: 90%;margin:20rpx 5%;background: linear-gradient(90deg, #FF3143 0%, #FE6748 100%);color: #fff;font-size: 30rpx;height:80rpx;border-radius:40rpx}
+
+.buydialog-mask{ position: fixed; top: 0px; left: 0px; width: 100%; background: rgba(0,0,0,0.5); bottom: 0px;z-index:9}
+.buydialog{ position: absolute; width: 100%; left: 0px; bottom: 0px; background: #fff;z-index:9}
+.buydialog .close{ position: absolute; top: 0; right: 0;padding:20rpx;z-index:9999}
+.buydialog .close image{ width: 30rpx; height:30rpx; }
+.buydialog .title{ width: 94%;position: relative; margin: 0 3%; padding:20rpx 0px; border-bottom: 1px #e5e5e5 solid; height: 140rpx;}
+.buydialog .title .img{ width: 160rpx; height: 160rpx; position: absolute; top: -40rpx; border-radius: 10rpx; border: 1px #e5e5e5 solid;background-color: #fff}
+.buydialog .title .price{ padding-left:180rpx;width:100%;font-size: 36rpx;height:50rpx; color: #ff4a03;overflow: hidden;}
+.buydialog .title .price .t1{ font-size:24rpx}
+.buydialog .title .price .t2{ font-size:26rpx;text-decoration:line-through;color:#aaa}
+.buydialog .title .choosename{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 30rpx;line-height:30rpx;}
+.buydialog .title .stock{ padding-left:180rpx;width: 100%;font-size: 22rpx;height: 30rpx;line-height:30rpx;color:#aaa}
+
+.buydialog .guigelist{ width: 94%; position: relative; margin: 0 3%; padding:0px 0px 10px 0px; border-bottom: 1px #e5e5e5 solid; }
+.buydialog .guigelist .name{ height:70rpx; line-height: 70rpx;}
+.buydialog .guigelist .item{ font-size: 30rpx;color: #333;}
+.buydialog .guigelist .item2{ height:50rpx;line-height:50rpx;border: 1px #a9a9a9 solid; border-radius:8rpx; padding:0 10rpx; color: #353535; margin-right: 10rpx; font-size:26rpx;}
+.buydialog .guigelist .on{ border: 1px #ff4a03 solid;color: #ff4a03;}
+.buydialog .buynum{ width: 94%; position: relative; margin: 0 3%; padding:10px 0px 10px 0px; }
+.buydialog .buynum .f2{ border:1px solid #aaa}
+.buydialog .buynum .f2 input{flex:1;width:70rpx;border-left:1px solid #aaa;border-right:1px solid #aaa;text-align:center}
+.buydialog .buynum .f2 .plus{width:50rpx;}
+.buydialog .buynum .f2 .minus{width:50rpx;}
+.buydialog .addcart{height: 45px; line-height: 45px; background: #e94745; color: #fff; border-radius: 0px; border: none; font-size:16px; }
+.buydialog .tobuy{ height: 45px; line-height: 45px; background: #ff6801; color: #fff; border-radius: 0px; border: none; font-size:16px; }
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+</style>
\ No newline at end of file
diff --git a/activity/express/address.vue b/activity/express/address.vue
new file mode 100644
index 0000000..abdbb66
--- /dev/null
+++ b/activity/express/address.vue
@@ -0,0 +1,165 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入姓名/手机号搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view v-for="(item, index) in datalist" :key="index" class="content" @tap.stop="setdefault" :data-id="item.id">
+			<view class="f1">
+				<text class="t1">{{item.name}}</text>
+				<text class="t2">{{item.tel}}</text>
+				<text class="t2" v-if="item.company">{{item.company}}</text>
+				<text class="flex1"></text>
+				<image class="t3" :src="event_rul + '/static/img/static/img/edit.png'" @tap.stop="goto" :data-url="'/activity/express/addressadd?id=' + item.id + '&type=' + (item.latitude>0 ? '1' : '0')">
+			</view>
+			<view class="f2">{{item.area}} {{item.address}}</view>
+			<view class="f3">
+				<view class="flex-y-center">
+					<view class="radio" :style="item.isdefault ? 'border:0;background:'+t('color1') : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+					<view class="mrtxt">{{item.isdefault ? '默认地址' : '设为默认'}}</view>
+				</view>
+				<view class="flex1"></view>
+				<view class="del" :style="{color:t('color1')}" @tap.stop="del" :data-id="item.id">删除</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<view style="height:140rpx"></view>
+		<block v-if="getplatform() == 'wx' && type == ''">
+			<view class="btn-add2" :class="menuindex>-1?'tabbarbot':'notabbarbot3'" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" :data-url="'/activity/express/addressadd?type=' + type"><image :src="event_rul + '/static/img/static/img/add.png'" style="width:28rpx;height:28rpx;margin-right:6rpx"/>添加地址</view>
+			<view class="btn-add3" :class="menuindex>-1?'tabbarbot':'notabbarbot3'" :style="'background:linear-gradient(90deg,'+t('color2')+' 0%,rgba('+t('color2rgb')+',0.8) 100%)'" @tap="getweixinaddress"><image :src="event_rul + '/static/img/static/img/add.png'" style="width:28rpx;height:28rpx;margin-right:6rpx"/>获取微信地址</view>
+		</block>
+		<block v-else>
+			<view class="btn-add" :class="menuindex>-1?'tabbarbot':'notabbarbot3'" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" :data-url="'/activity/express/addressadd?type=' + type"><image :src="event_rul + '/static/img/static/img/add.png'" style="width:28rpx;height:28rpx;margin-right:6rpx"/>添加地址</view>
+		</block>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+	opt:{},
+	loading:false,
+	isload: false,
+	menuindex:-1,
+
+	datalist: [],
+	type: "",
+	keyword:'',
+	nodata:false,
+	event_rul: app.globalData.event_url,
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			that.nodata = false;
+			app.get('ApiExpress/address', {type: that.opt.type,keyword:that.keyword}, function (res) {
+				that.loading = false;
+				var datalist = res.data;
+				if (datalist.length == 0 && that.keyword == ''){
+					uni.redirectTo({
+						url: '/activity/express/addressadd?type=' + (that.opt.type || 0)
+					});
+				}else if(datalist.length == 0){
+					that.datalist = datalist;
+					that.nodata = true;
+				}else{
+					that.datalist = datalist;
+				}
+				that.loaded();
+			});
+		},
+    //选择收货地址
+    setdefault: function (e) {
+      var that = this;
+      var fromPage = this.opt.fromPage;
+			var mailtype = this.opt.mailtype;
+      var addressId = e.currentTarget.dataset.id;
+      app.post('ApiExpress/setdefault', {addressid: addressId,mailtype:mailtype}, function (data) {
+        if (fromPage) {
+          app.goback(true);
+        } else {
+          that.getdata();
+        }
+      });
+    },
+    del: function (e) {
+      var that = this;
+      var addressId = e.currentTarget.dataset.id;
+      console.log(addressId);
+      app.confirm('确定要删除此地址吗?', function () {
+        app.post("ApiExpress/del", {addressid: addressId}, function (res) {
+          app.success(res.msg);
+          that.getdata();
+        });
+      });
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    },
+		getweixinaddress:function(){
+      var that = this;
+			wx.chooseAddress({
+				success (res) {
+					app.showLoading('提交中');
+					app.post('ApiExpress/addressadd', {type: that.type,addressid: '',name: res.userName,tel: res.telNumber,area: res.provinceName+','+res.cityName+','+res.countyName,address: res.detailInfo}, function (res) {
+						app.showLoading(false);
+						if (res.status == 0) {
+							app.alert(res.msg);
+							return;
+						}
+						that.getdata();
+						app.success('添加成功');
+					});
+				}
+			})
+		}
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:20rpx 40rpx;}
+.content .f1{height:96rpx;line-height:96rpx;display:flex;align-items:center}
+.content .f1 .t1{color:#2B2B2B;font-weight:bold;font-size:30rpx}
+.content .f1 .t2{color:#999999;font-size:28rpx;margin-left:10rpx}
+.content .f1 .t3{width:28rpx;height:28rpx}
+.content .f2{color:#2b2b2b;font-size:26rpx;line-height:42rpx;padding-bottom:20rpx;border-bottom:1px solid #F2F2F2}
+.content .f3{height:96rpx;display:flex;align-items:center}
+.content .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;}
+.content .radio .radio-img{width:100%;height:100%}
+.content .mrtxt{color:#2B2B2B;font-size:26rpx;margin-left:10rpx}
+.content .del{font-size:24rpx}
+
+.container .btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:0;margin-bottom:20rpx;}
+.container .btn-add2{width:43%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:5%;bottom:0;margin-bottom:20rpx;}
+.container .btn-add3{width:43%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;right:5%;bottom:0;margin-bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/express/addressadd.vue b/activity/express/addressadd.vue
new file mode 100644
index 0000000..7ae8115
--- /dev/null
+++ b/activity/express/addressadd.vue
@@ -0,0 +1,261 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form">
+				<view class="form-item">
+					<text class="label">姓 名</text>
+					<input class="input" type="text" placeholder="请输入姓名" placeholder-style="font-size:28rpx;color:#BBBBBB" name="name" :value="name"></input>
+				</view>
+				<view class="form-item" v-if="showCompany">
+					<text class="label">公 司</text>
+					<input class="input" type="text" placeholder="请输入公司或单位名称" placeholder-style="font-size:28rpx;color:#BBBBBB" name="company" :value="company"></input>
+				</view>
+				<view class="form-item">
+					<text class="label">手机号</text>
+					<input class="input" type="number" placeholder="请输入手机号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="tel" :value="tel"></input>
+				</view>
+				<view class="form-item" v-if="type==1">
+					<text class="label flex0">选择位置</text>
+					<text class="flex1" style="text-align:right" :style="area ? '' : 'color:#BBBBBB'" @tap="selectzuobiao" >{{area ? area : '请选择您的位置'}}</text>
+					<!-- <input class="input" type="text" placeholder="请选择您的位置" placeholder-style="font-size:28rpx;color:#BBBBBB" name="area" :value="area" @tap="selectzuobiao"></input> -->
+				</view>
+				<view class="form-item" v-else>
+					<text class="label flex1">所在地区</text>
+					<uni-data-picker :localdata="items" :border="false" :placeholder="regiondata || '请选择省市区'" @change="regionchange"></uni-data-picker>
+					<!-- <picker mode="region" name="regiondata" :value="regiondata" class="input" @change="bindPickerChange">
+						<view class="picker" v-if="regiondata">{{regiondata}}</view>
+						<view v-else>请选择地区</view>
+					</picker> -->
+				</view>
+				<view class="form-item">
+					<text class="label">详细地址</text>
+					<input class="input" type="text" placeholder="请输入详细地址" placeholder-style="font-size:28rpx;color:#BBBBBB" name="address" :value="address"></input>
+				</view>
+				<view class="item flex-y-center" v-if="type!=1">
+					<view class="f2 flex-y-center flex1">
+						<input id="addressxx" placeholder="粘贴地址信息，可自动识别并填写，如：张三，188********，广东省 东莞市 xx区 xx街道 xxxx" placeholder-style="font-size:24rpx;color:#BBBBBB" style="width:85%;font-size:24rpx;margin:20rpx 0;height:100rpx;padding:4rpx 10rpx" @input="setaddressxx"></input>
+						<view style="width:15%;text-align:center;color:#999" @tap="shibie">识别</view>
+					</view>
+				</view>
+			</view>
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+	  opt:{},
+	  loading:false,
+	  isload: false,
+	  menuindex:-1,
+      name: '',
+      tel: '',
+      area: '',
+      address: '',
+      longitude: '',
+      latitude: '',
+      regiondata: '',
+      type: 0,
+      addressxx: '',
+      company: '',
+			items:[],
+			showCompany:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+    this.type = this.opt.type || 0;
+		var that = this;
+		app.get('ApiIndex/getCustom',{}, function (customs) {
+			var url = app.globalData.pre_url+'/static/area.json';
+			if(customs.data.includes('plug_zhiming')) {
+				url = app.globalData.pre_url+'/static/area_gaoxin.json';
+			}
+			uni.request({
+				url: url,
+				data: {},
+				method: 'GET',
+				header: { 'content-type': 'application/json' },
+				success: function(res2) {
+					that.items = res2.data
+				}
+			});
+		});
+		
+    this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			var addressId = that.opt.id || '';
+			app.get('ApiIndex/getCustom',{}, function (customs) {
+				if(customs.data.includes('plug_xiongmao')) {
+					that.showCompany = true;
+				}
+			});
+			if(addressId) {
+				that.loading = true;
+				app.get('ApiExpress/addressadd', {id: addressId,type: that.type}, function (res) {
+					that.loading = false;
+					that.name = res.data.name;
+					that.tel = res.data.tel;
+					that.area = res.data.area;
+					that.address = res.data.address;
+					that.longitude = res.data.longitude;
+					that.latitude = res.data.latitude;
+					that.company = res.data.company;
+					if (res.data.province){
+						var regiondata = res.data.province+ ',' + res.data.city+ ',' + res.data.district;
+					} else {
+						var regiondata = '';
+					}
+					that.regiondata = regiondata
+					that.loaded();
+				});
+			}else{
+				that.loaded();
+			}
+		},
+		regionchange(e) {
+			const value = e.detail.value
+			console.log(value[0].text + ',' + value[1].text + ',' + value[2].text);
+			this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text
+		},
+    selectzuobiao: function () {
+      var that = this;
+      uni.chooseLocation({
+        success: function (res) {
+          console.log(res);
+          that.area = res.address;
+          that.address = res.name;
+          that.latitude = res.latitude;
+          that.longitude = res.longitude;
+        },
+        fail: function (res) {
+					console.log(res)
+          if (res.errMsg == 'chooseLocation:fail auth deny') {
+            //$.error('获取位置失败，请在设置中开启位置信息');
+            app.confirm('获取位置失败，请在设置中开启位置信息', function () {
+              uni.openSetting({});
+            });
+          }
+        }
+      });
+    },
+    formSubmit: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+      var addressId = that.opt.id || '';
+      var name = formdata.name;
+      var tel = formdata.tel;
+      var regiondata = that.regiondata;
+      var mailtype = that.opt.mailtype || '';
+      if (that.type == 1) {
+        var area = that.area;
+				if(area == '') {
+					app.error('请选择位置');
+					return;
+				}
+      } else {
+        var area = regiondata;
+				if(area == '') {
+					app.error('请选择省市区');
+					return;
+				}
+      }
+      var address = formdata.address;
+      var longitude = that.longitude;
+      var latitude = that.latitude;
+      var company = formdata.company;
+
+      if (name == '' || tel == '' || address == '') {
+        app.error('请填写完整信息');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiExpress/addressadd', {mailtype:mailtype,type: that.type,addressid: addressId,name: name,tel: tel,area: area,address: address,latitude: latitude,longitude: longitude,company:company}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          app.alert(res.msg);
+          return;
+        }
+        app.success('保存成功');
+        setTimeout(function () {
+          app.goback(true);
+        }, 1000);
+      });
+    },
+    delAddress: function () {
+      var that = this;
+      var addressId = that.opt.id;
+      app.confirm('确定要删除该收获地址吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiExpress/del', {addressid: addressId}, function () {
+					app.showLoading(false);
+          app.success('删除成功');
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    bindPickerChange: function (e) {
+      var val = e.detail.value;
+      this.regiondata = val;
+    },
+    setaddressxx: function (e) {
+      this.addressxx = e.detail.value;
+    },
+    shibie: function () {
+      var that = this;
+      var addressxx = that.addressxx;
+      app.post('ApiExpress/shibie', {addressxx: addressxx}, function (res) {
+        var isrs = 0;
+        if (res.province) {
+          isrs = 1;
+          that.regiondata = res.province + ',' +res.city + ',' +res.county
+        }
+        if (res.detail) {
+          isrs = 1;
+          that.address = res.detail
+        }
+        if (res.person) {
+          isrs = 1;
+          that.name = res.person
+        }
+        if (res.phonenum) {
+          isrs = 1;
+          that.tel = res.phonenum
+        }
+        if (isrs == 0) {
+          app.error('识别失败');
+        } else {
+          app.success('识别完成');
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{ color:#8B8B8B;font-weight:bold;height: 60rpx; line-height: 60rpx; text-align:left;width:150rpx;padding-right:20rpx}
+.form-item .input{ flex:1;height: 60rpx; line-height: 60rpx;text-align:right}
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+</style>
\ No newline at end of file
diff --git a/activity/express/common.css b/activity/express/common.css
new file mode 100644
index 0000000..bdf3c75
--- /dev/null
+++ b/activity/express/common.css
@@ -0,0 +1,12 @@
+.tabbar{height: auto; position: relative;}
+.tabbar-icon {width: 50rpx;height: 50rpx;}
+.tabbar-bar {display: flex;flex-direction: row;width: 100%;height:100rpx;position: fixed;bottom: 0;padding:10rpx 0 0 0;background: #fff;font-size: 24rpx;color: #999;border-top: 1px solid #e5e5e5;z-index: 8;box-sizing:content-box}
+.tabbar-item {flex: 1;text-align: center;overflow: hidden;}
+.tabbar-image-box {height: 54rpx;margin-bottom: 4rpx;}
+.tabbar-text {line-height: 30rpx;font-size: 24rpx;color:#222222}
+.tabbar-text.active{color:#06A051}
+.tabbar-bot{height:110rpx;width:100%;box-sizing:content-box}
+@supports(bottom: env(safe-area-inset-bottom)){
+	.tabbar-bot{padding-bottom:env(safe-area-inset-bottom);}
+	.tabbar-bar{padding-bottom:env(safe-area-inset-bottom);}
+}
\ No newline at end of file
diff --git a/activity/express/index.vue b/activity/express/index.vue
new file mode 100644
index 0000000..aeee5c3
--- /dev/null
+++ b/activity/express/index.vue
@@ -0,0 +1,230 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view> 
+				<view class="search-container" :style="{background:t('color1')}">
+					<view class="search-box">
+						<picker style="font-size:28rpx;padding:10rpx;height:70rpx;border-radius:4px;flex:1;"  @change="expresschange" :value="express_index" :range="expressdata" >
+							<view class="picker"  @change="expresschange" :value="express_index" :range="expressdata" >{{expressdata[express_index]?expressdata[express_index]:'请选择快递公司'}}</view>
+						</picker>
+						<image class="img" :src="event_rul + '/static/img/static/img/exp_xiala.png'"></image>
+						<input class="search-text" :value="keyword"  @confirm="searchConfirm" @input="searchChange" placeholder="输入快递单号或扫码查询" placeholder-style="color:#fff;font-size:24rpx"/>
+						<view class="set" @tap="saoyisao">
+							<image :src="event_rul + '/static/img/static/img/ico-scan.png'" class="img"></image>
+						</view>
+					</view>
+				</view>
+				<view class="wrap">
+						<view class="top_title flex">
+								<view class="tab" @tap="goto" data-url="mail"><image :src="event_rul + '/static/img/static/img/exp_mail.png'"></image><text>我要寄件</text></view>
+								<view class="tab"  @tap="goto" data-url="/pages/my/usercenter"><image :src="event_rul + '/static/img/static/img/exp_my.png'"></image><text>个人中心</text></view>	
+						</view>		
+						<view class="list_box">
+								<view class="tab-box flex">
+										<view  :class="'tab2 ' + (curTopIndex == 1 ? 'on' : '')"  :data-index="1"  @tap="switchTopTab" >最近查询</view>
+										<view  :class="'tab2 ' + (curTopIndex == 2 ? 'on' : '')" :data-index="2"   @tap="switchTopTab" >我的寄件</view>
+								</view>
+								<view class="list" v-for="(item, index) in datalist" :key="index" v-if="curTopIndex==1"  @tap="goto" :data-url="'/activity/express/logistics?com='+item.company+'&num='+item.num">
+										<view class="text1 flex"><view>{{item.company}}:{{item.num}}<image class="fuzhi" :src="event_rul + '/static/img/static/img/exp_fuzhi.png'"></image></view><text class="t3">查</text></view>
+										<view class="text2 flex">
+												<view class="t1_box"><text>{{item.text}}</text></view>
+										</view>
+								</view>
+								<view class="list" v-for="(item, index) in datalist" :key="index" v-if="curTopIndex==2" @tap="goto" :data-url="'/activity/express/kddetail?id='+item.id" >
+										<view class="text1 flex"><view class="com">{{item.company}}</view><text class="t4">{{item.status}}</text></view>
+										<view class="text2 flex">
+												<view class="t2_box"><text >{{item.sendManPrintCity}}</text><text class="t2">{{item.sendManName}}</text></view>
+												<view class="t2_box"><image class="jiantou"  :src="event_rul + '/static/img/static/img/jiantou.png'"></image></view>
+												<view class="t2_box"><text>{{item.recManPrintCity}}</text><text class="t2">{{item.recManName}}</text></view>
+										</view>
+								</view>
+								<nodata v-if="nodata"></nodata>
+						</view>
+				</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		datalist:[],
+		pre_url:app.globalData.pre_url,
+		platform:'',
+		platformname:'',
+		platformimg:'weixin',
+		smsdjs: '',
+		tel:'',
+		hqing: 0,
+		frompage:'/pages/express/mail',
+		address: [],
+		expressdata:[],
+		express_index:-1,
+		express_no:'',
+		pstimeDialogShow: false,
+		pstimetext:'',
+		sm_time:'',
+		address2:[],
+
+		keyword:'',
+		curTopIndex:1,
+		event_rul: app.globalData.event_url,
+    };
+  },
+	onLoad: function (opt) {
+		var that=this
+		this.opt = app.getopts(opt);
+	  that.loaded();
+		this.getdatalist();
+		
+	},
+	methods: {
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;  
+			var pagenum = that.pagenum;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var order = that.order;
+		  var keyword = that.keyword;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			var type=that.curTopIndex
+			app.post('ApiExpress/getLog', {pagenum: pagenum,keyword: keyword,field: field,order: order,bid:bid,type:type,}, function (res) { 
+				that.loading = false;
+				uni.stopPullDownRefresh();
+				var data = res.data.datalist;
+				if (data.length == 0) {
+					if(pagenum == 1){
+						that.nodata = true;
+					}else{
+						that.nomore = true;
+					}
+				}
+				that.expressdata = res.data.expressdata
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+			});
+		},
+		expresschange:function(e){
+			var that=this
+			that.express_index = e.detail.value;
+			console.log(that.express_index);
+		},
+
+   searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+		  var company = that.expressdata[that.express_index];
+			app.goto('/activity/express/logistics?com=' +company+'&num='+keyword);
+	
+    },
+	 
+	  bindPickerChange: function (e) {
+	    var val = e.detail.value;
+	    this.regiondata = val;
+	  },
+	  setaddressxx: function (e) {
+	    this.addressxx = e.detail.value;
+	  },
+		switchTopTab: function (e) {
+		  var that = this;
+		  var id = e.currentTarget.dataset.id;
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  this.curTopIndex = index;
+		  this.getdatalist();
+		}, 
+		saoyisao: function (d) {
+		  var that = this;
+			if(app.globalData.platform == 'h5'){
+				app.alert('请使用微信扫一扫功能扫码核销');return;
+			}else if(app.globalData.platform == 'mp'){
+				var jweixin = require('jweixin-module');
+				jweixin.ready(function () {   //需在用户可能点击分享按钮前就先调用
+					jweixin.scanQRCode({
+						needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+						scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+						success: function (res) {
+							var content = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+							if(result.includes('CODE_128')){
+										var params = content.split(',')[1];
+							}
+							//location.href = content;
+							app.goto('/activity/express/logistics?num='+params);
+							//if(content.length == 18 && (/^\d+$/.test(content))){ //是十八位数字 付款码
+							//	location.href = "{:url('shoukuan')}/aid/{$aid}/auth_code/"+content
+							//}else{
+							//	location.href = content;
+							//}
+						}
+					});
+				});
+			}else{
+				uni.scanCode({
+					success: function (res) {
+						console.log(res);
+						var content = res.result;
+						var params = content.split(',')[1];
+						app.goto('/activity/express/logistics?num='+params);
+					}
+				});
+			}
+		}
+	}
+}
+</script>
+<style>
+	@import "./common.css";
+	.container{ width:100%;display:flex;flex-direction:column}
+	.search-container {width: 100%;height:250rpx;padding: 20rpx 23rpx 20rpx 23rpx;background-color: #FC4343;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+	.search-box {margin-top:55rpx;display:flex;align-items:center;height:88rpx;border-radius:12rpx;border:0; background-color:rgba(247,247,247,0.2); flex:1; }
+	.search-box .img{width:40rpx;height:40rpx;margin-right:20rpx;margin-left:30rpx}
+	.search-box .search-text {font-size:26rpx;text-align:center;color:#fff;width: 100%;}
+	
+	.wrap{ background:#EDEDED; position: relative;top:-20rpx; padding:40rpx; border-radius: 24rpx;}
+	.top_title{ height: 180rpx; line-height: 180rpx; background: #fff; }
+	.top_title .tab{  width: 50%;display: flex; justify-content: center;}
+	.top_title image{ width: 64rpx; height: 64rpx;  margin-top: 55rpx;}
+	.top_title .tab text{ line-height: 180rpx; color: #222222; font-size: 28rpx; font-weight: bold; margin-left: 10rpx;}
+	
+	.tab-box{ margin-top: 60rpx; font-size: 28rpx; margin-bottom:60rpx;}
+	.tab-box .tab2{ color:#666; margin-right: 30rpx;padding-bottom: 20rpx; }
+	.tab-box .tab2.on{ color: #222222; border-bottom:4rpx solid #222;}
+	
+	.list{ background: #fff; border-radius:12rpx ; margin-top: 20rpx;}
+	.list .text1{ border-bottom: 1px solid #eee; padding: 20rpx; justify-content: space-between;}
+	.list .text1 .com{ font-size: 24rpx; color:#888888}
+	.list .text1 .t4{font-size: 24rpx;color:#222222 }
+	.list .text1 .fuzhi{ width:28rpx; height: 28rpx; margin-left: 20rpx;}
+	.list .text1 .t3{ font-size:20rpx; color: #E2E2E2; border: 1px solid #E2E2E2;padding: 5rpx;}
+	.list .text2 .jiantou{ width: 124rpx; height: 16rpx;}
+	.list .text2{ justify-content: center; width:100%; padding: 40rpx; }
+	.list .text2 .t1_box{ width: 100%; font-size: 24rpx; color:#222} 
+	.list .text2 .t1_box .t2{ display: flex; justify-content: center; font-size: 24rpx;color:#888;  } 
+	.list .text2 .t2_box{ width: 33.33%; text-align: center; font-size: 36rpx; color:#222} 
+	.list .text2 .t2_box .t2{ display: flex; justify-content: center; font-size: 24rpx;color:#888; margin-top: 10rpx;} 
+
+	.picker{width:90rpx;color:#fff;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;text-align: right; line-height: 50rpx;}
+
+</style>
\ No newline at end of file
diff --git a/activity/express/kddetail.vue b/activity/express/kddetail.vue
new file mode 100644
index 0000000..d099772
--- /dev/null
+++ b/activity/express/kddetail.vue
@@ -0,0 +1,219 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="expressinfo">
+			<view class="head">
+				<view class="f1"><view v-if="data.kuaidinum">运单号：{{data.kuaidinum}}</view>
+				<view v-else>订单号：{{data.ordernum}}</view>
+				<view></view></view>
+				<view class="f2 flex">
+					<view class="t2_box"><text>{{data.sendManPrintCity}}</text><text class="t2">{{data.sendManName}}</text></view>
+					<view class="t2_box"><image class="jiantou"  :src="event_rul + '/static/img/static/img/jiantou.png'"></image><view class="t2">{{data.sta}}</view></view>
+					<view class="t2_box"><text>{{data.recManPrintCity}}</text><text class="t2">{{data.sendManName}}</text></view>
+				</view>
+			</view>
+			<view class="content">
+				
+				<block v-if="datalist">
+					<view v-for="(item, index) in datalist" :key="index" :class="'item ' + (index==0?'on':'')">
+						<view class="f1"><image :src="event_rul + '/static/img/static/img/dot' + (index==0?'2':'1') + '.png'"></image></view>
+						<view class="f2">
+							<text class="t2">{{item.time}}</text>
+							<text class="t1">{{item.context}}</text>
+						</view>
+					</view>
+					<nodata v-if="nodata" text="暂未查找到物流信息"></nodata>
+				</block>
+				<view v-else class="item">
+					<view class="f1"><image :src="event_rul + '/static/img/static/img/dot' + (index==0?'2':'1') + '.png'"></image></view>
+					<view class="f2">
+						<text class="t2">{{data.sta}}</text>
+						<text class="t1"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	
+	<uni-popup id="dialogRemark" ref="dialogExpress" type="dialog">
+		<view style="background:#fff;padding:20rpx 30rpx;border-radius:10rpx;width:600rpx" >
+			<form @submit="formSubmit">
+			<view class="sendexpress-item" style="padding:20rpx 0;">
+					<view>	
+						<input class="input" type="text" placeholder="请输入原因" placeholder-style="font-size:28rpx;color:#BBBBBB" name="remark" ></input>
+					</view>
+					<button  class="submit" form-type="submit" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'"> 确定取消</button>
+			</view>
+			</form>
+		</view>
+	</uni-popup>
+	
+
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	
+</view>
+
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		nodata:false,
+		express_com: '',
+		express_no: '',
+		datalist: [],
+		data:[],
+		orderinfo: {},
+		prolist: [],
+		binfo: {},
+		psuser: {},
+		psorder: {},
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onPullDownRefresh: function () {
+    this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.id = that.opt.id;
+			that.loading = true;
+			app.post('ApiExpress/kddetail', {id: that.id}, function (res) {
+				that.loading = false;
+				that.data = res.data
+				var datalist = res.datalist;
+				if (datalist.length < 1) {
+					that.nodata = true;
+				}
+				that.datalist = datalist;
+				that.loaded();
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		},
+		cancle:function(e){
+			this.$refs.dialogExpress.open();
+		},
+		formSubmit: function (e) {
+		  var that = this;
+		  var formdata = e.detail.value;
+			console.log(formdata);
+		  if (formdata['remark'] == '' ) {
+		    app.error('请填写原因');
+		    return;
+		  }
+			app.showLoading('提交中');
+		  app.post('ApiExpress/cancle', {id:that.id,remark: formdata['remark']}, function (res) {
+				app.showLoading(false);
+		    if (res.status == 1) {
+		      app.success('取消成功');
+		      setTimeout(function () {
+		        app.goback(true);
+		      }, 1000);
+		    }else{
+					app.alert(res.msg);
+					return;
+				}
+		    
+		  });
+		},
+  }
+}
+</script>
+<style>
+.expressinfo{}
+.expressinfo .head { width:95%;background: #fff; margin:20rpx ;padding: 20rpx 20rpx;align-items:center; border-radius: 10rpx;}
+.expressinfo .head .f1{margin-right:20rpx;border-bottom:1px solid #E2E2E2; height: 60rpx;}
+.expressinfo .head .f1 image{width:100%;height:100%}
+.expressinfo .head .f2{display:flex;font-size:30rpx;color:#999999; margin-top: 20rpx;}
+.expressinfo .head .f2 .t1{margin-bottom:8rpx}
+.expressinfo .content{ width: 95%; margin: 20rpx; border-radius: 10rpx;  background: #fff;display:flex;flex-direction:column;color: #979797;padding:20rpx 40rpx; padding-bottom: 100rpx;;}
+.expressinfo .content .on{color: #23aa5e;}
+.expressinfo .content .item{display:flex;width: 96%;  margin: 0 2%;border-left: 1px #dadada solid;padding:10rpx 0}
+.expressinfo .content .item .f1{ width:40rpx;flex-shrink:0;position:relative}
+.expressinfo .content image{width: 30rpx; height: 30rpx; position: absolute; left: -16rpx; top: 22rpx;}
+/*.content .on image{ top:-1rpx}*/
+.expressinfo .content .item .f1 image{ width: 30rpx; height: 30rpx;}
+
+.expressinfo .content .item .f2{display:flex;flex-direction:column;flex:auto;}
+.expressinfo .content .item .f2 .t1{font-size: 30rpx;}
+.expressinfo .content .item .f2 .t1{font-size: 26rpx;}
+
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.head .jiantou{ width: 124rpx; height: 16rpx;}
+.head .t2_box{ width: 33.33%; text-align: center; font-size: 36rpx; color:#222} 
+.head .t2_box .t2{ display: flex; justify-content: center; font-size: 24rpx;color:#888; margin-top: 10rpx;} 
+
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;align-items:center;height:100rpx;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+.tobuy{width: 80%; margin: auto; line-height: 72rpx;color: #fff; border-radius:40rpx; 
+background-color: #007AFF; border: none;font-size:28rpx;font-weight:bold; height: 80rpx; position: fixed; left:10%; bottom: 0;}
+
+.submit{ width:200rpx;height:80rpx; line-height: 80rpx; text-align:center;border-radius:10rpx; color: #fff;font-weight:bold; margin-top:60rpx; border: none; }
+</style>
\ No newline at end of file
diff --git a/activity/express/logistics.vue b/activity/express/logistics.vue
new file mode 100644
index 0000000..1109e78
--- /dev/null
+++ b/activity/express/logistics.vue
@@ -0,0 +1,159 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="expressinfo">
+			<view class="head">
+				<view class="f1"><image :src="pre_url + '/static/img/feiji.png'"></image></view>
+				<view class="f2">
+					<view class="t1">快递公司：<text style="color:#333">{{express_com}}</text></view>
+					<view class="t2">快递单号：<text style="color:#333">{{express_no}}</text></view>
+				</view>
+			</view>
+			<view class="content">
+				<view v-for="(item, index) in datalist" :key="index" :class="'item ' + (index==0?'on':'')">
+					<view class="f1"><image :src="event_rul +'/static/img/static/img/dot' + (index==0?'2':'1') + '.png'"></image></view>
+					<view class="f2">
+						<text class="t2">{{item.time}}</text>
+						<text class="t1">{{item.context}}</text>
+					</view>
+				</view>
+				<nodata v-if="nodata" text="暂未查找到物流信息"></nodata>
+			</view>
+		</view>
+	</block>
+	<view class="tobuy flex-x-center flex-y-center" @tap="goto" data-url="mail"  :style="{background:t('color1')}" >我要寄件</view>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		nodata:false,
+		express_com: '',
+		express_no: '',
+		datalist: [],
+
+		orderinfo: {},
+		prolist: [],
+		binfo: {},
+		psuser: {},
+		psorder: {},
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onPullDownRefresh: function () {
+    this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.express_com = that.opt.com;
+			that.express_no = that.opt.num;
+			that.loading = true;
+			app.post('ApiExpress/logistics', {com: that.express_com,num: that.express_no}, function (res) {
+				that.loading = false;
+				var datalist = res.datalist.data;
+				if (datalist.length < 1) {
+					that.nodata = true;
+				}
+				that.express_com = res.com
+				that.datalist = datalist;
+				that.loaded();
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		}
+  }
+}
+</script>
+<style>
+.expressinfo{}
+.expressinfo .head { width:100%;background: #fff; margin:20rpx 0;padding: 20rpx 20rpx;display:flex;align-items:center}
+.expressinfo .head .f1{ width:120rpx;height:120rpx;margin-right:20rpx}
+.expressinfo .head .f1 image{width:100%;height:100%}
+.expressinfo .head .f2{display:flex;flex-direction:column;flex:auto;font-size:30rpx;color:#999999}
+.expressinfo .head .f2 .t1{margin-bottom:8rpx}
+.expressinfo .content{ width: 100%;  background: #fff;display:flex;flex-direction:column;color: #979797;padding:20rpx 40rpx; padding-bottom: 100rpx;;}
+.expressinfo .content .on{color: #23aa5e;}
+.expressinfo .content .item{display:flex;width: 96%;  margin: 0 2%;border-left: 1px #dadada solid;padding:10rpx 0}
+.expressinfo .content .item .f1{ width:40rpx;flex-shrink:0;position:relative}
+.expressinfo .content image{width: 30rpx; height: 30rpx; position: absolute; left: -16rpx; top: 22rpx;}
+/*.content .on image{ top:-1rpx}*/
+.expressinfo .content .item .f1 image{ width: 30rpx; height: 30rpx;}
+
+.expressinfo .content .item .f2{display:flex;flex-direction:column;flex:auto;}
+.expressinfo .content .item .f2 .t1{font-size: 30rpx;}
+.expressinfo .content .item .f2 .t1{font-size: 26rpx;}
+
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;align-items:center;height:100rpx;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+.tobuy{width: 80%; margin: auto; line-height: 72rpx;color: #fff; border-radius:40rpx; 
+background-color: #007AFF; border: none;font-size:28rpx;font-weight:bold; height: 80rpx; position: fixed; left:10%; bottom: 0;}
+
+</style>
\ No newline at end of file
diff --git a/activity/express/mail.vue b/activity/express/mail.vue
new file mode 100644
index 0000000..ebdab2c
--- /dev/null
+++ b/activity/express/mail.vue
@@ -0,0 +1,358 @@
+<template>
+<view class="container">
+	<block>
+		<form @submit="formSubmit">
+		<view  class="content1" >
+			<view class="top flex" >
+				<view class="f1">
+						<image :src="event_rul + '/static/img/static/img/exp_ji.png'"></image>
+				</view>
+				<view class="f2" v-if="address.id"  @tap="goto" data-url="address?fromPage=mail&mailtype=1">
+						<view class="t1">{{address.name}} {{address.tel}}</view>
+						<view class="t2">{{address.area}} {{address.address}} </view>
+				</view>
+				<view class="f2" v-else @tap="goto" data-url="addressadd?fromPage=mail&mailtype=1">
+						<view class="t1">寄件人信息</view>
+						<view class="t2">点击填写寄件地址,自动智能填写 </view>
+				</view>
+				<view class="f3" @tap="goto" data-url="address?fromPage=mail&mailtype=1" >
+					<view><image :src="event_rul + '/static/img/static/img/exp_txl.png'"></image></view>
+					<view class="t3" >地址薄</view>
+				</view>
+			</view>
+			<view class="top2 flex">
+				<view class="f1">
+						<image :src="event_rul + '/static/img/static/img/exp_shou.png'"></image>
+				</view>
+				<view class="f2" v-if="address2.id"  @tap="goto" data-url="address?fromPage=mail&mailtype=2">
+						<view class="t1">{{address2.name}} {{address2.tel}}</view>
+						<view class="t2">{{address2.area}} {{address2.address}} </view>
+				</view>
+				<view class="f2" v-else @tap="goto" data-url="addressadd?fromPage=mail&mailtype=2">
+						<view class="t1">收件人信息</view>
+						<view class="t2">复制完整信息，自动智能填写</view>
+				</view>
+				<view class="f3" @tap="goto" data-url="address?fromPage=mail&mailtype=2">
+					<view><image :src="event_rul + '/static/img/static/img/exp_txl.png'"></image></view>
+					<view class="t3" >地址薄</view>
+				</view>
+			</view>
+		</view>
+		
+		
+	<view class="form">
+		<view class="form-item">
+			<text class="label">物品信息</text>
+			<input class="input" type="text" placeholder="请输入物品信息" placeholder-style="font-size:28rpx;color:#BBBBBB" name="cargo" ></input>
+		</view>
+		<view class="form-item">
+			<text class="label">预估重量</text>
+			<view class="addnum">
+				<view class="minus"><image class="img" :src="event_rul + '/static/img/static/img/cart-minus.png'" @tap="minus" /></view>
+				<input class="input" type="number" :value="this.weight"></input>KG &nbsp;
+				<view class="plus"><image class="img" :src="event_rul + '/static/img/static/img/cart-plus.png'" @tap="plus" /></view>
+			</view>
+		</view>
+		<view class="form-item">
+			<text class="label">选择配送公司</text>
+			<picker v-if="expressdata" @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+					<view class="picker" style="height:70rpx;"  @tap="changeyl">{{expressdata[express_index]?expressdata[express_index]:'请选择配送公司'}}</view>
+			</picker>
+			<view v-else class="picker" style="height:70rpx;" @tap="changeyl">{{expressdata[express_index]?expressdata[express_index]:'请选择配送公司'}}</view>
+			<image :src="event_rul + '/static/img/static/img/arrowright.png'"  class="icon">
+		</view>
+		<view class="form-item">
+			<text class="label">期望上门时间</text>
+			<view class="input"  @tap="choosePstime"  :data-bid="0">
+				{{pstimetext==''?'请选择上门时间':pstimetext}}
+			</view>
+			<image :src="event_rul + '/static/img/static/img/arrowright.png'" class="icon">
+		</view>
+
+
+		<view class="form-item">
+			<text class="label">给快递员留言</text>
+			<input class="input" type="text" placeholder="选填" placeholder-style="font-size:28rpx;color:#BBBBBB" name="remark" ></input>
+		</view>
+
+	</view>
+		<view  v-if="showxieyi"  class="xieyibox">
+			<view class="xieyibox-content">
+				<view style="overflow:scroll;height:100%;">
+					<parse @navigate="navigate"></parse>
+				</view>
+				<view style="position:absolute;z-index:9999;bottom:10px;left:0;right:0;margin:0 auto;text-align:center; width: 50%;height: 60rpx; line-height: 60rpx; color: #fff; border-radius: 8rpx;"   @tap="hidexieyi">已阅读并同意</view>
+			</view>
+		</view>
+		<view class="bottom flex">
+				<view class="left">
+						<view>
+							<text class="t1" v-if="price">￥{{price}}</text>
+							<text class="t1" v-else>￥--</text>
+							<text class="t2">预估运费</text>
+						</view>
+						<view class="t3">注：费用以实际寄件为准</view>
+				</view>
+				<view>
+					<button class="tobuy" :style="{background:t('color1')}" form-type="submit" >下单</button>
+				</view>
+		</view>
+		</form>
+	</block>
+	
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	
+	<view v-if="pstimeDialogShow" class="popup__container">
+		<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+		<view class="popup__modal">
+			<view class="popup__title">
+				<text
+					class="popup__title-text">请选择上门时间</text>
+				<image :src="event_rul + '/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+					@tap.stop="hidePstimeDialog" />
+			</view>
+			<view class="popup__content">
+				<view class="pstime-item"
+					v-for="(item, index) in pstimeArr"
+					:key="index" @tap="pstimeRadioChange" :data-index="index">
+					<view class="flex1">{{item.title}}</view>
+					<view class="radio"
+						:style="sm_time==item.value ? 'background:'+t('color1')+';border:0' : ''">
+						<image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'" />
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	
+	
+	
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+	opt:{},
+	loading:false,
+	isload: false,
+	menuindex:-1,
+	pre_url:app.globalData.pre_url,
+	platform:'',
+	platformname:'',
+	platformimg:'weixin',
+	showxieyi:false,
+	isagree:false,
+	smsdjs: '',
+	tel:'',
+	hqing: 0,
+	frompage:'/pages/express/mail',
+	address: [],
+	expressdata:[],
+	express_index:-1,
+	express_no:'',
+	pstimeDialogShow: false,
+	pstimetext:'',
+	sm_time:'',
+	address2:[],
+	weight:1,
+	price:0,
+	event_rul: app.globalData.event_url,
+    };
+  },
+	onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			app.get('ApiExpress/getAddress', {}, function(res) {
+					that.loading = false;
+					if (res.status == 0) {
+						if (res.msg) {
+							app.alert(res.msg)
+						}
+					}
+					//that.expressdata = res.data.expressdata;
+					that.address = res.data.address;
+					that.address2 = res.data.address2;
+					that.addressid =that.address.id
+					that.address2id =that.address2.id
+					that.pstimeArr = res.data.pstimeArr;
+					that.loaded();
+			});
+		},
+		regionchange(e) {
+			const value = e.detail.value
+			console.log(value[0].text + ',' + value[1].text + ',' + value[2].text);
+			this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text
+		},
+		expresschange:function(e){
+			var that=this
+			that.express_index = e.detail.value;
+
+		  this.getprice()
+		},
+		changeyl:function(e){
+			var that=this
+			if(!that.address2id){
+					app.alert('请填写寄件地址');return;
+			}
+			app.get('ApiExpress/getYunli', { addressid:that.address2id}, function(res) {
+						if (res.status == 1) {
+								that.expressdata = res.data
+						} else {
+								app.error(res.msg);return;
+						}
+			})
+		
+		},
+		getprice:function(e){
+			var that = this;
+			var company = that.expressdata[that.express_index];
+			var weight = that.weight;
+			var addressid = that.addressid;
+			var address2id = that.address2id;
+			app.post('ApiExpress/getPrice', {addressid: addressid,address2id: address2id,company:company,weight:weight
+			}, function (res) {
+				if (res.status == 1) {
+					that.price = res.data.combos[0].price
+				} else {
+					that.price ='';
+				}
+			});
+		},
+		choosePstime: function(e) {
+				var that = this;
+				var bid = e.currentTarget.dataset.bid;
+				var pstimeArr = that.pstimeArr;
+				var itemlist = [];
+				for (var i = 0; i < pstimeArr.length; i++) {
+					itemlist.push(pstimeArr[i].title);
+				}
+				if (itemlist.length == 0) {
+					app.alert('当前没有可选时间段');
+					return;
+				}
+				that.nowbid = bid;
+				that.pstimeDialogShow = true;
+				that.pstimeIndex = -1;
+		},
+		pstimeRadioChange: function(e) {
+			var that = this;
+			var pstimeIndex = e.currentTarget.dataset.index;
+			var choosepstime = that.pstimeArr[pstimeIndex];
+			that.pstimetext = choosepstime.title;
+		  that.sm_time = choosepstime.value;
+			that.pstimeDialogShow = false;
+		},
+		hidePstimeDialog: function() {
+			this.pstimeDialogShow = false;
+		},
+	  formSubmit: function (e) {
+	    var that = this;
+	    var formdata = e.detail.value;
+	    var addressId = that.opt.id || '';
+	    var cargo = formdata.cargo;
+	    var company = that.expressdata[that.express_index];
+	    var sm_time = that.sm_time;
+			var addressid = that.addressid;
+			var address2id = that.address2id;
+			if(!addressid){
+				app.error('请添加寄件地址');
+				return;
+			}
+			if(!address2id){
+				app.error('请添加收件地址');
+				return;
+			}
+	    if (company == '' ) {
+	      app.error('请先择配送公司');
+	      return;
+	    }
+			if (sm_time == '' ) {
+			  app.error('请先择上门时间');
+			  return;
+			}
+			app.showLoading('提交中');
+	    app.post('ApiExpress/createOrder', {type: that.type,addressid: addressid,address2id: address2id,cargo:cargo,company:company,
+			sm_time:sm_time,remark:formdata.remark,weight:that.weight}, function (res) {
+				app.showLoading(false);
+	      if (res.status == 0) {
+	        app.alert(res.msg);
+	        return;
+	      }
+	      app.success('寄件成功');
+	      setTimeout(function () {
+	       //app.goback(true);
+	      }, 1000);
+	    });
+	  },
+
+	  bindPickerChange: function (e) {
+	    var val = e.detail.value;
+	    this.regiondata = val;
+	  },
+	  setaddressxx: function (e) {
+	    this.addressxx = e.detail.value;
+	  },
+		//减
+		minus: function (e) {
+		 var num = this.weight;
+		 if(num>1){
+					this.weight = num-1; 
+		 }
+		  this.getprice()
+		},
+		//加
+		plus: function (e) {
+		  var num = this.weight;
+			this.weight = num+1;
+			this.getprice()
+		}
+	}
+}
+</script>
+<style>
+.content1{ background: #fff; margin: 30rpx; padding: 30rpx; border-radius: 12rpx;}
+.content1 .top2{ margin-top: 20px;border-top:1px solid #eee; padding-top: 30rpx;}
+.content1 .f1{ height: 130rpx;  display: flex; align-items: center; margin-right:20rpx}
+.content1 .f1 image{ width: 48rpx; height: 48rpx;line-height: 100rpx;}
+.content1 .f2{ border-right:1px solid  #eee; width:80%;}
+.content1 .f2 .t1{ color: #222; font-size: 32rpx; font-weight: bold;}
+.content1 .f2 .t2{ color: #909090; font-size: 24rpx; line-height: 40rpx; margin-top: 20rpx; }
+.content1 .f3{ width:180rpx; text-align: center; margin-top: 30rpx; }
+.content1 .f3 image{ width: 32rpx; height: 32rpx;  }
+.content1 .f3 .t3{ text-align: center;}
+
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding: 0 3%;background: #FFF;}
+.form .form-item{display:flex;width:100%;height:98rpx;justify-content: space-between;}
+.form-item:last-child{border:0}
+.form-item .label{ color:#222;font-weight:bold;height: 60rpx; line-height: 60rpx; text-align:left;width:200rpx;padding-right:20rpx}
+.form-item .input{ flex:1;height: 60rpx; line-height: 60rpx;text-align:right}.xieyibox{width:100%;height:100%;position:fixed;top:0;left:0;z-index:99;background:rgba(0,0,0,0.7)}
+.xieyibox-content{width:90%;margin:0 auto;height:80%;margin-top:20%;background:#fff;color:#333;padding:5px 10px 50px 10px;position:relative;border-radius:2px}
+
+.bottom{ position: fixed; bottom: 0; background: #fff; width: 100%; padding: 30rpx; justify-content: space-between;}
+.bottom .left .t1{ color: #FD4A46; font-size: 40rpx; font-weight: bold; }
+.bottom .left .t2{ color: #BBB; font-size: 24rpx; margin-left: 20rpx;}
+.bottom .left .t3{ color: #BBB; font-size: 20rpx; }
+.bottom .tobuy{width:240rpx ; line-height: 72rpx;color: #fff; border-radius:40rpx; 
+background-color: #007AFF; border: none;font-size:28rpx;font-weight:bold; height: 80rpx; }
+
+.form-item .icon{ width:32rpx; height: 32rpx; margin-top: 20rpx; }
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;text-align: right; line-height: 50rpx;}
+
+.pstime-item {display: flex;border-bottom: 1px solid #f5f5f5;padding: 20rpx 30rpx;}
+.pstime-item .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.pstime-item .radio .radio-img {width: 100%;height: 100%}
+.addnum {font-size: 30rpx;color: #666;width:auto;display:flex;}
+.form-item  .addnum input{ width: 80rpx; text-align: center; margin-top: -10rpx;}
+.addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.addnum .img{width:24rpx;height:24rpx}
+.addnum .i {padding: 0 20rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx}
+</style>
\ No newline at end of file
diff --git a/activity/ggk/index.vue b/activity/ggk/index.vue
new file mode 100644
index 0000000..6ef48dd
--- /dev/null
+++ b/activity/ggk/index.vue
@@ -0,0 +1,394 @@
+<template>
+<view class="container" style="background:#c40004">
+	<block v-if="isload">
+		<view class="wrap">
+			<view class="header clearfix">
+				<view class="rule" @tap="changemaskrule">活动规则</view>
+				<view @tap="goto" :data-url="'myprize?hid=' + info.id" class="my">我的奖品</view>
+			</view>
+			<view class="title" :style="'background-image:url(' + info.banner + ');background-size:100% 100%;'"></view>
+			
+			<view class="scratch-bg">
+				<view style="position:relative">
+					<image class="scratch-bg-1" :src="event_rul + '/static/img/static/img/scratch_bg.png'"></image>
+					<image class="scratch-bg-2" id="frame" :src="event_rul + '/static/img/static/img/scratch_kuang.png'"></image>
+					<view class="scratch-award">
+						<view class="scratch-award-a">
+							<block v-if="isStart && !showmaskrule && !jxshow"><canvas @touchend="touchEnd" @touchmove="touchMove" @touchstart="touchStart" canvasId="scratch" class="scratch-canvas" :disableScroll="isScroll" id="scratch" style="position:absolute;left:0;z-index:888"></canvas></block>
+							<view class="scratch-bg-text">
+								<block v-if="award_name"><text class="scratch-text-1">{{jxmc||'刮开图层'}}</text></block>
+								<block v-if="(remaindaytimes > 0 && award_name)">
+									<view @tap="onStart" class="scratch-bg-text-2">再刮一次</view>
+								</block>
+								<block v-if="(remaindaytimes <= 0 && award_name)">
+									<view class="scratch-bg-text-3">再刮一次</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="border" v-if="info.use_type != 2">您今日还有 <text id="change">{{remaindaytimes}}</text> 次抽奖机会</view>
+			<view class="border2" v-if="info.use_type == 1 && info.usescore>0">每次抽奖将消耗 <text>{{info.usescore}}</text> {{t('积分')}}，您共有 <text id="myscore">{{member.score}}</text> {{t('积分')}}</view>
+			<view class="border2" v-if="info.use_type == 2 && info.usemoney>0">每次抽奖将消耗 <text>{{t('余额')}}</text>{{info.usemoney}}元 ，您共有 <text id="mymoney">{{member.money}}</text> 元</view>
+			<!--滚动信息-->
+			<view class="scroll">
+				<view class="p" :style="'background-image:url('+pre_url+'/static/img/dzp/list.png);background-size:100% 100%;'"></view>
+				<view class="sideBox">
+					<swiper class="bd" autoplay="true" indicator-dots="false" current="0" vertical="true">
+						<swiper-item v-for="(item, index) in zjlist" :key="index" class="sitem" v-if="index%2==0">
+							<view>恭喜{{item.nickname}} 获得<text class="info">{{item.jxmc}}</text></view>
+							<view v-if="zjlist[index+1]">恭喜{{zjlist[index+1].nickname}} 获得<text class="info">{{zjlist[index+1].jxmc}}</text></view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+
+			<view id="mask-rule" v-if="showmaskrule">
+				<view class="box-rule">
+					<view class="h2">活动规则说明</view>
+					<view id="close-rule" @tap="changemaskrule" :style="'background-image:url('+pre_url+'/static/img/dzp/close.png);background-size:100%'"></view>
+					<view class="con">
+						<view class="text">
+							<text decode="true" space="true">{{info.guize}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var dot_inter, bool;
+var interval;
+var app = getApp();
+var windowWidth = uni.getSystemInfoSync().windowWidth;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		isStart: 1,
+		name: "",
+		jxmc: "",
+		detect: 1,
+		error: "",
+		info:{},
+		member:{},
+		jxarr:[],
+		remaindaytimes: 0,
+		remaintimes:0,
+		zjlist:[],
+		register: 1,
+		award_name: 0,
+		jxshow: false,
+		showmaskrule: false,
+		latitude: "",
+		longitude: "",
+		r: 0,
+		lastX: "",
+		lastY: "",
+		minX: "",
+		minY: "",
+		maxX: "",
+		maxY: "",
+		canvasWidth: "",
+		canvasHeight: "",
+		isScroll: false,
+		award: 0,
+		jx: "",
+		windowWidth:0,
+		windowHeight:0,
+		event_rul: app.globalData.event_url,
+    };
+  },
+	onLoad:function(opt){
+		this.opt = app.getopts(opt);
+	},
+  onReady: function () {
+		var that = this;
+		var res = uni.getSystemInfoSync();
+		that.windowWidth = res.windowWidth;
+		that.windowHeight = res.windowHeight;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onShareAppMessage: function () {
+		var that = this;
+		var title = that.info.name;
+		if (that.info.sharetitle) title = that.info.sharetitle;
+		var sharepic = that.info.sharepic ? that.info.sharepic : '';
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		return this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic,callback:function(){that.sharecallback();}});
+  },
+	onShareTimeline:function(){
+		var that = this;
+		var title = that.info.name;
+		if (that.info.sharetitle) title = that.info.sharetitle;
+		var sharepic = that.info.sharepic ? that.info.sharepic : '';
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		var sharewxdata = this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic,callback:function(){that.sharecallback();}});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiChoujiang/index', {id: id}, function (res) {
+				that.loading = false;
+				if(res.status == 0){
+					app.alert(res.msg);
+					return;
+				}
+				that.info = res.info;
+				that.jxarr = res.jxarr;
+				that.member = res.member;
+				that.remaindaytimes = res.remaindaytimes;
+				that.remaintimes = res.remaintimes;
+				that.zjlist = res.zjlist;
+				uni.setNavigationBarTitle({
+					title: res.info.name
+				});
+				that.onStart();
+				if (that.info.fanwei == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						that.latitude = latitude;
+						that.longitude = longitude;
+					});
+				}
+				var title = that.info.name;
+				if (that.info.sharetitle) title = that.info.sharetitle;
+				var sharepic = that.info.sharepic ? that.info.sharepic : '';
+				var sharelink = that.info.sharelink ? that.info.sharelink : '';
+				var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+				that.loaded({title:title,desc:sharedesc,link:sharelink,pic:sharepic,callback:function(){that.sharecallback();}});
+			});
+		},
+		sharecallback:function(){
+			var that = this;
+			app.post("ApiChoujiang/share", {hid: that.info.id}, function (res) {
+				if (res.status == 1) {
+					setTimeout(function () {
+						that.getdata();
+					}, 1000);
+				} else if (res.status == 0) {//dialog(res.msg);
+				}
+			});
+		},
+    changemaskrule: function () {
+      this.showmaskrule = !this.showmaskrule;
+    },
+    init: function () {
+			var windowWidth = this.windowWidth;
+			var windowHeight = this.windowHeight;
+      //var query = uni.createSelectorQuery();
+      var that = this;
+      that.award_name = 0;
+      //query.select("#frame").boundingClientRect();
+      //query.exec(function (res) {
+			//	console.log(res)
+        //var width = res[0].width;
+        //var height = res[0].height;
+				var width = windowWidth/750*600;
+				var height = windowWidth/750*320;
+				console.log(height)
+        that.r = 16;
+        that.lastX = "";
+        that.lastY = "";
+        that.minX = "";
+        that.minY = "";
+        that.maxX = "";
+        that.maxY = "";
+        that.canvasWidth = width;
+        that.canvasHeight = height;
+        var scratch = uni.createCanvasContext("scratch"); 
+				scratch.setFillStyle('#D3D3D3');
+        scratch.fillRect(0, 0, width, height);
+        scratch.draw();
+				console.log(scratch);
+
+        //scratch.drawImage("https://dev.lansoft.shop/static/img/static/img/scratch_hide_2.png", 0, 0, width, height);
+        //scratch.draw();
+        that.ctx = scratch;
+        that.isStart = 1;
+        that.isScroll = true;
+      //});
+    },
+    onStart: function () {
+      this.jxmc = '';
+      this.isStart = 1;
+      this.award = 0;
+      this.award_name = 0;
+			var that = this
+			setTimeout(function(){
+				that.init();
+			},100)
+    },
+    drawRect: function (t, e) {
+      var a = this.r / 2;
+      var i = 0 < t - a ? t - a : 0;
+      var s = 0 < e - a ? e - a : 0;
+      if("" !== this.minX){
+				this.minX = this.minX > i ? i : this.minX;
+				this.minY = this.minY > s ? s : this.minY;
+				this.maxX = this.maxX > i ? this.maxX : i;
+				this.maxY = this.maxY > s ? this.maxY : s;
+			}else{
+				this.minX = i;
+				this.minY = s;
+				this.maxX = i;
+				this.maxY = s;
+			}
+			this.lastX = i;
+      this.lastY = s;
+			[i, s, 2 * a];
+    },
+    clearArc: function (x, y, a) {
+      var r = this.r;
+      var ctx = this.ctx;
+      var x2 = r - a;
+      var y2 = Math.sqrt(r * r - x2 * x2);
+      var c = x - x2;
+      var n = y - y2;
+      var d = 2 * x2;
+      var p = 2 * y2;
+
+      if (a <= r) {
+        ctx.clearRect(c, n, d, p);
+        a += 1;
+        this.clearArc(x, y, a);
+      }
+    },
+    touchStart: function (t) {
+      this.award_name = 1
+      if (this.isStart && this.error) {
+        app.alert(this.error);
+      }
+    },
+    touchMove: function (t) {
+      if (this.isStart && !this.error) {
+        this.drawRect(t.touches[0].x, t.touches[0].y);
+        this.clearArc(t.touches[0].x, t.touches[0].y, 1);
+        this.ctx.draw(true);
+      }
+    },
+    touchEnd: function (t) {
+      if (this.isStart && !this.error) {
+        var that = this;
+        var canvasWidth = this.canvasWidth;
+        var canvasHeight = this.canvasHeight;
+        var minX = this.minX;
+        var minY = this.minY;
+        var maxX = this.maxX;
+        var maxY = this.maxY;
+
+        if (0.4 * canvasWidth < maxX - minX && 0.4 * canvasHeight < maxY - minY && this.detect) {
+          that.detect = 0;
+          app.post('ApiChoujiang/index', {id: that.info.id,op: 'getjx',longitude: that.longitude,latitude: that.latitude}, function (res) {
+            if (res.status != 1) {
+              app.alert(res.msg);
+              that.onStart();
+            } else {
+              that.jxmc = res.jxmc;
+              that.jx = res.jx;
+              that.remaindaytimes = that.remaindaytimes - 1;
+              setTimeout(function () {
+                that.detect = 1;
+                that.isStart = 0;
+                that.isScroll = true;
+              }, 1000);
+
+              if (res.jxtp == 2 && res.spdata) {
+                uni.sendBizRedPacket({
+                  timeStamp: res.spdata.timeStamp,
+                  // 支付签名时间戳，
+                  nonceStr: res.spdata.nonceStr,
+                  // 支付签名随机串，不长于 32 位
+                  package: res.spdata.package,
+                  //扩展字段，由商户传入
+                  signType: res.spdata.signType,
+                  // 签名方式，
+                  paySign: res.spdata.paySign,
+                  // 支付签名
+                  success: function (res) {
+                    console.log(res);
+                  },
+                  fail: function (res) {
+                    console.log(res);
+                  },
+                  complete: function (res) {
+                    console.log(res);
+                  }
+                });
+              }
+            }
+          });
+        }
+      }
+    }
+  }
+};
+</script>
+<style>
+.scratch-center{ position:relative; padding-top:380rpx; }
+.scratch-bg{ padding-top:30rpx;text-align:center;margin-bottom:80rpx}
+.scratch-bg-1 { width:640rpx; height:360rpx; }
+.scratch-bg-2 { position:absolute; top:20rpx; left:50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, 0); width:600rpx; height:320rpx; }
+.scratch-bg-3 { position:absolute; top:150rpx; left:50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, 0); line-height:80rpx; background:#f05525; border-radius:40rpx; padding:0 48rpx; color:#ffffff; }
+.scratch-award { position:absolute; top:20rpx; left:50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, 0); width:600rpx; height:320rpx; }
+.scratch-canvas { z-index:999; width:600rpx; height:320rpx; }
+.scratch-award-a { position:relative; top:0; left:0; width:600rpx; height:320rpx; }
+.scratch-bg-text { position:absolute; top:60rpx; left:50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, 0); }
+.scratch-text-1 { font-size:18pt; color:#f05525; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp:1; -webkit-box-orient: vertical; width:410rpx; }
+.scratch-bg-text-2 { width:400rpx; line-height:80rpx; color:#ffffff; margin-top:40rpx; border-radius:40rpx; background:#f05525; }
+.scratch-bg-text-3{ width:400rpx; line-height:80rpx; color:#ffffff; margin-top:40rpx; border-radius:40rpx; background:#cdcdcd; }
+
+.wrap {width:100%;height:100%;}
+.header{width:100%;padding:22rpx 37rpx 0 37rpx;display:flex;justify-content:space-between}
+.rule,.my{width:140rpx;height:60rpx;border: 1px solid #f58d40;font-size:30rpx;line-height:60rpx;text-align: center;color: #f58d40;border-radius:5rpx;}
+.title {width:640rpx;height:316rpx;margin: auto;margin-top:-60rpx;}
+
+/*次数*/
+.border {width: 380rpx;height:64rpx;margin: 0 auto 25rpx;background:#fb3a13;font-size:24rpx;line-height:64rpx;text-align: center;color: #fff;border-radius:45rpx}
+.border2 {width:600rpx;height:50rpx;margin: 0 auto;background:#dbaa83;font-size:24rpx;line-height:50rpx;text-align: center;color: #fff;border-radius:10rpx}
+.scroll {width:550rpx;height:185rpx;margin:75rpx auto 0 auto;}
+.scroll .p {width: 372rpx;height:24rpx;margin: auto;}
+.sideBox{  width: 100%;height:100rpx;margin-top:20rpx;padding: 10rpx 0 10rpx 0;background-color: rgba(255, 255, 255, 0.2);border-radius:10rpx;overflow:hidden;}
+.sideBox .bd {width: 100%;height:80rpx;overflow:hidden;}
+.sideBox .sitem{overflow:hidden;text-align: center;font-size:20rpx;line-height:40rpx;color: #fff;-o-transition: all 0.5s ease-in-out;-ms-transition: all 0.5s ease-in-out;-moz-transition: all 0.5s ease-in-out;-webkit-transition: all 0.5s ease-in-out;transition: all 0.5s ease-in-out;}
+
+/*规则弹窗*/
+#mask-rule,#mask {position: fixed;left: 0;top: 0;z-index: 999;width: 100%;height: 100%;background-color: rgba(0, 0, 0, 0.85);}
+#mask-rule .box-rule {position: relative;margin: 30% auto;padding-top: 40rpx;width: 90%;height: 675rpx;border-radius: 20rpx;background-color: #f58d40;}
+#mask-rule .box-rule .star {position: absolute;left: 50%;top: -100rpx;margin-left: -130rpx;width: 259rpx;height:87rpx;}
+#mask-rule .box-rule .h2 {width: 100%;text-align: center;line-height: 34rpx;font-size: 34rpx;font-weight: normal;color: #fff;}
+#mask-rule #close-rule {position: absolute;right: 34rpx;top: 38rpx;width: 40rpx;height: 40rpx;}
+/*内容盒子*/
+#mask-rule .con {overflow: auto;position: relative;margin: 40rpx auto;padding-right: 15rpx;width: 580rpx;height: 82%;line-height: 48rpx;font-size: 26rpx;color: #fff;}
+#mask-rule .con .text {position: absolute;top: 0;left: 0;width: inherit;height: auto;}
+
+</style>
\ No newline at end of file
diff --git a/activity/ggk/myprize.vue b/activity/ggk/myprize.vue
new file mode 100644
index 0000000..59ba4e9
--- /dev/null
+++ b/activity/ggk/myprize.vue
@@ -0,0 +1,260 @@
+<template>
+<view class="container" style="background-color:#c40004;min-height:100vh">
+	<block v-if="isload">
+		<view class="banner"><image :src="info.banner" mode="widthFix"></image></view>
+		<view class="activity">
+			<view class="activity-amin">
+				<view class="h2">我的奖品</view>
+				<view class="tb0">
+					<view class="tr">
+						<view class="td">中奖时间 </view>
+						<view class="td">中奖奖品</view>
+						<view class="td">领奖状态</view>
+						<view class="td">操作</view>
+					</view>
+					<view v-for="(item, index) in datalist" :key="index" class="tr">
+						<view class="td td2">{{item.createtime}}</view>
+						<view class="td td2">{{item.jxmc}}</view>
+						<view class="td td2"><block v-if="item.status==0">未领奖</block><block v-else>已领奖</block></view>
+						<view class="td td2">
+							<text v-if="item.status==0" @tap="duijiang" :data-k="index" :data-id="item.id" style="background-color:#fb5a43;padding:4rpx 8rpx">兑奖</text>
+							<text v-if="item.jxtp==3 && item.status==1" @tap="goto" data-url="/pages/coupon/mycoupon" style="background-color:#fb6a43;padding:4rpx 8rpx">查看</text>
+						</view>
+					</view>
+				</view>
+				<view v-if="datalist.length==0" style="width:100%;padding:40rpx 0;text-align:center;color:#f19132">暂无中奖记录~</view>
+				<view @tap="goback" class="goback">返回</view>
+			</view>
+		</view>
+		
+		<view id="mask-rule2" v-if="maskshow && formdata">
+			<view class="box-rule" style="height:900rpx">
+				<view class="h2">兑奖信息</view>
+				<view id="close-rule2" style="background: no-repeat center / contain;background-image: url({pre_url}}/static/img/dzp/close.png);" @tap="changemaskshow"></view>
+				<view class="con">
+					<view class="text" style="text-align:center">
+						<view id="linkinfo" style="text-align: left;margin-left:10%;">
+							<view v-for="(item, index) in formdata" :key="index">{{index}}:{{item}}</view>
+						</view>
+						<image :src="record.hexiaoqr" style="width:80%" id="hexiaoqr" mode="widthFix"></image>
+						<view>请出示兑奖码给核销员进行兑奖</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view id="mask-rule1" v-if="maskshow && !formdata">
+			<view class="box-rule" style="height:640rpx">
+				<view class="h2">请填写兑奖信息</view>
+				<view id="close-rule1" :style="'background: no-repeat center / contain;background-image: url('+pre_url+'/static/img/dzp/close.png);'" @tap="changemaskshow"></view>
+				<view class="con">
+					<form class @submit="formsub">
+					<view class="pay-form" style="margin-top:0.18rem">
+						<view v-for="(item, idx) in info.formcontent" :key="idx" class="item flex-y-center">
+							<view class="f1">{{item.val1}}：</view>
+							<view class="f2 flex flex1">
+								<block v-if="item.key=='input'">
+									<input type="text" :name="'form' + idx" class="input" :placeholder="item.val2"></input>
+								</block>
+								<block v-if="item.key=='textarea'">
+									<textarea :name="'form' + idx" class="textarea" :placeholder="item.val2"></textarea>
+								</block>
+								<block v-if="item.key=='radio'">
+									<radio-group class="radio-group" :name="'form' + idx">
+										<label v-for="(item1, index) in item.val2" :key="index">
+												<radio :value="item1"></radio>{{item1}}
+										</label>
+									</radio-group>
+								</block>
+								<block v-if="item.key=='checkbox'">
+									<checkbox-group :name="'form' + idx">
+										<label v-for="(item1, index) in item.val2" :key="index">
+											<checkbox :value="item1" class="xyy-zu"></checkbox>{{item1}}
+										</label>
+									</checkbox-group>
+								</block>
+								<block v-if="item.key=='switch'">
+									<switch class="xyy-zu" value="1" :name="'form' + idx"></switch>
+								</block>
+								<block v-if="item.key=='selector'">
+									<picker mode="selector" :name="'form' + idx" value class="xyy-pic" :range="item.val2" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="item.val2[_editorFormdata[0][idx]]"> {{item.val2[_editorFormdata[0][idx]]}}</view>
+										<view v-else>请选择</view>
+									</picker>
+								</block>
+								<block v-if="item.key=='time'">
+									<picker mode="time" :name="'form' + idx" value :start="item.val2[0]" :end="item.val2[1]" class="xyy-pic" :range="item.val2" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="_editorFormdata[0][idx]">{{_editorFormdata[0][idx]}}</view>
+										<view v-else>请选择</view>
+									</picker>
+								</block>
+								<block v-if="item.key=='date'">
+									<picker mode="date" :name="'form' + idx" value :start="item.val2[0]" :end="item.val2[1]" class="xyy-pic" :range="item.val2" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="_editorFormdata[0][idx]"> {{_editorFormdata[0][idx]}}</view>
+										<view v-else>请选择</view>
+									</picker>
+								</block>
+								<block v-if="item.key=='region'">
+									<picker mode="region" :name="'form' + idx" value class="xyy-pic" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="_editorFormdata[0][idx]"> {{_editorFormdata[0][idx]}}</view>
+										<view v-else>请选择省市区</view>
+									</picker>
+								</block>
+							</view>
+						</view>
+						<view style="padding:0 40px 0 80px">
+							<button class="subbtn" form-type="submit">确 定</button>
+						</view>
+					</view>
+					</form>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+      maskshow: false,
+      record: "",
+			info:{},
+      formdata: ""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiChoujiang/myprize', {hid: that.opt.hid}, function (res) {
+				that.loading = false;
+				res.info.formcontent = JSON.parse(res.info.formcontent);
+				that.info = res.info;
+				that.datalist = res.datalist;
+				that.loaded();
+			});
+		},
+    duijiang: function (e) {
+      var that = this;
+      var k = e.currentTarget.dataset.k;
+      var id = e.currentTarget.dataset.id;
+      var record = that.datalist[k];
+      var formdata = JSON.parse(record.formdata);
+      console.log(formdata);
+      that.record = record;
+      that.formdata = formdata;
+      that.maskshow = true;
+    },
+    changemaskshow: function () {
+      var that = this;
+      that.maskshow = !that.maskshow;
+    },
+    formsub: function (e) {
+      var that = this;
+      console.log(e);
+      var subdata = e.detail.value;
+      var formcontent = that.info.formcontent;
+      var record = that.record;
+      var formdata = {};
+
+      for (var i = 0; i < formcontent.length; i++) {
+        //console.log(subdata['form' + i]);
+        if (formcontent[i].val3 == 1 && (subdata['form' + i] === '' || subdata['form' + i] === undefined || subdata['form' + i].length == 0)) {
+          app.alert(formcontent[i].val1 + ' 必填');
+          return;
+        }
+
+        if (formcontent[i].key == 'switch') {
+          if (subdata['form' + i] == false) {
+            subdata['form' + i] = '否';
+          } else {
+            subdata['form' + i] = '是';
+          }
+        }
+
+        if (formcontent[i].key == 'selector') {
+          subdata['form' + i] = formcontent[i].val2[subdata['form' + i]];
+        }
+
+        var nowformdata = {};
+        formdata[formcontent[i].val1] = subdata['form' + i];
+      }
+
+      console.log(formdata);
+      app.post("ApiChoujiang/subinfo/rid/" + record.id, {formcontent: formdata}, function (res) {
+        if (res.status == 0) {
+          app.alert(res.msg);
+        } else {
+          that.changemaskshow();
+          app.success(res.msg);
+          that.getdata();
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.banner{ width:100%;padding:0 5%}
+.banner image{ display:block;width:100%;}
+.activity{padding:0 0 45rpx 0;margin-top:20rpx}
+.activity-amin{width:94%; margin:0 auto;}
+.activity-amin .h2{ margin:0 auto 30rpx auto;width:330rpx;height: 60rpx;background-color: #fc8209;text-align: center;line-height:60rpx;font-size: 30rpx;color: #ffffff;border-radius: 26rpx;letter-spacing:14rpx}
+.wt1{display:block; border:none; background-color:#FFF; padding:22rpx 22rpx; border-radius:8rpx; font-size: 30rpx; margin-bottom:60rpx;width:100%}
+.wt4{width:100%;background-color:#fb3a13; color:#FFF;font-size:30rpx;margin-top: 60rpx;}
+.tb0{ width:100%; margin-bottom:6%;font-size:24rpx}
+.tb0 .tr{width:100%;display:flex;border-bottom:1px solid #fff}
+.tb0 .tr .td{width:20%;background-color:#f19132;line-height:80rpx;text-align:center; color:#fff886;}
+.tb0 .tr .td:nth-child(1){width:32%; }
+.tb0 .tr .td:nth-child(2){width:32%; }
+.tb0 .tr .td:nth-child(3){width:18%; }
+.tb0 .tr .td:nth-child(4){width:18%; }
+.tb0 .tr .td2{padding:20rpx 0; text-align:center; color:#FFF; background-color:#f19c48}
+.goback{display:block;color:#fff;background-color:#fb3a13;margin:20rpx auto 40rpx auto;width:90%;padding:20rpx 0;text-align:center;font-size:36rpx;border-radius:15rpx;}
+
+#mask-rule1{position: fixed;top: 0;z-index: 10;width: 100%;max-width:640px;height: 100%;background-color: rgba(0, 0, 0, 0.85);}
+#mask-rule1 .box-rule {background-color: #f58d40;position: relative;margin: 30% auto;padding-top:40rpx;width: 90%;height:700rpx;border-radius:20rpx;}
+#mask-rule1 .box-rule .h2{width: 100%;text-align: center;line-height:34rpx;font-size: 34rpx;font-weight: normal;color: #fff;}
+#mask-rule1 #close-rule1{position: absolute;right:34rpx;top: 38rpx;width: 40rpx;height: 40rpx;}
+#mask-rule1 .con {overflow: auto;position: relative;margin: 40rpx auto;padding-right: 15rpx;width:580rpx;height: 82%;line-height: 48rpx;font-size: 26rpx;color: #fff;}
+#mask-rule1 .con .text {position: absolute;top: 0;left: 0;width: inherit;height: auto;}
+
+#mask-rule2{position: fixed;top: 0;z-index: 10;width: 100%;max-width:640px;height: 100%;background-color: rgba(0, 0, 0, 0.85);}
+#mask-rule2 .box-rule {background-color: #f58d40;position: relative;margin: 30% auto;padding-top:40rpx;width: 90%;height:700rpx;border-radius:20rpx;}
+#mask-rule2 .box-rule .h2{width: 100%;text-align: center;line-height:34rpx;font-size: 34rpx;font-weight: normal;color: #fff;}
+#mask-rule2 #close-rule2{position: absolute;right:34rpx;top: 38rpx;width: 40rpx;height: 40rpx;}
+#mask-rule2 .con {overflow: auto;position: relative;margin: 20rpx auto;padding-right: 15rpx;width:580rpx;height:90%;line-height: 48rpx;font-size: 26rpx;color: #fff;}
+#mask-rule2 .con .text {position: absolute;top: 0;left: 0;width: inherit;height: auto;}
+
+.pay-form .item{width:100%;padding:0 0 10px 0;color:#fff;}
+.pay-form .item:last-child{border-bottom:0}
+.pay-form .item .f1{width:80px;text-align:right;padding-right:10px}
+.pay-form .item .f2 input[type=text]{width:100%;height:35px;padding:2px 5px;border:1px solid #ddd;border-radius:2px}
+.pay-form .item .f2 textarea{width:100%;height:60px;padding:2px 5px;border:1px solid #ddd;border-radius:2px}
+.pay-form .item .f2 select{width:100%;height:35px;padding:2px 5px;border:1px solid #ddd;border-radius:2px}
+.pay-form .item .f2 label{height:35px;line-height:35px;}
+.subbtn{width:100%;background:#fb3a13;font-size: 30rpx;padding:0 22rpx;border-radius: 8rpx;color:#FFF;}
+</style>
\ No newline at end of file
diff --git a/activity/hongbaoEveryday/eduLog.vue b/activity/hongbaoEveryday/eduLog.vue
new file mode 100644
index 0000000..805f268
--- /dev/null
+++ b/activity/hongbaoEveryday/eduLog.vue
@@ -0,0 +1,144 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="myscore" :style="{background:t('color1')}">
+			<view class="f1">我的额度</view>
+			<view class="f2">{{hongbao_everyday_edu}}</view>
+		</view>
+		<view class="myscore" :style="{background:t('color1')}" v-if="scoreWithdraw">
+			<view class="f1">允提{{t('积分')}}</view>
+			<view class="f2">{{myscore2}}<view class="btn-mini" @tap="goto" data-url="/pages/my/scoreWithdraw">提现</view></view>
+		</view>
+		<view class="content" id="datalist">
+			<block v-for="(item, index) in datalist" :key="index"> 
+			<view class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{item.createtime}}</text>
+				</view>
+				<view class="f2">
+					<block v-if="item.money>0">
+						<text class="t1">+{{item.money}}</text>
+					</block>
+					<block v-else>
+						<text class="t2">{{item.money}}</text>
+					</block>
+				</view>
+			</view>
+		</block>
+		<nodata v-if="nodata"></nodata>
+		</view>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+      hongbao_everyday_edu: 0,
+      myscore2: 0,
+      nodata: false,
+      nomore: false,
+			scoreTransfer:false,
+			scoreWithdraw:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiHongbaoEveryday/eduLog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.hongbao_everyday_edu = res.member.hongbao_everyday_edu;
+					that.myscore2 = res.score_withdraw;
+					that.scoreTransfer = res.scoreTransfer;
+					that.scoreWithdraw = res.scoreWithdraw;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.myscore{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.myscore .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.myscore .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold; position: relative;}
+
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item .f1{flex:1;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+.btn-mini {right: 32rpx;top: 28rpx;width: 100rpx;height: 50rpx;text-align: center;border: 1px solid #e6e6e6;border-radius: 10rpx;color: #fff;font-size: 24rpx;font-weight: bold;display: inline-flex;align-items: center;justify-content: center;position: absolute;}
+</style>
\ No newline at end of file
diff --git a/activity/hongbaoEveryday/index.vue b/activity/hongbaoEveryday/index.vue
new file mode 100644
index 0000000..9d127d2
--- /dev/null
+++ b/activity/hongbaoEveryday/index.vue
@@ -0,0 +1,265 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="wrap" style=" height: 100%;" :style="{background:'linear-gradient(-90deg,'+t('color1')+' ,rgba('+t('color1rgb')+',0.8) 100%)'}">
+			<view class="title" :style="'background-image:url(' + info.banner + ');background-size:100% 100%;'"></view>
+			
+			<view class="content">
+				<view class="f1">
+					<view class="font-big" v-if="!todayRecord">--</view>
+					<view class="font-big" v-if="todayRecord">{{todayRecord.money}}</view>
+					<view class="font-normal">今日补贴</view>
+					<view class="rule" @tap="changeRule" :style="{background:'linear-gradient(-90deg,rgba('+t('color1rgb')+',0.2) ,rgba('+t('color1rgb')+',0.2) 100%)',color:t('color2')}">活动规则</view>
+				</view>
+				<view class="flex">
+					<view class="col-3">
+						<view class="font-mid">{{data.total}}</view>
+						<view class="font-normal">补贴总额</view>
+					</view>
+					<view class="col-3">
+						<view class="font-mid">{{data.todayNum}}</view>
+						<view class="font-normal">今日数量</view>
+					</view>
+					<view class="col-3">
+						<view class="font-mid">{{data.todayLeftNum}}</view>
+						<view class="font-normal">今日剩余</view>
+					</view>
+				</view>
+				<view class="flex">
+					<view class="card" @tap="goto" data-url="eduLog">
+						<view class="font-mid">{{member.hongbao_everyday_edu}}</view>
+						<view class="font-normal">我的额度</view>
+					</view>
+					<view class="card" @tap="goto" data-url="log">
+						<view class="font-mid">{{member.hongbao_count}}</view>
+						<view class="font-normal">补贴总数</view>
+					</view>
+				</view>
+				<view>
+					<button class="form-btn" v-if="!todayRecord" @tap="getHongbao" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">领今日额度</button>
+					<button class="form-btn" v-if="todayRecord" :style="{background:'#aaa'}">明日再来</button>
+				</view>
+				<view @tap="goto" data-url="log">补贴记录</view>
+			</view>
+			
+			<view class="prolist">
+				<dp-product-item :data="tjdatalist" @addcart="addcart" :menuindex="menuindex"></dp-product-item>
+			</view>
+
+
+			<view id="mask-rule" v-if="showmaskrule">
+				<view class="box-hongbao" v-if="showBoxhongbao" :style="{background:'url('+pre_url+'/static/img/hongbao_bg.png'+') no-repeat',backgroundSize:'contain'}">
+					<view class="text-center h1">· 恭喜您获得额度 ·</view>
+					<view class="font-big"><text style="font-size: 34rpx; margin-right: 10rpx;">¥</text>{{hongbaoMoney}}</view>
+					<view></view>
+					<button class="box-btn" @tap="hideBox" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">确定</button>
+				</view>
+				
+				<view class="box-rule" v-if="showBoxrule" :style="{background:'linear-gradient(180deg,'+t('color1')+' 40%,rgba(255,255,255,0.8) 120%)'}">
+					<view class="h2">活动规则说明</view>
+					<view id="close-rule" @tap="changeRule" :style="'background-image:url('+pre_url+'/static/img/dzp/close.png);background-size:100%'"></view>
+					<view class="con">
+						<view class="text">
+							<text decode="true" space="true">{{info.guize}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var windowWidth = uni.getSystemInfoSync().windowWidth;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+		isStart: 1,
+		name: "",
+		error: "",
+		info:{},
+		member:{},
+		pagenum: 1,
+		showmaskrule: false,
+		showBoxrule:false,
+		showBoxhongbao:false,
+		latitude: "",
+		longitude: "",
+		windowWidth:0,
+		windowHeight:0,
+		tjdatalist:[],
+		data:{},
+		todayRecord:{},
+		hongbaoMoney:0
+    };
+  },
+	onLoad:function(opt){
+		this.opt = app.getopts(opt);
+	},
+  onReady: function () {
+		var that = this;
+		var res = uni.getSystemInfoSync();
+		that.windowWidth = res.windowWidth;
+		that.windowHeight = res.windowHeight;
+		this.getdata();
+  },
+	onShow: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata(false);
+	},
+	onPullDownRefresh: function () {
+		this.getdata(false);
+	},
+	onReachBottom: function () {
+	  if (!this.nodata && !this.nomore) {
+	    this.pagenum = this.pagenum + 1;
+	    this.getProlist(true);
+	  }
+	},
+  methods: {
+		
+		getdata: function (loadmore) {
+			var that = this;
+			that.loading = true;
+			app.get('ApiHongbaoEveryday/index', {}, function (res) {
+				that.loading = false;
+				if(res.status == 0){
+					app.alert(res.msg);
+					return;
+				}
+				that.info = res.info;
+				that.member = res.member;
+				that.remaindaytimes = res.remaindaytimes;
+				that.remaintimes = res.remaintimes;
+				that.zjlist = res.zjlist;
+				that.data = res.data;
+				that.todayRecord = res.todayRecord;
+				uni.setNavigationBarTitle({
+					title: res.info.name
+				});
+				var title = that.info.name;
+				that.loaded();
+				that.getProlist(loadmore);
+				
+			});
+		},
+		getProlist:function(loadmore){
+			var that = this;
+			if(!loadmore){
+				this.pagenum = 1;
+				this.tjdatalist = [];
+			}
+      var pagenum = that.pagenum;
+			that.loading = true;
+			app.get('ApiHongbaoEveryday/prolist', {pagenum:pagenum}, function (res) {
+				that.loading = false;
+				var data = res.tjdatalist;
+				if (pagenum == 1) {
+					that.tjdatalist = data;
+				  if (data.length == 0) {
+				    that.nodata = true;
+				  }
+				}else{
+				  if (data.length == 0) {
+				    that.nomore = true;
+				  } else {
+				    var tjdatalist = that.tjdatalist;
+				    var newdata = tjdatalist.concat(data);
+				    that.tjdatalist = newdata;
+				  }
+				}
+			});
+		},
+		
+		getHongbao:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiHongbaoEveryday/getHongbao', {}, function (res) {
+				that.loading = false;
+				if(res.status == 0){
+					app.alert(res.msg);
+					return;
+				}
+				that.hongbaoMoney = res.money;
+				that.changeBoxHongbao();
+			});
+		},
+		sharecallback:function(){
+			
+		},
+		changeRule: function () {
+      this.showmaskrule = !this.showmaskrule;
+			this.showBoxrule = !this.showBoxrule;
+    },
+		changeBoxHongbao: function () {
+		  this.showmaskrule = !this.showmaskrule;
+			this.showBoxhongbao = !this.showBoxhongbao;
+		},
+		hideBox:function(){
+			  this.showmaskrule = false;
+				this.showBoxhongbao = false;
+				this.getdata();
+		},
+    init: function () {
+			var windowWidth = this.windowWidth;
+			var windowHeight = this.windowHeight;
+			var that = this;
+			var width = windowWidth/750*600;
+			var height = windowWidth/750*320;
+			console.log(height)
+
+    },
+  }
+};
+</script>
+<style>
+.text-center { text-align: center;}
+.container {padding-bottom: 40rpx;}
+.wrap {width:100%;height:100%;padding-top: 20rpx;}
+.f1 {position: relative;}
+.rule{width:60rpx;height:auto;padding:14rpx;font-size:28rpx;line-height:30rpx;text-align: center;border-radius:17rpx 0px 0px 17rpx; position: absolute; right: 0; top: -10rpx;}
+.title {width:94%;height:316rpx;margin: auto;}
+.content { text-align: center; background-color: #fff; border-radius: 20rpx; width: 94%; margin: 0 auto; margin-top: 40rpx; padding: 40rpx 0 20rpx;}
+.content>view {line-height: 200%; margin: 40rpx 0;}
+.col-3 {width: 33.33%;}
+.card { width: 50%; padding: 4%; margin: 0 2%; border-radius: 20rpx;background: linear-gradient(90deg, #FFDDC3 0%, #FEF2DA 100%);}
+.form-btn { width: 90%; border-radius: 40rpx; font-size: 32rpx; color: #fff; line-height:86rpx; margin-top: 80rpx;}
+.font-normal { color: #999;}
+.font-mid { font-size: 42rpx;}
+.font-big { font-size: 64rpx;}
+.font-big,.font-mid  { font-weight: bold; color: #FD462A;}
+
+.box-hongbao {position: relative;margin: 30% auto;width: 100%;height: 70%;border-radius: 16rpx;}
+.box-hongbao .h1 {color: #EB8A30; font-size: 32rpx; position: relative; top: 20%;}
+.box-hongbao .font-big { position: relative; top: 26%; text-align: center;}
+.box-btn { position:absolute;  top:55%; width: 40%; left: 30%; border-radius: 30rpx;color: #fff; font-size: 32rpx; box-shadow:0px 5px 15px 5px rgb(51 51 51 / 30%);}
+
+.prolist{width: 100%;height:auto;padding: 8rpx 20rpx;}
+
+/*规则弹窗*/
+#mask-rule,#mask {position: fixed;left: 0;top: 0;z-index: 999;width: 100%;height: 100%;background-color: rgba(0, 0, 0, 0.6);}
+#mask-rule .box-rule {position: relative;margin: 30% auto;padding-top: 40rpx;width: 90%;height: 70%;border-radius: 16rpx;}
+#mask-rule .box-rule .star {position: absolute;left: 50%;top: -100rpx;margin-left: -130rpx;width: 259rpx;height:87rpx;}
+#mask-rule .box-rule .h2 {width: 100%;text-align: center;line-height: 34rpx;font-size: 34rpx;font-weight: normal;color: #fff;}
+#mask-rule #close-rule {position: absolute;right: 34rpx;top: 38rpx;width: 40rpx;height: 40rpx;}
+/*内容盒子*/
+#mask-rule .con {overflow: auto;position: relative;margin: 40rpx auto;padding: 15rpx;width:92%;height: 88%;line-height: 48rpx;font-size: 26rpx; border-radius: 16rpx;
+color: #9E7E7E; background-color: #FEFBF2;}
+#mask-rule .con .text {/* position: absolute;top: 0;left: 0; width: inherit;*/height: auto;}
+@media  screen and (min-width: 400px) {
+	.title {height:336rpx;}
+}
+
+</style>
\ No newline at end of file
diff --git a/activity/hongbaoEveryday/log.vue b/activity/hongbaoEveryday/log.vue
new file mode 100644
index 0000000..5108b75
--- /dev/null
+++ b/activity/hongbaoEveryday/log.vue
@@ -0,0 +1,157 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="myscore" :style="{background:t('color1')}">
+			<view class="f1">我的补贴</view>
+			<view class="f2">{{money}}<view class="btn-mini" v-if="withdraw" @tap="goto" data-url="withdraw">提现</view></view>
+		</view>
+			<dd-tab :itemdata="['补贴记录','提现记录']" :itemst="['0','2']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		<view class="content" id="datalist">
+			<block v-if="st==0">
+			<view class="item" v-for="(item, index) in datalist" :key="index">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{item.createtime}}</text>
+				</view>
+				<view class="f2">
+					<block v-if="item.money>0">
+						<text class="t1">+{{item.money}}</text>
+					</block>
+					<block v-else>
+						<text class="t2">{{item.money}}</text>
+					</block>
+				</view>
+			</view>
+		</block>
+		<block v-if="st==2">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+					<text class="t1">提现金额:{{item.money}}元 <text v-if="item.score > 0" style="margin-left: 10rpx;">{{t('积分')}}:{{item.score}}</text></text>
+					<text class="t2">{{item.createtime}}</text>
+			</view>
+			<view class="f3">
+					<text class="t1" v-if="item.status==0">审核中</text>
+					<text class="t1" v-if="item.status==1">已审核</text>
+					<text class="t2" v-if="item.status==2">已驳回</text>
+					<text class="t1" v-if="item.status==3">已打款</text>
+			</view>
+		</view>
+		</block>
+		<nodata v-if="nodata"></nodata>
+		</view>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+      money: 0,
+      myscore2: 0,
+      nodata: false,
+      nomore: false,
+			scoreTransfer:false,
+			withdraw:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiHongbaoEveryday/log', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					uni.setNavigationBarTitle({
+						title: '补贴记录'
+					});
+					that.money = res.money;
+					that.withdraw= res.withdraw;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      var st = st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.myscore{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.myscore .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.myscore .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold; position: relative;}
+
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item .f1{display:flex;flex-direction:column; }
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;font-size:30rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+.btn-mini {right: 32rpx;top: 28rpx;width: 100rpx;height: 50rpx;text-align: center;border: 1px solid #e6e6e6;border-radius: 10rpx;color: #fff;font-size: 24rpx;font-weight: bold;display: inline-flex;align-items: center;justify-content: center;position: absolute;}
+</style>
\ No newline at end of file
diff --git a/activity/hongbaoEveryday/withdraw.vue b/activity/hongbaoEveryday/withdraw.vue
new file mode 100644
index 0000000..960c442
--- /dev/null
+++ b/activity/hongbaoEveryday/withdraw.vue
@@ -0,0 +1,202 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		<view class="mymoney" :style="{background:t('color1')}">
+			<view class="f1">我的补贴</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.hongbao_ereryday_total}}</view>
+			<view class="f3" @tap="goto" data-url="log?st=2"><text>提现记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">提现金额(元)</view></view>
+			<view class="item3"><view class="f1">￥</view><view class="f2"><input class="input" type="digit" name="money" value="" placeholder="请输入提现金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput"/></view></view>
+			<view class="item4" v-if="sysset.withdrawfee>0 || sysset.withdrawmin>0">
+				<text v-if="sysset.withdrawmin>0" style="margin-right:10rpx">最低提现金额{{sysset.withdrawmin}}元 </text>
+				<text v-if="sysset.withdrawfee>0">提现手续费{{sysset.withdrawfee}}% </text>
+			</view>
+		</view>
+		<view class="withdrawtype">
+			<view class="f1">选择提现方式：</view>
+			<view class="f2">
+				<view class="item" v-if="sysset.withdraw_weixin==1" @tap.stop="changeradio" data-paytype="微信钱包">
+					<view class="t1"><image class="img" :src="event_rul + '/static/img/static/img/withdraw-weixin.png'"/>微信钱包</view>
+					<view class="radio" :style="paytype=='微信钱包' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+				</view>
+				<label class="item" v-if="sysset.withdraw==1" @tap.stop="changeradio" data-paytype="余额">
+					<view class="t1"><image class="img" :src="event_rul + '/static/img/static/img/withdraw-cash.png'"/>{{t('余额')}}</view>
+					<view class="radio" :style="paytype=='余额' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+				</label>
+				<label class="item" v-if="sysset.withdraw_score==1 && sysset.withdraw_score_bili>0" @tap.stop="changeradio" data-paytype="积分">
+					<view class="t1"><image class="img" :src="event_rul + '/static/img/static/img/commissionlog.png'"/>
+						<view>
+							<view>{{t('积分')}}</view>
+							<view class="item-desc">{{sysset.withdraw_score_desc}}</view>
+						</view>
+					</view>
+					<view class="radio" :style="paytype=='积分' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+				</label>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}">立即提现</button>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo: [],
+		sysset: false,
+		paytype: '微信钱包',
+		show: 0,
+		tglset:[],
+		event_rul: app.globalData.event_url,
+			
+    };
+  },
+
+  onShow: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiHongbaoEveryday/withdraw', {}, function (res) {
+				that.loading = false;
+				that.userinfo = res.userinfo;
+				that.sysset = res.sysset;
+				that.tmplids = res.tmplids;
+				that.tglset = res.tglset;
+				var sysset = res.sysset;
+				var paytype = '微信钱包';
+				if (sysset.withdraw_weixin == 1) {
+					paytype = '微信钱包';
+				}
+				if (!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) {
+					paytype = '支付宝';
+				}
+				if ((!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) && (!sysset.withdraw_aliaccount || sysset.withdraw_aliaccount == 0)) {
+					paytype = '银行卡';
+				}
+				that.paytype = paytype;
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var usermoney = parseFloat(this.userinfo.money);
+      var money = parseFloat(e.detail.value);
+      if (money < 0) {
+        app.error('必须大于0');
+      } else if (money > usermoney) {
+        app.error('可提现余额不足');
+      }
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function (e) {
+      var that = this;
+			console.log(e.detail.value)
+      var usermoney = parseFloat(this.userinfo.money);
+      var withdrawmin = parseFloat(this.sysset.withdrawmin); //var formdata = e.detail.value;
+      var money = parseFloat(e.detail.value.money);
+      var paytype = this.paytype;
+      if (isNaN(money) || money <= 0) {
+        app.error('提现金额必须大于0');
+        return;
+      }
+      if (withdrawmin > 0 && money < withdrawmin) {
+        app.error('提现金额必须大于¥' + withdrawmin);
+        return;
+      }
+      if (money > usermoney) {
+        app.error('余额不足');
+        return;
+      }
+      if (paytype == '支付宝' && !this.userinfo.aliaccount) {
+        app.alert('请先设置支付宝账号', function () {
+          app.goto('/pages/my/setaliaccount');
+        });
+        return;
+      }
+      if (paytype == '银行卡' && (!this.userinfo.bankname || !this.userinfo.bankcarduser || !this.userinfo.bankcardnum)) {
+        app.alert('请先设置完整银行卡信息', function () {
+          app.goto('/pages/my/setbankinfo');
+        });
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiHongbaoEveryday/withdraw', {money: money,paytype: paytype}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        } else {
+          app.success(res.msg);
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goto('log?st=2');
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:60rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.withdrawtype{width:94%;margin:20rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.withdrawtype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+.item-desc { font-size: 22rpx; color:#FC5729;}
+
+
+.withdrawtype .f2{padding:0 30rpx}
+.withdrawtype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.withdrawtype .f2 .item:last-child{border-bottom:0}
+.withdrawtype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#333}
+.withdrawtype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.withdrawtype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.withdrawtype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/buy.vue b/activity/kanjia/buy.vue
new file mode 100644
index 0000000..1bf47f3
--- /dev/null
+++ b/activity/kanjia/buy.vue
@@ -0,0 +1,654 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="topay">
+		<view v-if="needaddress==0" class="address-add">
+			<view class="linkitem">
+				<text class="f1">联 系 人：</text>
+				<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx"/>
+			</view>
+			<view class="linkitem">
+				<text class="f1">联系电话：</text>
+				<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx"/>
+			</view>
+		</view>
+		<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/address?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+			<view class="f1"><image class="img" :src="event_rul + '/static/img/static/img/address.png'"/></view>
+			<view class="f2 flex1" v-if="address.name">
+				<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+				<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+			</view>
+			<view v-else class="f2 flex1">请选择收货地址</view>
+			<image :src="event_rul + '/static/img/static/img/arrowright.png'" class="f3"/>
+		</view>
+		<view class="buydata">
+			<view class="bcontent">
+				<view class="product">
+					<view class="item flex">
+						<view class="img"><image class="img" :src="product.pic"/></view>
+						<view class="info flex1">
+							<view class="f1">{{product.name}}</view>
+							<view class="f2">原价: ￥{{product.sell_price}}</view>
+							<view class="f3">￥{{joininfo.now_price}}<text class="kanjia_icon">砍后价</text> × 1</view>
+						</view>
+					</view>
+				</view>
+				<view class="freight">
+					<view class="f1">配送方式</view>
+					<view class="freight-ul">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <block v-for="(item, idx2) in freightList" :key="idx2">
+						 <view class="freight-li" :style="freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<view class="freighttips" v-if="freightList[freightkey].minpriceset==1 && freightList[freightkey].minprice > 0 && freightList[freightkey].minprice*1 > product_price*1">满{{freightList[freightkey].minprice}}元起送，还差{{freightList[freightkey].minprice - product_price}}元</view>
+					<view class="freighttips" v-if="freightList[freightkey].isoutjuli==1">超出配送范围</view>
+				</view>
+				<view class="price" v-if="freightList[freightkey].pstimeset==1">
+					<view class="f1">{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</view>
+					<view class="f2" @tap="choosePstime">{{pstimetext==''?'请选择时间':pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+				<view class="storeitem" v-if="freightList[freightkey].pstype==1">
+					<view class="panel">
+						<view class="f1">取货地点</view>
+						<view class="f2" @tap="openMendian" :data-freightkey="freightkey" :data-storekey="freightList[freightkey].storekey"><text class="iconfont icondingwei"></text>{{freightList[freightkey].storedata[freightList[freightkey].storekey].name}}</view>
+					</view>
+					<block v-for="(item, idx) in freightList[freightkey].storedata" :key="idx">
+						<view class="radio-item" @tap.stop="choosestore" :data-index="idx" v-if="idx<5 || storeshowall==true">
+							<view class="f1">{{item.name}} </view>
+							<text style="color:#f50;">{{item.juli}}</text>
+							<view class="radio" :style="freightList[freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+					<view v-if="storeshowall==false && (freightList[freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+				</view>
+				<view class="price">
+					<text class="f1">商品金额</text>
+					<text class="f2">¥{{product_price}}</text>
+				</view>
+				<view class="price" v-if="leadermoney*1>0">
+					<text class="f1">团长优惠</text>
+					<text class="f2">-¥{{leadermoney}}</text>
+				</view>
+				<view class="price">
+					<text class="f1">运费</text>
+					<text class="f2">+¥{{freight_price}}</text>
+				</view>
+
+				<view style="display:none">{{test}}</view>
+				<view class="form-item" v-for="(item,idx) in freightList[freightkey].formdata" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="radio-group" :name="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="checkbox-group">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector" :name="'form'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata[idx]">
+								<view class="form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix"/></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx"></view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		
+		<view class="scoredk" v-if="userinfo.score2money>0">
+			<checkbox-group @change="scoredk" class="flex" style="width:100%">
+				<view class="f1">
+					<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+					<view style="font-size:22rpx;color:#999" v-if="userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+					<view style="font-size:22rpx;color:#999" v-else-if="userinfo.scoremaxtype==1">最多可抵扣{{userinfo.scoredkmaxmoney}}元</view>
+				</view>
+				<view class="f2">使用{{t('积分')}}抵扣
+					<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+				</view>
+			</checkbox-group>
+		</view>
+
+		<view style="width: 100%; height:110rpx;"></view>
+		<view class="footer flex notabbarbot">
+			<view class="text1 flex1">总计：
+				<text style="font-weight:bold;font-size:36rpx">￥{{totalprice}}</text>
+			</view>
+			<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</button>
+		</view>
+		</form>
+
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</text>
+					<image :src="event_rul + '/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in freightList[freightkey].pstimeArr" :key="index" @tap="pstimeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul + '/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		test:'test',
+
+		productList: [],
+		freightList: [],
+		couponList: [],
+		couponrid: 0,
+		coupontype: 1,
+		address: [],
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		freightkey: 0,
+		freight_price: 0,
+		pstimetext: '',
+		freight_time: '',
+		usescore: 0,
+		totalprice: '0.00',
+		product_price: 0,
+		isload: 0,
+		storedata: [],
+		storeid: '',
+		storename: '',
+		latitude: '',
+		longitude: '',
+		leadermoney: 0,
+		couponvisible: false,
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		product: "",
+		userinfo: "",
+		joininfo: "",
+		weight: "",
+		goodsnum: 0,
+		scorebdkyf: "",
+		havetongcheng: "",
+		beizhu: "",
+		couponkey: 0,
+		storeshowall:false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this; //获取产品信息
+			that.loading = true;
+			app.get('ApiKanjia/buy', {joinid: that.opt.joinid}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+				}
+				var product = res.product;
+				var freightList = res.freightList;
+				var userinfo = res.userinfo;
+				var couponList = res.couponList;
+				var joininfo = res.joininfo;
+				that.product = product;
+				that.freightList = freightList;
+				that.userinfo = userinfo;
+				that.couponList = couponList;
+				that.joininfo = joininfo;
+				that.product_price = joininfo['now_price'];
+				that.weight = product.weight;
+				that.goodsnum = 1;
+				that.address = res.address;
+				that.scorebdkyf = res.scorebdkyf;
+				that.havetongcheng = res.havetongcheng;
+				that.linkman = res.linkman;
+				that.tel = res.tel;
+				that.calculatePrice();
+				that.loaded();
+
+				if (res.needLocation == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+
+						for (var j in freightList) {
+							if (freightList[j].pstype == 1) {
+								var storedata = freightList[j].storedata;
+
+								if (storedata) {
+									for (var x in storedata) {
+										if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+											var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+											storedata[x].juli = juli;
+										}
+									}
+
+									storedata.sort(function (a, b) {
+										return a["juli"] - b["juli"];
+									});
+
+									for (var x in storedata) {
+										if (storedata[x].juli) {
+											storedata[x].juli = storedata[x].juli + '千米';
+										}
+									}
+
+									freightList[j].storedata = storedata;
+								}
+							}
+						}
+						that.freightList = freightList;
+					});
+				}
+			});
+		},
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var product_price = parseFloat(that.product_price); //+商品总价
+      var address = that.address; //算运费
+      var freightdata = that.freightList[that.freightkey];
+      if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+        var needaddress = 1;
+      } else {
+        var needaddress = 0;
+      }
+      that.needaddress = needaddress;
+      var freight_price = freightdata.freight_price;
+
+			var totalprice = product_price + freight_price;
+      if (that.usescore) { //使用积分抵扣
+        var scoredk_money = parseFloat(that.userinfo.scoredk_money);
+				var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+				if (scoredkmaxpercent > 0 && scoredkmaxpercent < 100 && scoredk_money > totalprice * scoredkmaxpercent * 0.01) {
+					scoredk_money = totalprice * scoredkmaxpercent * 0.01;
+				}
+				if(that.scorebdkyf=='1' && scoredk_money > 0 && totalprice - scoredk_money < freight_price){ //积分不抵扣运费
+					scoredk_money = totalprice - freight_price;
+				}
+      } else {
+        var scoredk_money = 0;
+      }
+      var totalprice = totalprice - scoredk_money; //-积分抵扣
+			
+      if (totalprice < 0) totalprice = 0;
+      freight_price = freight_price.toFixed(2);
+      totalprice = totalprice.toFixed(2);
+      that.totalprice = totalprice;
+      that.freight_price = freight_price;
+    },
+		//积分抵扣
+		scoredk: function (e) {
+			var usescore = e.detail.value[0];
+			if (!usescore) usescore = 0
+			this.usescore = usescore;
+			this.calculatePrice();
+		},
+    changeFreight: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			this.freightkey = index;
+			that.calculatePrice();
+    },
+    chooseCoupon: function (e) {
+			var couponrid = e.rid;
+      var couponkey = e.key;
+
+      if (couponrid == this.couponrid) {
+        this.couponkey = 0;
+        this.couponrid = 0;
+        this.coupontype = 1;
+        this.coupon_money = 0;
+        this.couponvisible = false;
+      } else {
+        var couponList = this.couponList;
+        var coupon_money = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        if (coupontype == 4) {
+          coupon_money = this.freightprice;
+        }
+        this.couponkey = couponkey;
+        this.couponrid = couponrid;
+        this.coupontype = coupontype;
+        this.coupon_money = coupon_money;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+    },
+    choosePstime: function () {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      if (itemlist.length > 6) {
+        that.pstimeDialogShow = true;
+        that.pstimeIndex = -1;
+      } else {
+        uni.showActionSheet({
+          itemList: itemlist,
+          success: function (res) {
+						if(res.tapIndex >= 0){
+							var choosepstime = pstimeArr[res.tapIndex];
+							that.pstimetext = choosepstime.title;
+							that.freight_time = choosepstime.value;
+						}
+          }
+        });
+      }
+    },
+    pstimeRadioChange: function (e) {
+      var pstimeIndex = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var choosepstime = pstimeArr[pstimeIndex];
+      this.pstimetext = choosepstime.title;
+			this.freight_time = choosepstime.value;
+      this.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false
+    },
+    choosestore: function (e) {
+      var storekey = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey
+			var freightList = this.freightList
+			freightList[freightkey].storekey = storekey
+      this.freightList = freightList;
+    },
+    //提交并支付
+    topay: function (e) {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightid = this.freightList[freightkey].id;
+      var joinid = this.opt.joinid;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+			var usescore = this.usescore
+      if(this.freightList[freightkey].pstype==1){
+				var storekey = this.freightList[freightkey].storekey
+				var storeid = this.freightList[freightkey].storedata[storekey].id;
+			}else{
+				var storeid = 0;
+			}
+      var freight_time = that.freight_time;
+      var needaddress = that.needaddress;
+      if (needaddress == 0) addressid = 0;
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+      if (this.freightList[freightkey].pstimeset == 1 && freight_time == '') {
+        app.error('请选择' + (this.freightList[freightkey].pstype == 0 ? '配送' : '提货') + '时间');
+        return;
+      }
+
+			var formdataSet = this.freightList[freightkey].formdata;
+      var formdata = e.detail.value;
+			var newformdata = {};
+			for (var i = 0; i < formdataSet.length;i++){
+				if (formdataSet[i].val3 == 1 && (formdata['form' + i] === '' || formdata['form' + i] === undefined || formdata['form' + i].length==0)){
+						app.alert(formdataSet[i].val1+' 必填');return;
+				}
+				if (formdataSet[i].key == 'selector') {
+						formdata['form' + i] = formdataSet[i].val2[formdata['form' + i]]
+				}
+				newformdata['form'+i] = formdata['form' + i];
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiKanjia/createOrder', {joinid: joinid,freightid: freightid,freight_time: freight_time,storeid: storeid,addressid: addressid,linkman: linkman,tel: tel,usescore:usescore,formdata:newformdata}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.error(data.msg);
+          return;
+        }
+        app.goto('/pages/pay/pay?id=' + data.payorderid);
+      });
+    },
+    showCouponList: function () {
+      this.couponvisible = true;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+    },
+		openLocation:function(e){
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			var latitude = parseFloat(storeinfo.latitude);
+			var longitude = parseFloat(storeinfo.longitude);
+			var address = storeinfo.name;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		openMendian: function(e) {
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			app.chooseImage(function(data){
+				editorFormdata[idx] = data[0];
+				console.log(editorFormdata)
+				that.editorFormdata = editorFormdata
+				that.test = Math.random();
+			})
+		},
+		editorBindPickerChange:function(e){
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var val = e.detail.value;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			console.log(editorFormdata)
+			this.editorFormdata = editorFormdata
+			this.test = Math.random();
+		},
+		doStoreShowAll:function(){
+			this.storeshowall = true;
+		},
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product .img{ width:140rpx;height:140rpx}
+.collage_icon{ color:#fe7203;border:1px solid #feccaa;display:flex;align-items:center;font-size:20rpx;padding:0 6rpx;margin-left:6rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 96%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 2%;display: flex;align-items: center;z-index: 8;box-sizing:content-box}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.storeviewmore{width:100%;text-align:center;color:#889;height:40rpx;line-height:40rpx;margin-top:10rpx}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/helplist.vue b/activity/kanjia/helplist.vue
new file mode 100644
index 0000000..ef4b96f
--- /dev/null
+++ b/activity/kanjia/helplist.vue
@@ -0,0 +1,101 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="recordList">
+			<view v-for="(item, index) in datalist" :key="index" class="ListItem">
+					<image class="firendAvatar" :src="item.headimg"></image>
+					<text class="styleText">{{item.nickname}}</text> 于 {{item.createtime}} 帮您砍掉了 <text class="styleText">{{item.cut_price}}元</text>，砍后价格 <text class="styleText">{{item.after_price}}元</text>
+					<view class="clear"></view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			isload:true,
+      pagenum: 1,
+      st: '',
+      datalist: [],
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata(true);
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nomore = false;
+			that.nodata = false;
+      app.post('ApiKanjia/helplist', {st: st,pagenum: pagenum,joinid: that.opt.joinid}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+page {
background: #fff;}
+.recordList .ListItem {
margin: 0 40rpx;
font-size: 13px;
border-bottom: 1px solid #eee;
padding: 40rpx 0;
}
+

.ListItem .firendAvatar {
float: left;
width: 60rpx;
height: 60rpx;
border-radius: 50%;
margin-right: 20rpx;
margin-top: 10rpx;
}
+

.ListItem .styleText {
color: #dbb243;
}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/index.vue b/activity/kanjia/index.vue
new file mode 100644
index 0000000..f1db1c6
--- /dev/null
+++ b/activity/kanjia/index.vue
@@ -0,0 +1,150 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="banner"><image :src="pic" mode="widthFix"></image></view>
+		<block v-for="(item, index) in datalist" :key="index">
+		<view :data-url="'product?id=' + item.id" @tap="goto" class="product-item2">
+			<view class="product-pic">
+					<image :src="item.pic" mode="widthFix"></image>
+			</view> 
+			<view class="product-info">
+					<view class="p1">{{item.name}}</view>
+					<view class="p2">
+						<view v-for="(join, index2) in item.joinlist" :key="index2" class="t1">
+							<image :src="join.headimg"></image>
+						</view>
+						<view class="t1" v-if="item.saleing>7">
+							<image :src="event_rul + '/static/img/static/img/moreuser.png'"></image>
+						</view>
+						<view class="t2">{{item.saleing}}人正在参加</view>
+					</view>
+					<view class="p3">
+							<view class="t1">
+								<text class="x1"><text style="font-size:22rpx">最低￥</text>{{item.min_price}}</text>
+								<text class="x2">￥{{item.sell_price}}</text>
+							</view>
+							<button class="t2" @tap="todetail" :data-id="item.id">去砍价</button>
+					</view>
+			</view>
+		</view>
+		</block>
+		<nomore v-if="nomore" textcolor="#faa" linecolor="#f66"></nomore>
+		<nodata v-if="nodata"></nodata>
+		<button class="covermy" @tap="goto" data-url="orderlist">我的订单</button>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {  
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		bid:'',
+		pagenum: 1,
+		st: '',
+		datalist: [],
+		nomore: false,
+		nodata: false,
+		pic:'',
+		pics: "",
+		clist:[],
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	}, 
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nomore = false;
+			that.nodata = false;
+      app.post('ApiKanjia/index', {bid:that.bid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.pic = res.pic;
+					that.pics = res.pics;
+					that.clist = res.clist;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+}
+</script>
+<style>
+page{background:#F34343}
+.container{background:#F34343}
+
+.swiper {width: 100%;height: 375rpx;margin-bottom: 20rpx;}
+.swiper image {width: 100%;height: 375rpx;overflow: hidden;}
+
+.banner{width:100%;}
+.banner image{width:100%;height:auto}
+
+.category{width: 100%;padding-top: 10px;padding-bottom: 10px;flex-direction:row;white-space: nowrap; display:flex;}
+.category .item{width: 150rpx;display: inline-block; text-align: center;}
+.category .item image{width: 80rpx;height: 80rpx;margin: 0 auto;border-radius: 50%;}
+.category .item .t1{display: block;color: #666;}
+
+.product-item2 {display:flex;height: 240rpx; background: #fff; padding:30rpx 20rpx;margin: 0 20rpx;margin-bottom:20rpx;border-radius:20rpx}
+.product-item2 .product-pic {width: 180rpx;height: 180rpx; background: #ffffff;overflow:hidden}
+.product-item2 .product-pic image{width: 100%;height:180rpx;}
+.product-item2 .product-info {width:570rpx;padding: 5rpx 10rpx;flex:1}
+.product-item2 .product-info .p1 {word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: block;height: 80rpx;line-height: 40rpx;font-size: 30rpx;color:#111111}
+.product-item2 .product-info .p2{padding-left:10rpx;height:60rpx;display:flex;align-items:center}
+.product-item2 .product-info .p2 .t1{margin-left: -10rpx;height:40rpx;}
+.product-item2 .product-info .p2 .t1 image{width:40rpx;height:40rpx;border-radius: 50%;border:2px solid #fff;}
+.product-item2 .product-info .p2 .t2{font-size:24rpx;color:#787878}
+.product-item2 .product-info .p3{font-size: 32rpx;height:40rpx;line-height: 40rpx;display:flex;align-items:center}
+.product-item2 .product-info .p3 .t1{flex:auto}
+.product-item2 .product-info .p3 .t1 .x1{color: #f40;}
+.product-item2 .product-info .p3 .t1 .x2{margin-left: 10rpx;font-size: 26rpx;color: #888;text-decoration: line-through;}
+.product-item2 .product-info .p3 .t2{padding:0 16rpx;font-size: 22rpx;height:44rpx;line-height:44rpx;overflow: hidden;color:#fff;background:#ee4f4f;border:0;border-radius:20rpx;}
+.product-item2 .product-info .p3 button:after{border:0}
+
+.covermy{position:absolute;z-index:99999;cursor:pointer;display:flex;flex-direction:column;align-items:center;justify-content:center;overflow:hidden;z-index:9999;top:350rpx;right:0;color:#fff;background-color:rgba(17,17,17,0.3);width:140rpx;height:60rpx;font-size:26rpx;border-radius:30rpx 0px 0px 30rpx;}
+
+.nomore-footer-tips{background:#F34343;color:#fff}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/join.vue b/activity/kanjia/join.vue
new file mode 100644
index 0000000..99b776d
--- /dev/null
+++ b/activity/kanjia/join.vue
@@ -0,0 +1,376 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container" :style="'background:url(' + pre_url + '/static/img/kanjia-bg.png) no-repeat;background-size:100% auto;'">
+			<view class="topcontent">
+				<image :src="pre_url + '/static/img/kanjia-hb.png'" class="hongbao"></image>
+				<view class="userinfo">
+					<view class="f1"><image :src="joinuserinfo.headimg"></image></view>
+					<view class="f2">{{joinuserinfo.nickname}}</view>
+				</view>
+				<view class="content">
+					<view class="title">〝我看中这个宝贝, 快帮我砍一刀〞</view>
+					<view class="proinfo">
+						<view class="f1">
+							<image :src="product.pic" @tap="goto" :data-url="'product?id=' + product.id"></image>
+						</view>
+						<view class="f2">
+							<view class="t1">{{product.name}}</view>
+							<view class="t2">已砍走 <text style="color:#FF4C00">{{product.sales}}</text> 件</view>
+							<view class="t3">¥<text class="x1">{{product.min_price}}</text> <text class="x2">¥{{product.sell_price}}</text></view>
+						</view>
+					</view>
+					<view class="progressinfo">
+						<view class="t0">已砍 <text class="x1">￥{{joininfo.yikan_price}}</text>，剩余 <text class="x2">￥{{joininfo.now_price}}</text></view>
+						<view class="t2">
+							<progress :percent="cut_percent" border-radius="3" activeColor="#FF3143" backgroundColor="#FFD1C9" active="true"></progress>
+						</view>
+						<view class="t3">
+							<view class="x1">原价：<text style="color:#FF3143">￥{{product.sell_price}}</text></view>
+							<view class="x2">最低砍至：<text style="color:#FF3143">￥{{product.min_price}}</text></view>
+						</view>
+					</view>
+					<view class="op">
+						<button @tap="shareClick" class="btn1" v-if="mid==joininfo.mid && joininfo.status==0" style="background: linear-gradient(90deg, #FF3143 0%, #FE6748 100%);">召唤好友帮我砍价</button>
+						<button @tap="goto" class="btn1" style="background:#FC4343;width:320rpx" :data-url="'buy?joinid=' + joininfo.id" v-if="mid==joininfo.mid && (joininfo.status==1) && joininfo.isbuy==0">前去下单</button>
+						<button @tap="goto" data-url="orderlist" class="btn1" style="background:#FC4343;width:320rpx" v-if="mid==joininfo.mid && joininfo.isbuy==1">查看订单</button>
+						<button @tap="doKan" class="btn1" style="background:#FC4343;width:320rpx" v-if="mid!=joininfo.mid && iskan==0">帮他砍价</button>
+						<button @tap="goto" :data-url="'product?id=' + product.id" class="btn1" style="background:#FC4343;width:320rpx" v-if="mid!=joininfo.mid && iskan==1">我也要参与</button>
+						<button @tap="goto" :data-url="'helplist?joinid=' + joininfo.id" class="btn1">帮砍记录</button>
+					</view>
+					<view class="op" v-if="mid==joininfo.mid && (joininfo.status==0 && product.directbuy==1) && joininfo.isbuy==0" style="margin-top:20rpx">
+						<button @tap="goto" class="btn1" style="background:linear-gradient(90deg,#FE6748  0%, #FF3143 100%);width:560rpx" :data-url="'buy?joinid=' + joininfo.id">现在就去下单</button>
+					</view>
+					<view class="lefttime">
+						<view class="t1">距活动结束还剩：</view>
+						<view class="t2">{{djs}}</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image src="https://dev.lansoft.shop/static/img/static/img/close.png" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul + '/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image :src="event_rul + '/static/img/static/img/close.png'"></image></view>
+				<view class="content">
+					<image :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+
+		<view class="kanjiaDialog" v-if="showkanjia">
+			<view class="main">
+				<view class="content">
+					<view class="bargainIco">
+							<!-- <text class="bargainIcoPrice">{{helpinfo.cut_price}}</text> -->
+							<image class="bargainIcoImg" :src="pre_url + '/static/img/bargainbg.png'"></image>
+					</view>
+					<block v-if="joininfo.mid == helpinfo.mid">
+						<view class="bargainPrice">砍掉{{helpinfo.cut_price}}元</view>
+						<text class="bargainText">您自己砍了第一刀</text>
+					</block>
+					<block v-else>
+						<view class="bargainPrice">帮好友砍掉{{helpinfo.cut_price}}元</view>
+					</block>
+					<form @submit="hideKanjiaDialog" reportSubmit="true">
+							<button class="bargainBtn SysBtn" form-type="submit" type="default">确定</button>
+					</form>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		product:{},
+		mid:'',
+		iskan:0,
+		nowtime: "",
+		djs: "",
+		showkanjia: false,
+		helpinfo: {},
+		joininfo: {},
+		joinuserinfo:{},
+		cut_percent: "",
+		sharetypevisible: false,
+		showposter: false,
+		posterpic: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  onShareAppMessage: function () {
+    var that = this;
+    this.sharetypevisible = false;
+		var thisurl = '/activity/kanjia/join?scene=pid_'+app.globalData.mid+'-proid_'+that.product.id+'-joinid_' + that.joininfo.id;
+    console.log(thisurl);
+    return {
+      title: '快来帮我砍一刀~ ' + that.product.name,
+      imageUrl: that.product.pics[0],
+      path: thisurl
+    };
+  },
+	onShareTimeline:function(){
+    var that = this;
+		var query = 'scene=pid_'+app.globalData.mid+'-proid_'+that.product.id+'-joinid_' + that.joininfo.id;
+		console.log(query);
+		return {
+			title: '快来帮我砍一刀~ ' + that.product.name,
+			imageUrl: that.product.pics[0],
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var proid = that.opt.proid;
+			var joinid = that.opt.joinid ? that.opt.joinid : '';
+			clearInterval(interval);
+			that.loading = true;
+			app.get('ApiKanjia/join', {proid: proid,joinid: joinid}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.mid = res.mid;
+				that.product = res.product;
+				that.joininfo = res.joininfo;
+				that.joinuserinfo = res.joinuserinfo;
+				that.nowtime = res.nowtime;
+				that.cut_percent = res.cut_percent;
+				that.iskan = res.iskan;
+				var pagecontent = JSON.parse(res.product.detail);
+
+				that.pagecontent = pagecontent
+				interval = setInterval(function () {
+					that.nowtime = that.nowtime + 1;
+					that.getdjs();
+				}, 1000);
+				if (res.joininfo.helpnum == 0) {
+					that.doKan();
+				}
+				var sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/kanjia/join?scene=pid_'+app.globalData.mid+'-proid_'+that.product.id+'-joinid_' + that.joininfo.id + '&t='+parseInt((new Date().getTime())/1000);
+				that.loaded({title:that.product.name,desc:'快来帮我砍一刀~ ',pic:that.product.pics[0],link:sharelink});
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.product.endtime * 1 - that.nowtime * 1;
+      if (totalsec <= 0) {
+        var djs = '00时00分00秒';
+      } else {
+        var date = Math.floor(totalsec / 86400);
+        var houer = Math.floor((totalsec - date * 86400) / 3600);
+        var min = Math.floor((totalsec - date * 86400 - houer * 3600) / 60);
+        var sec = totalsec - date * 86400 - houer * 3600 - min * 60;
+        var djs = (date > 0 ? date + '天' : '') + (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+      }
+      that.djs = djs;
+    },
+    doKan: function () {
+      var that = this;
+      var product = that.product;
+      app.post('ApiKanjia/kanjiaKan', {joinid: that.joininfo.id}, function (res) {
+        if (res.status == 0) {
+          app.alert(res.msg);
+          return;
+        }
+        var cut_percent = Math.round((product.sell_price * 1 - res.joininfo.now_price * 1) / (product.sell_price * 1 - product.min_price * 1) * 100);
+        that.showkanjia = true;
+        that.helpinfo = res.helpinfo;
+        that.joininfo = res.joininfo;
+        that.cut_percent = cut_percent;
+        that.getdata();
+      });
+    },
+    hideKanjiaDialog: function (e) {
+      this.showkanjia = !this.showkanjia;
+    },
+    shareClick: function () {
+      this.sharetypevisible = true;
+    },
+    handleClickMask: function () {
+      this.sharetypevisible = false;
+    },
+    showPoster: function () {
+      var that = this;
+      that.showposter = true;
+      that.sharetypevisible = false;
+			app.showLoading('努力生成中');
+      app.post('ApiKanjia/getJoinPoster', {proid: that.product.id,joinid: that.joininfo.id}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.alert(data.msg);
+        } else {
+          that.posterpic = data.poster;
+        }
+      });
+    },
+    posterDialogClose: function () {
+      this.showposter = false;
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = '快来帮我砍一刀~ ' + that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/kanjia/join?scene=pid_'+app.globalData.mid+'-proid_'+that.product.id+'-joinid_' + that.joininfo.id + '&t='+parseInt((new Date().getTime())/1000);
+						sharedata.imageUrl = that.product.pic;
+						
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+  }
+};
+</script>
+<style>
+page{background: linear-gradient(0deg, #DF3939 0%, #FF2B49 100%);}
+.container{padding-top:280rpx;display:flex;flex-direction:column}
+.topcontent{background:#FFDCB4;border-radius:20rpx;width:94%;margin:0 3%;position:relative;padding:12rpx;margin-bottom:20rpx}
+.topcontent .hongbao{position:absolute;top:-32rpx;right:20rpx;width:128rpx;height:88rpx}
+.topcontent .userinfo{width:100%;display:flex;flex-direction:column;align-items:center;position:absolute;top:-60rpx}
+.topcontent .userinfo .f1{width:126rpx;height:126rpx;background:#FA6251;border-radius:50%;padding:8rpx}
+.topcontent .userinfo .f1 image{width:100%;height:100%;border-radius:50%;}
+.topcontent .userinfo .f2{font-size:28rpx;color:#999999;margin-top:8rpx}
+.topcontent .content{background:#fff;padding-top:92rpx;padding-bottom:20rpx;border-radius:20rpx;}
+.topcontent .title{font-size:40rpx;color:#514544;font-weight:bold;padding:32rpx 0;text-align:center}
+.topcontent .proinfo{width:100%;background:#F5F5F5;padding:16rpx;display:flex;}
+.topcontent .proinfo .f1{width:240rpx;height:240rpx}
+.topcontent .proinfo .f1 image{width:100%;height:100%}
+.topcontent .proinfo .f2{flex:1;padding-left:20rpx}
+.topcontent .proinfo .f2 .t1{width:100%;height:80rpx;line-height:40rpx;font-size:30rpx;color:#5A4742;font-weight:bold;overflow:hidden}
+.topcontent .proinfo .f2 .t2{color:#999999;font-size:26rpx;margin-top:10rpx}
+.topcontent .proinfo .f2 .t3{color:#FF4C00;margin-top:30rpx}
+.topcontent .proinfo .f2 .t3 .x1{font-size:48rpx;font-weigth:bold;padding-right:10rpx}
+.topcontent .proinfo .f2 .t3 .x2{font-size:24rpx;color:#999999;text-decoration: line-through;}
+
+.topcontent .progressinfo{width:100%;padding:80rpx 40rpx;display:flex;flex-direction:column}
+.topcontent .progressinfo .t0{width:100%;color:#222;font-size:30rpx;font-weight:bold;display:flex;text-align:center;justify-content:center}
+.topcontent .progressinfo .t0 .x1{color:#FF1324}
+.topcontent .progressinfo .t0 .x2{color:#FF3143}
+.topcontent .progressinfo .t1{width:100%;color:#f60;font-size:36rpx;flex:auto;display:flex;}
+.topcontent .progressinfo .t2{width:100%;padding:20rpx 0}
+.topcontent .progressinfo .t3{width:100%;color:#222;font-size:28rpx;display:flex;}
+.topcontent .progressinfo .t3 .x1{width:50%}
+.topcontent .progressinfo .t3 .x2{width:50%;text-align:right}
+.weui-progress{width:100%;}
+.weui-progress__bar{height:16rpx;background-color:#FFD1C9;border-radius: 8rpx;}
+.weui-progress__inner-bar{background-color:#FF3143;border-radius: 8rpx;}
+
+.topcontent .op{margin:0 20rpx 40rpx 20rpx;display:flex;align-items:center;justify-content:center}
+.topcontent .op button{height:80rpx;line-height:80rpx;font-size:30rpx;padding:0 40rpx;border-radius:40rpx;background:#FC9144;width:auto;color:#fff;margin:0 20rpx}
+.topcontent .op button:after{border:0}
+
+.topcontent .lefttime{margin-top:20rpx;border-top:1px solid #f5f5f5;color:#222;font-weight:bold;display:flex;text-align:center;justify-content:center;padding:20rpx 20rpx 0 20rpx}
+.topcontent .lefttime .t2{color:#FF3143}
+
+
+.op{margin:40rpx;display:flex;align-items:center;justify-content:center}
+.op button{height:80rpx;line-height:80rpx;font-size:32rpx;padding:0 40rpx;border-radius:10rpx;background:#FC9144;width:auto;color:#fff}
+.op button:after{border:0}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:901;width:100%;height:100%;background:rgba(0,0,0,0.8);z-index:999;top:0;left:0}
+.posterDialog .main{ width:80%;margin:30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close image{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content image{width:540rpx;height:960rpx}
+
+.kanjiaDialog{ position:fixed;z-index:901;width:100%;height:100%;background:rgba(0,0,0,0.5);z-index:999;top:0;left:0;align-items:center}
+.kanjiaDialog .main{ width:70%;margin:auto;margin-top:50%;background:#fff;position:relative;border-radius:20rpx}
+.kanjiaDialog .content{ width:100%;padding:30rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.kanjiaDialog .content .bargainIco {width: 200rpx;height: 200rpx;color: #ca2428;margin: 20rpx auto;position: relative;}
+.kanjiaDialog .content .bargainIcoImg {width: 200rpx;height: 200rpx;}
+.kanjiaDialog .content .bargainIcoPrice {width: 120rpx;height: 100rpx;transform: rotate(-16deg);position: absolute;top: 70rpx;left: 44rpx;}
+.kanjiaDialog .content .bargainPrice {color: #ca2428;font-size: 14px;}
+.kanjiaDialog .content .bargainText {font-size: 12px;margin: 4rpx 0 12rpx;}
+.kanjiaDialog .content .bargainBtn {background: #f60;margin: 0 20rpx;color: #fff;padding: 10rpx 0;margin-top: 20rpx;height: 80rpx;line-height: 60rpx;border-radius: 0;}
+.kanjiaDialog .content .bargainBtn::after {border: 0;}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/orderdetail.vue b/activity/kanjia/orderdetail.vue
new file mode 100644
index 0000000..cf2ac00
--- /dev/null
+++ b/activity/kanjia/orderdetail.vue
@@ -0,0 +1,389 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择'+codtxt : '已成功付款'}}</view>
+				<view class="t2" v-if="detail.freight_type!=1">我们会尽快为您发货</view>
+				<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<text class="t2" v-if="detail.freight_type!=3" user-select="true" selectable="true">发货信息：{{detail.express_com}} {{detail.express_no}}</text>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openMendian" :data-storeinfo="storeinfo" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="btitle flex-y-center" v-if="detail.bid>0">
+			<image :src="binfo.logo" style="width:36rpx;height:36rpx;" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid"></image>
+			<text class="flex1" decode="true" space="true" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid" style="padding-left:16rpx">{{binfo.name}}</text>
+		</view>
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'/pages/shop/product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+			<block v-if="detail.status==1">
+				<block v-if="detail.paytype!='货到付款'">
+					<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+				</block>
+				<block v-else>
+					<view class="btn ref">{{codtxt}}</view>
+				</block>
+			</block>
+			
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">查看物流</view>
+			</block>
+
+			<block v-if="detail.status==2">
+				<block v-if="detail.paytype!='货到付款'">
+					<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+				</block>
+				<view class="btn1" :style="{background:t('color1')}" @tap="orderCollect" :data-id="detail.id" v-if="detail.paytype!='货到付款'">确认收货</view>
+				<block v-else>
+					<view class="btn2">{{codtxt}}</view>
+				</block>
+			</block>
+			<block v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3 || detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul + '/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		prodata: '',
+		djs: '',
+		iscommentdp: "",
+		detail: "",
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		binfo:{},
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiKanjia/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.iscommentdp = res.iscommentdp,
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.binfo = res.binfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				that.isload = 1;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiKanjia/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiKanjia/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('收货中');
+        app.post('ApiKanjia/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height: 80rpx;line-height: 40rpx;color: #000;overflow:hidden}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/orderlist.vue b/activity/kanjia/orderlist.vue
new file mode 100644
index 0000000..3da55ae
--- /dev/null
+++ b/activity/kanjia/orderlist.vue
@@ -0,0 +1,227 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap.stop="goto" :data-url="'orderdetail?id=' + item.id">
+					<view class="head">
+						<view class="f1" v-if="item.bid!=0" @tap.stop="goto" :data-url="'/pages/business/index?id=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+						<view v-else>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view @tap.stop="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+							<text class="t2">原价：￥{{item.sell_price}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.product_price}}</text><text class="x2">×1</text></view>
+						</view>
+					</view>
+					<view class="bottom">
+						<text>共计{{item.procount}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+						<block v-if="item.status==0">
+							<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+						</block>
+						<block v-if="item.status==1">
+							<block v-if="item.paytype!='货到付款'">
+								<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+							</block>
+							<block v-else>
+								<view class="btn2">{{codtxt}}</view>
+							</block>
+						</block>
+						<block v-if="item.status==2">
+							<block v-if="item.paytype!='货到付款'">
+								<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+							</block>
+							<block v-else>
+							<view class="btn2">{{codtxt}}</view>
+							</block>
+							<view class="btn2" @tap.stop="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">查看物流</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id" v-if="item.paytype!='货到付款'">确认收货</view>
+						</block>
+						<block v-if="item.status==3 || item.status==4">
+							<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata: false,
+		codtxt: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiKanjia/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiKanjia/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiKanjia/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+        app.post('ApiKanjia/orderCollect', {orderid: orderid}, function (data) {
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+/*.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px; font-size: 14px; position: absolute; bottom: 10px; right: 10px; background: #fff; }*/
+.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px;}
+
+.zan-tex{clear:both; display: block; width: 100%; color: #565656; font-size: 12px; height: 30px; line-height: 30px; text-align: center;  }
+.ind-bot{ width: 100%; float: left; text-align: center; height: 50px; line-height: 50px; font-size: 13px; color: #ccc; background:#F2F2F2}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/product.vue b/activity/kanjia/product.vue
new file mode 100644
index 0000000..5456d86
--- /dev/null
+++ b/activity/kanjia/product.vue
@@ -0,0 +1,450 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container">
+			<view class="swiper-container">
+				<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+					<block v-for="(item, index) in product.pics" :key="index">
+						<swiper-item class="swiper-item">
+							<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="imageCount">{{current+1}}/{{product.pics.length}}</view>
+			</view>
+			<view class="kanjia_title">
+				<view class="f1">
+					<view class="t1">砍价最低 </view>
+					<view class="t2"><text style="font-size:40rpx;font-weight:bold">{{product.min_price}}</text> 元可拿</view>
+					<view class="t3">{{product.sales}}人已砍价成功</view>
+				</view>
+				<view class="f3">
+					<view class="t1">{{ product.starttime > nowtime ? '距活动开始还有' : '距活动结束还剩'}}</view>
+					<view class="t2" id="djstime"><text class="djsspan">{{djsday}}</text> 天 <text class="djsspan">{{djshour}}</text> : <text class="djsspan">{{djsmin}}</text> : <text class="djsspan">{{djssec}}</text></view>
+				</view>
+			</view>
+			<view class="header"> 
+				<view class="title">
+					<view class="lef">
+						<text>{{product.name}}</text>
+					</view>
+					<view class="share" @tap="shareClick">
+						<image :src="event_rul + '/static/img/static/img/share.png'"></image>
+						<text>分享</text>
+					</view>
+				</view>
+				<view class="sales_stock">
+					<view class="f1">原价：￥{{product.sell_price}} </view>
+					<view class="f2">已砍走{{product.sales}}件 剩余{{product.stock}}件</view>
+				</view>
+			</view>
+			<view class="joinlist" v-if="product.saleing>0">
+				<view v-for="(join, index) in joinlist" :key="index" class="t1">
+					<image :src="join.headimg"></image>
+				</view>
+				<view class="t1" v-if="product.saleing>7">
+					<image :src="event_rul + '/static/img/static/img/moreuser.png'"></image>
+				</view>
+				<view class="t2">{{product.saleing}}人正在参加</view>
+			</view>
+
+			<view class="shop" v-if="shopset.showjd==1">
+				<image :src="business.logo" class="p1"/>
+				<view class="p2 flex1">
+					<view class="t1">{{business.name}}</view>
+					<view class="t2">{{business.desc}}</view>
+				</view> 
+				<button class="p4" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="goto" :data-url="product.bid==0?'/pages/index/index':'/pages/business/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+			</view>
+			<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+			<view class="detail">
+				<dp :pagecontent="pagecontent"></dp>
+			</view>
+			
+			<view style="width:100%;height:70px;"></view>
+
+			<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':'notabbarbot'" v-if="product.status==1">
+				<view class="f1">
+					<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+						<image class="img" :src="event_rul + '/static/img/static/img/kefu.png'"/>
+						<view class="t1">客服</view>
+					</view>
+					<button class="item" v-else open-type="contact">
+						<image class="img" :src="event_rul + '/static/img/static/img/kefu.png'"/>
+						<view class="t1">客服</view>
+					</button>
+					<view class="item flex1" @tap="shareClick">
+						<image class="img" :src="event_rul + '/static/img/static/img/share2.png'"/>
+						<view class="t1">分享</view> 
+					</view>
+					<view class="item" @tap="addfavorite">
+						<image class="img" :src="event_rul + '/static/img/static/img/shoucang.png'"/>
+						<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+					</view>
+				</view>
+				<view class="op">
+					<block v-if="imJoin==0">
+						<view class="tobuy" :style="{background:t('color1')}" v-if="product.starttime > nowtime" style="background:#aaa">活动未开始</view>
+						<view class="tobuy" :style="{background:t('color1')}" v-else-if="product.endtime < nowtime" style="background:#aaa">活动已结束</view>
+						<view class="tobuy" :style="{background:t('color1')}" @tap="joinin" v-else>立即参与砍价</view>
+					</block>
+					<block v-else>
+						<view class="tobuy" :style="{background:t('color1')}" @tap="joinin">查看我的砍价</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image src="https://dev.lansoft.shop/static/img/static/img/close.png" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul + '/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul + '/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		current: 0,
+		indexurl:app.globalData.indexurl,
+		platform:app.globalData.platform,
+		tabnum: 1,
+		num: 1,
+		isfavorite: false,
+		btntype: 1,
+		ggselected: [],
+		ks: '',
+		gwcnum: 1,
+		nodata: 0,
+		userinfo: [],
+		djsday: '00',
+		djshour: '00',
+		djsmin: '00',
+		djssec: '00',
+		product: "",
+		business: {},
+		shopset: "",
+		pagecontent: "",
+		joinlist: "",
+		nowtime: "",
+		imJoin: "",
+		title: "",
+		sharepic: "",
+		sharetypevisible: false,
+		showposter: false,
+		posterpic: "",
+		kfurl:'',
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+ 
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiKanjia/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var product = res.product;
+				var business = res.business;
+				var pagecontent = JSON.parse(product.detail);
+
+				that.product = product;
+				that.business = business;
+				that.shopset = res.shopset;
+				that.pagecontent = pagecontent;
+				that.joinlist = res.joinlist;
+				that.nowtime = res.nowtime;
+				that.imJoin = res.imJoin;
+				that.title = product.name;
+				that.isfavorite = res.isfavorite;
+				that.sharepic = product.pics[0];
+				clearInterval(interval);
+				interval = setInterval(function () {
+					that.nowtime = that.nowtime + 1;
+					that.getdjs();
+				}, 1000);
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+				that.kfurl = '/pages/kefu/index?bid='+res.product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:res.product.name,pic:res.product.pic});
+			});
+		},
+    swiperChange: function (e) {
+      var that = this;
+      that.current = e.detail.current;
+    },
+    getdjs: function () {
+      var that = this;
+      if (that.product.starttime * 1 > that.nowtime * 1) {
+        var totalsec = that.product.starttime * 1 - that.nowtime * 1;
+      } else {
+        var totalsec = that.product.endtime * 1 - that.nowtime * 1;
+      }
+      if (totalsec <= 0) {
+        that.djsday = '00';
+        that.djshour = '00';
+        that.djsmin = '00';
+        that.djssec = '00';
+      } else {
+        var date = Math.floor(totalsec / 86400);
+        var houer = Math.floor((totalsec - date * 86400) / 3600);
+        var min = Math.floor((totalsec - date * 86400 - houer * 3600) / 60);
+        var sec = totalsec - date * 86400 - houer * 3600 - min * 60;
+        var djsday = (date < 10 ? '0' : '') + date;
+        var djshour = (houer < 10 ? '0' : '') + houer;
+        var djsmin = (min < 10 ? '0' : '') + min;
+        var djssec = (sec < 10 ? '0' : '') + sec;
+        that.djsday = djsday;
+        that.djshour = djshour;
+        that.djsmin = djsmin;
+        that.djssec = djssec;
+      }
+    },
+    joinin: function (e) {
+      var type = e.currentTarget.dataset.type;
+      var that = this;
+      var proid = that.product.id;
+      app.goto('join?proid=' + proid);
+    },
+    //收藏操作
+    addfavorite: function () {
+      var that = this;
+      var proid = that.product.id;
+			app.showLoading('加载中');
+      app.post('ApiKanjia/addfavorite', {proid: proid,type: 'kanjia'}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          that.isfavorite = !that.isfavorite;
+        }
+        app.success(data.msg);
+      });
+    },
+    tabClick: function (e) {
+      this.tabnum = e.currentTarget.dataset.num;
+    },
+    shareClick: function () {
+      this.sharetypevisible = true;
+    },
+    handleClickMask: function () {
+      this.sharetypevisible = false;
+    },
+    showPoster: function () {
+      var that = this;
+      that.showposter = true;
+      that.sharetypevisible = false;
+			app.showLoading('努力生成中');
+      app.post('ApiKanjia/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.alert(data.msg);
+        } else {
+          that.posterpic = data.poster;
+        }
+      });
+    },
+    posterDialogClose: function () {
+      this.showposter = false;
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/kanjia/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/kanjia/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+	}
+};
+</script>
+<style>
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+
+.kanjia_title{ width:100%;height:110rpx;display:flex;align-items:center;}
+.kanjia_title .f1{height:110rpx;background: linear-gradient(90deg,#FF3143,#FE6748);display:flex;flex-direction:column;flex:1;justify-content:center;position:relative;padding-left:20rpx}
+.kanjia_title .f1 .t1{font-size:24rpx;color:#fff}
+.kanjia_title .f1 .t2{font-size:24rpx;color:#fff;}
+.kanjia_title .f1 .t3{background:rgba(255, 255, 255,0.9);height:46prx;line-height:46rpx;border-radius:23rpx;padding:0 20rpx;color:#FF3143;font-size:24rpx;position:absolute;right:10rpx;top:30rpx;}
+.kanjia_title .f3{width:280rpx;height:110rpx;background:#FFDBDF;color:#333;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.kanjia_title .f3 .t2{color:#FF3143}
+.kanjia_title .djsspan{font-size:22rpx;border-radius:8rpx;background:#FF3143;color:#fff;text-align:center;padding:4rpx 8rpx;margin:0 4rpx}
+
+.header {width: 100%;padding: 0 3%;background: #fff;display:flex;flex-direction:column}
+.header .title {padding: 10px 0px;line-height:44rpx;font-size:32rpx;display:flex;}
+.header .title .lef{display:flex;flex-direction:column;justify-content: center;flex:1;color:#222222;font-weight:bold}
+.header .title .lef .t2{ font-size:26rpx;color:#999;padding-top:10rpx;font-weight:normal}
+.header .title .share{width:88rpx;height:88rpx;padding-left:20rpx;border-left:0 solid #f5f5f5;text-align:center;font-size:24rpx;color:#222;display:flex;flex-direction:column;align-items:center}
+.header .title .share image{width:32rpx;height:32rpx;margin-bottom:4rpx}
+.header .sales_stock{display:flex;justify-content:space-between;height:40rpx;line-height:40rpx;margin-bottom:20rpx;font-size:24rpx;color:#777777}
+
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 80rpx; line-height: 80rpx; padding: 0 3%; color: #505050; }
+.choose .f2{ width: 40rpx; height: 40rpx;}
+
+.joinlist{width:100%;display:flex;align-items:center;margin-top:20rpx;background: #fff;padding:30rpx 3%;}
+.joinlist .t1{margin-left: -10rpx;height:40rpx;}
+.joinlist .t1 image{width:50rpx;height:50rpx;border-radius: 50%;border:2px solid #fff;}
+.joinlist .t2{font-size:24rpx;color:#787878}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.bottombar{ width: 94%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:100rpx;padding:0 4% 0 2%;align-items:center;box-sizing:content-box}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:80rpx;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;display:flex;align-items:center;justify-content:center}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+</style>
\ No newline at end of file
diff --git a/activity/kanjia/refund.vue b/activity/kanjia/refund.vue
new file mode 100644
index 0000000..5052586
--- /dev/null
+++ b/activity/kanjia/refund.vue
@@ -0,0 +1,83 @@
+<template>
+<view class="container">
+	<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-item">
+			<text class="label">退款原因</text>
+			<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+		</view>
+		<view class="form-item">
+			<text class="label">退款金额(元)</text>
+			<view class="flex"><input name="money" type="digit" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+		</view>
+		<button class="ref-btn" form-type="submit">确定</button>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: '',
+      totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+	var that = this;
+    that.orderid = that.opt.orderid;
+    that.totalprice = that.opt.price;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      //console.log(e);return;
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+
+      if (money <= 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiKanjia/refund', {orderid: orderid,reason: reason,money: money}, function (data) {
+				app.showLoading(false);
+        app.alert(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 1000);
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-item{ width:100%;background: #fff; padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.ref-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; text-align: center; color: #fff; font-size: 16px; border-radius: 8px;border: none; background: #ff8758; }
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/complete.vue b/activity/kecheng/complete.vue
new file mode 100644
index 0000000..05ea787
--- /dev/null
+++ b/activity/kecheng/complete.vue
@@ -0,0 +1,102 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="wrap" :style="{background:t('color1')}">
+			<view class="top flex" >
+				<view class="f1"><text class="t1">{{tkdata.ishg==1?'合格':'不合格'}}</text>
+				<text class="t2">{{tkdata.ishg==1?'恭喜您，已通过考试':'请认真学习后再来试一下吧~'}} </text></view>
+				<view class="score"><text class="t1">{{tkdata.score}}</text><text class="t2">分</text></view>
+			</view>
+			<view class="content">
+				<view class="c_1 flex">
+					<view class="f2"><text class="t1">{{tkdata.rightnum}}</text><text class="t2">答对题目</text></view>
+					<view class="f2"><text class="t1">{{tkdata.errornum}}</text><text class="t2">答错题目</text></view>
+					
+				</view>
+				<view class="c_2">
+					<view class="list1"><text class="t3">考试时间</text><text class="t4">{{tkdata.time}}</text></view>
+					<view class="list1"> <text class="t3">交卷时间</text><text class="t4">{{tkdata.endtime}}</text></view>
+					<view class="list1"><text class="t3">答题用时</text><text class="t4">{{tkdata.longtime}}</text></view>
+				</view>
+				<view  v-if="tkdata.ishg==1" class="aginbtn" :style="{background:t('color1')}" @tap="goto" :data-url="'recordlog?kcid='+tkdata.kcid">答题记录</view>
+				<view  v-if="tkdata.ishg!=1" class="aginbtn" :style="{background:t('color1')}" @tap="goto" :data-url="'tiku?id='+tkdata.kcid">再答一次</view>
+				<view  class="bottom flex" >
+					<view class="btn2" v-if="tkdata.ishg!=1" :style="'width:100%'" @tap="goto" :data-url="'product?id='+tkdata.kcid"> 继续学习</view>
+					<view class="btn3" v-if="tkdata.ishg==1 && tkdata.errornum>0" :style="'margin-left:0;width:100%'" @tap="goto" :data-url="'error?rid='+tkdata.id">错题回顾</view>
+					<view class="btn3" v-if="tkdata.ishg!=1 && tkdata.errornum>0" :style="'width:100%'" @tap="goto" :data-url="'error?rid='+tkdata.id">错题回顾</view>
+				</view>
+			</view>
+			<view style="height: 130rpx;"></view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			pre_url:app.globalData.pre_url,
+			tkdata:[]
+		};
+	},
+	  onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+	  },
+	onUnload: function () {
+		clearInterval(interval);
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			var rid = this.opt.rid || 0;
+			that.loading = true;
+			app.post('ApiKecheng/complete', {rid:rid}, function (res){
+				that.loading = false;
+				if (res.status == 0) {
+					//app.alert(res.msg);
+					return;
+				}
+				that.tkdata = res.data
+				that.loaded();		
+			})
+		},
+
+	}
+
+};
+</script>
+<style>
+.wrap{ background: #fff; padding: 30rpx; height: auto;}
+.top{ margin-top: 60rpx; padding: 50rpx; justify-content: space-between;}
+.top .f1 .t1{ display: block; color: #fff; font-size: 44rpx;}
+.top .f1 .t2{ font-size: 26rpx;  color:rgba(255,255,255,0.8); margin-top: 30rpx;display: block;}
+.content{ background: #fff; padding: 80rpx; border-radius:20rpx ;}
+.content .c_1{ justify-content: space-between; padding: 0 80rpx;}
+.content .c_1 .f2 text{ display:block }
+.content .c_1 .f2 .t1{  font-size: 64rpx; font-weight: bold; color: #222; text-align: center;}
+.content .c_1 .f2 .t2{ color: #93949E; font-size: 24rpx;  margin-top: 20rpx;}
+.content .list1{ line-height: 60rpx;}
+.content .list1 .t3{ font-size: 26rpx; color: #222;}
+.content .list1 .t4{ display: inline-block; margin-left: 40rpx;color: #93949E;}
+.content .c_2{ margin-top: 50rpx;} 
+.aginbtn{ margin-top: 80rpx; text-align: center;color: #fff; border-radius:40rpx ; height: 88rpx; line-height: 88rpx; font-size: 32rpx;}
+.top .score{ width: 160rpx; height: 160rpx;}
+.bottom .btn2{ background-color: rgba(255,0,0,0.3); width: 240rpx; color:#FF5347 ; margin-top: 50rpx; height: 88rpx; text-align: center; 
+font-weight: bold; font-size: 32rpx;
+line-height: 88rpx;border-radius: 40rpx;}
+.bottom .btn3{ background-color:#EEEEEE; width: 240rpx; color:#222 ; margin-top: 50rpx; height: 88rpx; text-align: center; 
+font-weight: bold; font-size: 32rpx;
+line-height: 88rpx;border-radius: 40rpx; margin-left: 30rpx;}
+.score .t1{ color:#fff; font-size: 64rpx;font-weight: bold; text-align: center; display: inline-block; margin-left: 30rpx; margin-top: 20rpx;}
+.score .t2{ color:rgba(255,255,255,0.8);}
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/error.vue b/activity/kecheng/error.vue
new file mode 100644
index 0000000..6567cd0
--- /dev/null
+++ b/activity/kecheng/error.vue
@@ -0,0 +1,164 @@
+<template>
+<view>
+	<block v-if="isload">
+
+		<view class="wrap">
+				<view class="top flex">
+				<view class="f1" v-if="tkdata.type==1 && tkdata.rightcount==1">单选题</view>
+				<view class="f1" v-if="tkdata.type==1 && tkdata.rightcount==2">多选题</view>
+				<view class="f1" v-if="tkdata.type==2">填空题</view>
+				<view class="f3">{{tkdata.sort}}/{{tkdata.nums}}</view>
+			</view>
+				<view class="question" >
+					<view class="title" >
+						{{tkdata.sort}}.{{tkdata.title}}
+					</view>
+					<block v-if="tkdata.type==1 && tkdata.rightcount==1">
+						<view class="option_group" >
+							<view :class="'option flex ' +(index==currentindex?'on':'') "  v-for="(item, index) in tkdata.option" >
+							{{tkdata.sorts[index]}}
+							<view class="after" ></view> 
+							<view class="t1">{{item}}</view></view>
+						</view>
+					</block>
+					<block v-if="tkdata.type==1 && tkdata.rightcount>1">
+						<view class="option_group" >
+							<view :class="'option flex '+(isActive.indexOf(index)!=-1?'on':'')"  v-for="(item, index) in tkdata.option" @tap="selectOption(index)" :data-index='index'>
+							{{tkdata.sorts[index]}}
+							<view class="after" ></view> 
+							<view class="t1">{{item}}</view></view>
+						</view>
+					</block>
+					<block v-if="tkdata.type==1 && !tkdata.rightcount">
+						<view class="option_group" >
+							<view :class="'option flex '"  v-for="(item, index) in tkdata.option" @tap="selectOption(index)" :data-index='index'>
+							{{tkdata.sorts[index]}}
+							<view class="after" ></view> 
+							<view class="t1">{{item}}</view></view>
+						</view>
+					</block>
+					<block v-if="tkdata.type==2">
+						<view class="option_group">
+							<view class="uni-textarea">
+								<textarea placeholder-style="color:#222" placeholder="答:" @blur="bindTextAreaBlur" :value="tkdata.answer"/>
+							</view>
+						</view>
+					</block>
+	
+				</view>
+		</view>
+		<view class="right_content">
+			<text class="t1">正确答案</text>
+			<text class="t2">
+				{{tkdata.type==2?tkdata.right_option:''}} 
+				{{tkdata.type==1?tkdata.right_options:''}}
+				<view >题目解析：{{tkdata.jiexi}}</view>
+			</text>
+		</view>
+		<view class="bottom flex">
+			<block v-if="tkdata.isup!=1"><button class="upbut flex-x-center flex-y-center hui" >上一题</button></block>
+			<block v-if="tkdata.isup==1"><button  @tap="toanswer" data-dttype="up" class="upbut flex-x-center flex-y-center"  :style="{background:t('color1')}" >上一题</button></block>
+			<button  v-if="tkdata.isdown==1" @tap="toanswer" data-dttype="down" class="downbtn flex-x-center flex-y-center"  :style="{background:t('color1')}" >下一题</button>
+			<button  v-if="tkdata.isdown!=1"  class="downbtn flex-x-center flex-y-center hui"  >下一题</button>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			title: "",
+		  datalist: [],
+			logid:'',
+			isActive:[],
+			currentindex:'',
+			op:'',
+			isActive:[],
+			right_option:'',
+			tkdata:[]
+		};
+	},
+	onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+	},
+	onUnload: function () {
+		clearInterval(interval);
+	},
+	methods: {
+		getdata:function(){
+			var that =this;
+			var id = this.opt.rid || 0;
+			that.loading = true;
+			app.post('ApiKecheng/error', { rid:id,op:that.op,logid:that.logid}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.tkdata = res.data;	
+				var answer = [];
+				if(that.tkdata.type==1 && res.data.answer.length>0){
+					var answer = res.data.answer;
+					answer.map((item) => {
+					  that.isActive.push(item);
+					})
+					that.currentindex = answer;
+				}else{
+					that.currentindex = res.data.answer;
+				}
+				that.logid = res.data.logid
+				that.loaded();		
+			});
+		},
+		toanswer:function(e){
+			var that =this;
+			that.op = e.currentTarget.dataset.dttype
+			that.isActive=[];
+			that.getdata();
+		},
+		bindTextAreaBlur: function (e) {
+			var that=this
+			that.right_option = e.detail.value
+		},
+	}
+};
+</script>
+<style>
+.wrap{ background: #fff; margin: 30rpx; border-radius: 10rpx; padding: 30rpx;}
+
+.top{height: 120rpx; line-height: 100rpx; justify-content: space-between;}
+.top .f1{ color:#93949E;font-size: 28rpx;}
+.top .f2{ color:#FF5347 ; font-size: 28rpx;}
+.top .f3{ color:#93949E ; font-size: 28rpx;}
+.question .title{ font-size: 30rpx; color: #333; font-weight: bold;}
+
+.right_content{ background: #fff; margin: 30rpx; border-radius: 10rpx; padding: 30rpx;}
+.right_content .t1{ color: #333; font-weight: 30rpx; font-weight: bold; display: block; margin-bottom: 20rpx;}
+.right_content .t2{ color:#93949E;font-size: 26rpx;}
+
+.option_group .option{ position: relative; padding-left: 37rpx; height: 96rpx; line-height: 96rpx; background:#F8F4F4 ; margin-top: 30rpx; border-radius: 48rpx; }
+.option_group .option .t1{ margin-left: 40rpx;}
+.option_group .option.on{ background: #FDF1F1; color:#FF5347 ; border: 1px solid #FFAEA8;}
+.option_group .option.on .after{ border:1px solid #FF8D8D; }
+.option_group .option.green{ background:#36CF7B ; color:#fff}
+.option_group .option.green .after{  border:1px solid #fff;} 
+.option_group .option .after{ border:1px solid #BBB; height:29rpx;  position: absolute;left: 12%; margin-top: 35rpx;}
+.bottom .upbut{width:240rpx;height: 88rpx; line-height: 88rpx;color: #fff;  border-radius: 44rpx;border: none;font-size:28rpx;font-weight:bold; background: #FD4A46; }	
+.bottom .upbut.hui{ background: #E3E3E3;}
+.bottom .downbtn{margin-left:50rpx;width:360rpx;height: 88rpx; border-radius: 44rpx; line-height: 72rpx;color: #fff;  border: none;font-size:28rpx;font-weight:bold; background: #FD4A46; }	
+.bottom .downbtn.hui{ background: #E3E3E3;}
+.bottom{ margin-top: 30rpx; padding: 30rpx;}
+.uni-textarea{ margin-top: 30rpx; background: #FAFAFA; border: 1px solid #EBE5E5;border-radius: 8rpx; padding: 30rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/list.vue b/activity/kecheng/list.vue
new file mode 100644
index 0000000..34362a2
--- /dev/null
+++ b/activity/kecheng/list.vue
@@ -0,0 +1,335 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container" :style="history_show?'height:100%;':''">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<text class="iconfont icon-search"></text>
+					<input :value="keyword" placeholder="商品搜索..." placeholder-style="font-size:24rpx;color:#FFFFFF" @confirm="searchConfirm" @input="searchChange" />
+				</view>   
+				<view class="search-btn" @tap="searchbtn">
+					<text class="iconfont icon-pailie" v-if="!history_show && productlisttype=='itemlist'"></text>
+					<text class="iconfont icon-shipailie" v-if="!history_show && productlisttype=='item2'"></text>
+					<text v-if="history_show">搜索</text>
+				</view>
+			</view>
+			<view class="search-history" v-show="history_show">
+				<view> 
+					<text class="search-history-title">最近搜索</text>
+					<view class="delete-search-history" @tap="deleteSearchHistory">
+						<image :src="event_rul + '/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+					</view>
+				</view>
+				<view class="search-history-list">
+					<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+					</view>
+					<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul + '/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+				</view>
+			</view>
+			<view class="search-navbar" v-show="!history_show">
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="(!field||field=='sort')?'color:'+t('color1'):''" data-field="sort" data-order="desc">综合</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='readnum'?'color:'+t('color1'):''" data-field="readnum" data-order="desc">浏览量</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" data-field="price" :data-order="order=='asc'?'desc':'asc'">
+					<text :style="field=='price'?'color:'+t('color1'):''">价格</text>
+					<text class="iconfont icon-danbianjiantou1" :style="field=='price'&&order=='asc'?'color:'+t('color1'):''"></text>
+					<text class="iconfont icon-danbianjiantou" :style="field=='price'&&order=='desc'?'color:'+t('color1'):''"></text>
+				</view>
+				<view class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view>
+			</view>
+			<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+				<view class="filter-scroll-view">
+					<scroll-view class="filter-scroll-view-box" scroll-y="true">
+						<view class="search-filter">
+							<view class="filter-title">筛选</view>
+							<view class="filter-content-title">课程分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+								<block v-for="(item, index) in clist" :key="index">
+									<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<view class="search-filter-btn">
+								<view class="btn" @tap="filterReset">重置</view>
+								<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</uni-drawer>
+
+			
+		</view>
+		<view class="product-container">
+			<block v-if="datalist && datalist.length>0">
+				<dp-kecheng-item v-if="productlisttype=='item2'" :data="datalist" :menuindex="menuindex"></dp-kecheng-item>
+				<dp-kecheng-itemlist v-if="productlisttype=='itemlist'" :data="datalist" :menuindex="menuindex"></dp-kecheng-itemlist>
+			</block>
+			<nomore text="没有更多课程了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关课程" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: false,
+		order: '',
+		field:'',
+		oldcid: "",
+		catchecid: "",
+		catchegid: "",
+		cid: "",
+		gid: '',
+		clist: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用商品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list');
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getprolist();
+    }
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			that.loading = true;
+			app.get('ApiKecheng/list', {cid: cid,gid: gid,bid:bid}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.glist = res.glist;
+				that.loaded();
+				that.getprolist();
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			var bid = that.opt.bid ? that.opt.bid : '';
+      app.post('ApiKecheng/getlist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cpid:cpid,bid:bid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    }
+  }
+};
+</script>
+<style lang="scss">
+.container {background: #F5F5F5;height: 100vh;}
+.search-container {position: fixed;width: 100%;z-index:9;top:var(--window-top);background: #0A5D3B;}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height: 80rpx;border-radius: 40rpx;border: 0;background: rgba(255,255,255,.3);flex:1;padding: 0 28rpx;}
+.topsearch .f1 .icon-search{font-size: 40rpx;margin-right: 16rpx;color:#FFFFFF;}
+.topsearch .f1 input{height: 100%;flex: 1;font-size: 28rpx;color:#FFFFFF;}
+.topsearch .search-btn{
+	display:flex;align-items:center;color:#FFFFFF;text-align:center;margin-left:20rpx;
+	.iconfont {font-size:40rpx;}
+}
+.search-navbar {border-radius: 12rpx 12rpx 0 0;overflow: hidden;background: #F5F5F5;display: flex;text-align: center;align-items:center;padding:32rpx 0}
+.search-navbar-item {flex: 1;height: 28rpx;line-height: 28rpx;position: relative;font-size:28rpx;font-weight:bold;color:#333333}
+
+.search-navbar-item .icon-danbianjiantou,.icon-danbianjiantou1{font-size: 28rpx;color:#7D7D7D}
+.search-navbar-item .icon-danbianjiantou {margin-left: -10rpx;}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{min-width: 140rpx;box-sizing: border-box;background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 20rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%;font-size:26rpx;padding:206rpx 24rpx 0;}
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/mldetail.vue b/activity/kecheng/mldetail.vue
new file mode 100644
index 0000000..34fd55b
--- /dev/null
+++ b/activity/kecheng/mldetail.vue
@@ -0,0 +1,398 @@
+<template>
+<view class="wrap">
+	<block v-if="isload">
+		<block v-if="detail.kctype==1">
+			<view class="title">{{detail.name}}</view>
+			<dp :pagecontent="pagecontent"></dp>
+			<view style="margin-bottom: 40rpx;"></view>
+		</block>
+		<view class="audo-video" v-if="detail.kctype==2">
+			<view class="audoimg"><image :src="detail.pic"/></view>
+			<view class="play">
+				<view class="play-left">
+					<image :src="event_rul + '/static/img/static/img/video_icon.png'" v-show="playshow" @tap="play"></image>   
+			    <image :src="event_rul + '/static/img/static/img/play.png'" v-show="!playshow" @tap="pauseaudio"></image> 
+			    <text>{{nowtime}}</text>
+			  </view>
+			  <view class="play-right">
+					<slider @change="sliderChange"  @changing="sliderChanging" class="slider" block-size="16"  :min="0" :max="time"  :value="currentTime" activeColor="#595959"  />
+			  </view>
+				<view class="play-end"><text>{{duration}}</text></view>
+			</view>
+		</view>
+		<view class="videobox" v-if="detail.kctype==3">
+			<video  class="video" id="video" :autoplay="true" :src="detail.video_url"   :initial-time="detail.startTime" @pause="pause" @timeupdate="timeupdate"></video>
+		</view>
+		<view style=" height: 30rpx; width: 100%; background-color: #f5f5f5;"></view>
+		<view class="content_box">
+			<view class="title flex">
+				<view class="t1">课程目录</view>
+				<view class="t2" v-if="detail.isdt==1 && detail.count>=detail.kccount && iskaoshi!=1" @tap.stop="goto" :data-url="'tiku?id=' + detail.kcid" data-opentype="redirect">去答题</view>
+				<view class="t2" v-if="iskaoshi==1" @tap.stop="goto" :data-url="'recordlog?kcid=' + detail.kcid">答题记录</view>
+			</view>
+			<view class="mulubox flex" v-for="(item, index) in datalist" :key="index" >
+				<view class="left_box">
+					<image v-if="item.kctype==1" :src="event_rul + '/static/img/static/img/tw_icon.png'" /> 
+					<image v-if="item.kctype==2" :src="event_rul + '/static/img/static/img/mp3_icon.png'" />
+					<image v-if="item.kctype==3" :src="event_rul + '/static/img/static/img/video_icon.png'" /> 
+				</view>
+				<view class="right_box flex">
+					<view :class="'title_box '+ (item.id==detail.id?'on':'')"   @tap="todetail" :data-key='item.key' :data-mianfei='item.ismianfei' :data-url="'mldetail?id='+item.id+'&kcid='+item.kcid" :data-opentype="item.kctype==1 ? 'redirect' : 'redirect'">
+						<view class="t1"> {{item.name}}</view>
+						<view> 
+							<text  v-if="item.kctype==1"  class="t2">图文课程 </text>
+							<text v-if="item.kctype==2"  class="t2">音频课程 </text>
+							<text v-if="item.kctype==3"  class="t2">视频课程 </text>
+							<text  class="t2" v-if="item.video_duration>0"> 时长: {{item.duration}}</text>
+						</view>
+					</view>
+					<view class="jindu" v-if="item.jindu">{{item.jindu}}%</view>
+					<view class="skbtn" v-if="item.ismianfei && !item.jindu">试看</view>
+				</view>		
+			</view>
+		</view>
+	</block>
+	<nomore text="没有更多课程了" v-if="nomore"></nomore>
+	<nodata text="没有查找到相关课程" v-if="nodata"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+	data() {
+		return {
+			loading:false,
+			isload: false,
+			isplay: 0,
+			detail: [],
+			datalist: [],
+			pagecontent: "",
+			playshow:true, //播放的图片
+			stipshow:false, //暂停的图片
+			lock: false, // 锁
+			status: 1, // 1暂停 2播放
+			currentTime: 10,  //当前进度
+			duration: '', // 总进度
+			videoContext: '',
+			iskaoshi:'',
+			pagenum:1,
+			studlog:[],
+			innerAudioContext: '',
+			startTime:'',
+			seek: false ,//是否处于拖动状态
+			time:'',
+			playJd:'',
+			nowtime:'',
+			event_rul: app.globalData.event_url,
+		};
+	},
+	onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+		this.getdatalist(); 
+		this.innerAudioContext = uni.createInnerAudioContext();
+	},
+	onShow:function(){
+		var that=this
+		clearInterval(interval);
+		this.innerAudioContext.stop();
+	},
+	onUnload: function () {
+		clearInterval(interval);
+		var that=this
+		this.innerAudioContext.stop();
+	},
+	onHide(){
+		this.playshow = false
+	},
+	onReachBottom: function () {
+		if (!this.nodata && !this.nomore) {
+			this.pagenum = this.pagenum + 1;
+			this.getdatalist(true);
+		}
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.id = id;
+			var kcid = this.opt.kcid || 0;
+			that.loading = true;
+			app.get('ApiKecheng/mldetail', {id: id,kcid:kcid}, function (res) {
+				that.loading = false;
+				var detail = res.detail;
+				that.detail = detail;
+				that.iskaoshi = res.iskaoshi;
+				uni.setNavigationBarTitle({
+					title: detail.name
+				});
+				that.studylog = res.studylog;
+				var pagecontent = JSON.parse(detail.detail);
+				that.pagecontent = pagecontent;
+				that.loaded({title:detail.name,pic:detail.pic});
+				//that.addstudy();
+				if(detail.kctype>1){
+					interval = setInterval(function () {
+						that.addstudy();
+					}, 10000);
+				}
+				that.play();
+					
+			
+			});
+		},
+		todetail:function(e){
+			var that = this;
+			var url = e.currentTarget.dataset.url;
+			var ismf = e.currentTarget.dataset.mianfei;
+			var opentype = e.currentTarget.dataset.opentype;
+			var key = e.currentTarget.dataset.key;
+			if(ismf==1 || that.detail.ispay==1 || that.detail.price==0){
+				app.goto(url,opentype);
+			}else{
+				app.alert('请先购买课程',function(){
+					app.goto('product?id='+that.opt.kcid);
+				});
+			}
+		},
+		getdatalist: function(loadmore){
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var kcid = that.opt.kcid ? that.opt.kcid : '';
+			var order = that.order;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			app.post('ApiKecheng/getmululist', {pagenum: pagenum,field: field,order: order,id:kcid}, function (res) { 
+				that.loading = false;
+				uni.stopPullDownRefresh();
+				var data = res.data;
+				if (pagenum == 1) {
+				  that.datalist = data;
+				  if (data.length == 0) {
+				    that.nodata = true;
+				  }
+					
+				}else{
+				  if (data.length == 0) {
+				    that.nomore = true;
+				  } else {
+				    var datalist = that.datalist;
+				    var newdata = datalist.concat(data);
+				    that.datalist = newdata;
+				  }
+				}
+		
+			});
+		},
+		scrolltolower: function () {	     
+			if (!this.nomore) {
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+			}
+		},
+		payvideo: function () {
+			this.isplay = 1;
+			uni.createVideoContext('video').play();
+		},
+		parsevideo: function () {
+			this.isplay = 0;
+			uni.createVideoContext('video').stop();
+		},
+		pause:function(){
+			//将暂停播放时间请求
+			var that = this
+			var id = that.opt.id ? that.opt.id : '';
+			that.addstudy();
+		},
+		addstudy:function(){
+			var that = this
+			var logid = that.studylog.id;
+			var id= that.detail.id;
+
+			app.post('ApiKecheng/addstudy', {logid:logid,currentTime:that.currentTime,playJd:that.playJd}, function (res) {
+				that.datalist[that.detail.key].jindu = res.jindu
+				that.detail.startTime = that.currentTime
+				if(that.playJd>=100){
+					  app.confirm('本节已学完，是否学习下一节', function (res) {
+								app.post('ApiKecheng/nextsection', {id: id,kcid:that.detail.kcid}, function (res) {
+											app.goto('/activity/kecheng/mldetail?id='+res.id+'&kcid='+that.detail.kcid);
+								});
+						},
+						function (res) {
+									that.stipshow=false;
+									that.playshow=true;
+									that.currentTime = 0;
+									that.nowtime = '00:00';
+									that.playJd = '0';
+						})
+				}
+			});
+		},
+		timeupdate:function(e){
+			//跳转到指定播放位置 initial-time 时间为秒
+			let that = this;
+			//播放的总时长
+			var duration = e.detail.duration;
+			//实时播放进度 秒数
+			var currentTime = e.detail.currentTime;
+			//当前视频进度
+			// console.log("视频播放到第" + currentTime + "秒")//查看正在播放时间，以秒为单位
+			var jump_time = that.currentTime   //上次结束时间
+
+			if (that.detail.isjinzhi == 1) {
+				if (currentTime > jump_time && currentTime - jump_time > 1 && that.datalist[that.detail.key].jindu!='100%') {
+						let videoContext = wx.createVideoContext('video');
+						videoContext.seek(that.currentTime);
+						wx.showToast({
+							title: '未完整看完该视频，不能快进',
+							icon: 'none',
+							duration: 2000
+						});
+				}
+			}
+			that.currentTime  = currentTime; //实时播放进度
+		},
+		// 播放
+		play() {
+			var that=this
+			this.playshow=true;
+			this.innerAudioContext.autoplay = true;
+			this.innerAudioContext.src = that.detail.voice_url;
+			this.innerAudioContext.play();
+			this.innerAudioContext.onCanplay(()=> {
+				this.innerAudioContext.duration;
+				setTimeout(() => {
+					that.time = this.innerAudioContext.duration.toFixed(0);
+					var min = Math.floor(that.time/60);
+					var second = that.time%60
+					this.duration = (min>10?min:'0'+min)+':'+(second>10?second:'0'+second);	
+				}, 1000)
+			})  
+							console.log(this.duration);
+			that.startTime =  that.detail.startTime
+			if(that.detail.startTime >=that.detail.video_duration){
+				that.startTime =  0
+			}
+			this.innerAudioContext.seek(that.startTime)
+			this.innerAudioContext.onPlay(() => {
+				that.playshow=false;   
+			});
+			this.innerAudioContext.onPause(() => {
+				//that.addstudy();
+				that.playshow=true;
+			});
+			this.innerAudioContext.onEnded(() => {
+				that.playJd = 100;
+				clearInterval(interval);
+				console.log(that.playJd)
+				that.addstudy();
+				that.playshow=true;
+			});
+			this.innerAudioContext.onTimeUpdate(() => {
+				var nowtime = this.innerAudioContext.currentTime.toFixed(0)
+				console.log(nowtime);
+				var min = Math.floor(nowtime/60)
+				var second = nowtime%60
+				that.nowtime = (min>=10?min:'0'+min)+':'+(second>=10?second:'0'+second)
+				  //计算进度
+				that.playJd = ((nowtime/that.innerAudioContext.duration).toFixed(2))*100;
+				if(that.playJd>100) that.playJd=100
+				that.currentTime = this.innerAudioContext.currentTime;
+			//	console.log(that.currentTime);
+				//console.log('播放进度',that.innerAudioContext.currentTime,)			
+			});
+		 
+	
+		}, 
+		// 暂停
+		pauseaudio() {
+			var that=this
+			this.innerAudioContext.pause();
+			that.addstudy();
+		},
+		// 拖动进度条
+		sliderChange(data) {
+			var that=this;
+			if(that.detail.isjinzhi == 1 && data.detail.value>that.detail.startTime && that.datalist[that.detail.key].jindu!='100'){
+				app.error('未完整听完该音频，不能快进');return;
+			}else{
+				that.currentTime = data.detail.value;
+				this.innerAudioContext.seek(data.detail.value)
+			}	
+		},
+		//拖动中
+		sliderChanging(data) {	
+			this.currentTime = data.detail.value	
+		}
+	}
+};
+</script>
+<style>
+.wrap{ background: #fff;}
+.wrap .title{ padding: 30rpx; font-size: 42rpx; color: #111111; font-weight: bold; justify-content: space-between;}
+	
+.hide{ display: none;}
+.provideo{border-radius:27rpx;width:750rpx;position:absolute;z-index:1000;align-items:center;justify-content:space-between}
+.provideo image{ width: 100%;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+.videobox{width:100%;text-align:center;background:#000; }
+.videobox .video{width:100%;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx}
+
+.content_box{ background: #fff;}
+.content_box .title{ line-height: 60rpx; margin-left: 30rpx; padding:20rpx 0rpx;border-bottom: 1px solid #F7F7F7;}
+.content_box .title .t1{ font-size: 32rpx; font-weight: bold;  }
+.content_box .title .t2{ font-size: 24rpx; background:#fff;border:1px solid #cdcdcd;border-radius:3px; margin-right: 20rpx; padding: 0rpx 20rpx; border-radius: 10rpx;}
+.mulubox{ padding-top: 35rpx; padding-left: 30rpx;}
+.left_box{ display: flex;}
+.left_box image{ width: 44rpx; height:44rpx; margin-right: 40rpx; margin-top: 26rpx; }
+.right_box{ border-bottom: 1px solid #F6F6F6; padding-bottom: 30rpx; width: 100%; justify-content: space-between;}
+.title_box{ width: 80%;}
+.title_box .t1{ color: #1E252F; font-size: 28rpx; font-weight: bold;}
+.title_box .t2{ color: #B8B8B8;font-size: 24rpx;line-height: 60rpx; margin-right: 15rpx;}
+.right_box .on text{ color:#FF5347}
+.right_box .on .t1{  color:#FF5347}
+.skbtn{  background-color: #FFEEEC; padding: 6rpx 20rpx; margin-right: 10px; height: 44rpx; width: 90rpx; color: #FC6D65; font-size: 24rpx; border-radius: 22rpx; margin-top: 20rpx;}
+.right_box .jindu{ color:#FF5347; margin-right: 20rpx; font-size: 24rpx;}
+.baner{ width:100%; overflow: hidden; box-sizing: border-box; position: relative;}
+.audioBg{display: block; width:100%; height:370rpx;}
+.transmit{ position: absolute; left: 0;  right: 0; top: 0; bottom:0; margin: auto; display: block; width:80rpx; height:80rpx;}
+
+.content {	padding: 20upx;}
+.list {font-size: 28upx;line-height: 88upx;padding-left: 30upx;background: #fff;border-radius: 10upx;margin-top: 20upx;color: #333;}
+.active {	background: #169af3;color: #fff;}
+
+/*音频播放器样式*/
+.audoimg{ width: 100%; }
+.audoimg image{ width: 100%; height: 600rpx; }
+/deep/.uni-slider-handle-wrapper{
+    background: black !important;
+}
+/deep/.uni-slider-thumb{
+    background: black !important;
+}
+.play{ background-color:rgba(255,255,255,0.5);width: 100%; height: 124rpx;position: absolute; bottom:0%;  }
+.play-left text{ margin-top: 1px; color: black;  font-size: 13px; line-height: 120rpx;  position: absolute; left: 13%;    }
+.play-end text{ margin-top: 1px; color: black;  font-size: 13px; line-height: 120rpx; right: 8%;  position: absolute;      }
+.slider{  width: 366rpx; position: relative; margin-top: 42rpx;  color: black; float: left;}
+.musions{  width: 26px; height: 26px; margin: 17px 4px 0 5px; float: left; }
+.play image{   width: 26px; height: 26px; margin: 34rpx 4px 0 5px;float: left;  }
+.play-left{width: 170rpx;height: 116upx;    float: left;  border-radius: 38px;  }
+.play-right{ width: 66%;  float: left; height: 58px; position: relative; }
+.audo-video {  width: 100%;   position: relative; top: -18px; }
+.slider-box {  display: flex; align-items: center;justify-content: center;font-size: 26upx; color: #999; }
+button {  display: inline-block; width: 100upx; background-color: #fff;  font-size: 24upx;    color: #000;   padding: 0; }
+.hidden {position: fixed;  z-index: -1;   width: 1upx;height: 1upx;}
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/orderlist.vue b/activity/kecheng/orderlist.vue
new file mode 100644
index 0000000..5d077c3
--- /dev/null
+++ b/activity/kecheng/orderlist.vue
@@ -0,0 +1,158 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入课程标题搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap.stop="goto" :data-url="'product?id=' + item.kcid">
+					<view class="content" style="border-bottom:none">
+						<view @tap.stop="goto" :data-url="'product?id=' + item.kcid">
+							<image :src="item.pic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.title}}</text>
+							<view class="t4 flex">
+								<view>
+									<view class="t3"><text class="x1 flex1">{{item.price==0?'免费':'支付金额：￥' + item.price}}</text></view>
+									<view class="t2"><text>共{{item.kccount}}节 已学{{item.count}}节</text></view>
+								</view>
+								<view v-if="item.iskaoshi!=1 && item.count>=item.kccount && item.isdt==1"  @tap.stop="goto" :data-url="'tiku?id=' + item.kcid" class="btn2">去答题</view>
+								<view v-if="item.iskaoshi!=1 && item.count<item.kccount"  @tap.stop="goto" :data-url="'product?id=' + item.kcid" class="btn2">继续学习</view>
+								<view v-if="item.iskaoshi==1" @tap.stop="goto" :data-url="'recordlog?kcid=' + item.kcid" class="btn2">答题记录</view>
+							</view>
+						</view>
+					</view>		
+				</view>
+			</block>
+		</view>
+		
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+	  opt:{},
+	  loading:false,
+      isload: false,
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      codtxt: "",
+	  keyword:'',
+	  event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+			var keyword = that.keyword;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiKecheng/orderlist', {keyword: keyword,st: st,pagenum: pagenum}, function (res) {
+			that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+			that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+	searchChange: function (e) {
+	  this.keyword = e.detail.value;
+	},
+	searchConfirm: function (e) {
+	  var that = this;
+	  var keyword = e.detail.value;
+	  that.keyword = keyword;
+	  that.getdata();
+	}
+  }
+};
+</script>
+<style>
+.container{ width:100%;}
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width:200rpx; height: 200rpx; border-radius: 10rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 22rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246; margin-top: 30rpx;}
+.order-box .content .detail .t4{display:flex;justify-content: space-between; }
+.order-box .content .detail .btn2{ margin-top: 40rpx;}
+
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+/*.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px; font-size: 14px; position: absolute; bottom: 10px; right: 10px; background: #fff; }*/
+.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px;}
+
+.zan-tex{clear:both; display: block; width: 100%; color: #565656; font-size: 12px; height: 30px; line-height: 30px; text-align: center;  }
+.ind-bot{ width: 100%; float: left; text-align: center; height: 50px; line-height: 50px; font-size: 13px; color: #ccc; background:#F2F2F2}
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/product.vue b/activity/kecheng/product.vue
new file mode 100644
index 0000000..7790ac2
--- /dev/null
+++ b/activity/kecheng/product.vue
@@ -0,0 +1,548 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="swiper-container"  >
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="500000" @change="swiperChange">
+				<block v-for="(item, index) in product.pics" :key="index">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+					</swiper-item>
+				</block>
+			</swiper>
+			<view class="imageCount">{{current+1}}/{{(product.pics).length}}</view>
+		</view>
+	
+		<view class="header"> 
+			<view class="price_share">
+				<view class="title">{{product.name}}</view>
+
+			</view>
+			<view class="pricebox flex">
+				<view class="price">
+					<view class="f1" v-if="product.price>0" :style="{color:t('color1')}">
+						￥<text style="font-size:36rpx">{{product.price}}</text>
+					</view>
+					<view class="f1" v-else :style="{color:t('color1')}">
+						<text style="font-size:36rpx">免费</text>
+					</view>
+					<view class="f2" v-if="product.market_price*1 > product.sell_price*1">￥{{product.market_price}}<text v-if="product.max_price!=product.min_price">起</text></view>
+				</view>
+				<view class="sales_stock">
+					<view class="f1" >{{product.count}}节课 | 已有{{product.join_num}}人学习 </view>
+				</view>	
+			</view>			
+		</view>		
+		
+		<view class="detail">
+			<view class="detail_title">
+				<view class="order-tab2">
+					<view :class="'item ' + (curTopIndex == 1 ? 'on' : '')" @tap="switchTopTab" :data-index="1" >课程介绍<view class="after" :style="{background:t('color1')}"></view></view>
+					<view :class="'item ' + (curTopIndex == 2 ? 'on' : '')" @tap="switchTopTab" :data-index="2" >课程目录<view class="after" :style="{background:t('color1')}"></view></view>
+				</view>
+			</view>
+			<block v-if="curTopIndex==1"><dp :pagecontent="pagecontent"></dp></block>
+			<block v-if="curTopIndex==2">
+				<view class="mulubox flex" v-for="(item, index) in datalist" :key="index" @tap="todetail" :data-mianfei='item.ismianfei' :data-url="'mldetail?id='+item.id+'&kcid='+item.kcid">
+					<view class="left_box">
+						<image v-if="item.kctype==1" :src="event_rul + '/static/img/static/img/tw_icon.png'" /> 
+						<image v-if="item.kctype==2" :src="event_rul + '/static/img/static/img/mp3_icon.png'" />
+						<image v-if="item.kctype==3" :src="event_rul + '/static/img/static/img/video_icon.png'" /> 
+					</view>
+					<view class="right_box flex">
+						<view class="title_box">
+							<view class="t1"> {{item.name}}</view>
+							<view> <text  v-if="item.kctype==1"  class="t2">图文课程 </text>
+								<text v-if="item.kctype==2"  class="t2">音频课程 </text>
+								<text v-if="item.kctype==3"  class="t2">视频课程 </text>
+								<text  v-if="item.kctype!=1" class="t2"> 时长: {{item.duration}}</text>
+							</view>
+						</view>
+						<view class="skbtn" v-if="item.ismianfei && product.price>0">试看</view>
+						<view class="skbtn" v-if="product.price==0">免费</view>
+					</view>		
+				</view>
+				<nomore text="没有更多课程了" v-if="nomore"></nomore>
+				<nodata text="没有查找到相关课程" v-if="nodata"></nodata>
+			</block>
+		</view>
+		<view style="width:100%;height:140rpx;"></view>
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':''" v-if="product.status==1">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="'list?bid='+product.bid">
+					<image class="img" :src="event_rul + '/static/img/static/img/shou.png'"/>
+					<view class="t1">首页</view>
+				</view>
+				<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul + '/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul + '/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+
+				<view class="item" @tap="addfavorite">
+					<image class="img" :src="event_rul + '/static/img/static/img/shoucang.png'"/>
+					<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+				</view>
+			</view>
+			<view class="op">
+				
+				<view v-if="product.price==0 || product.ispay==1"  class="tobuy flex-x-center flex-y-center" @tap="goto" :data-url="'mldetail?kcid='+product.id" :style="{background:t('color1')}" >立即学习</view>
+				<view v-else class="tobuy flex-x-center flex-y-center" @tap="tobuy" :style="{background:t('color1')}" >立即购买</view>
+			</view>
+		</view>
+
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul + '/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul + '/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul + '/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul + '/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+			isload:false,
+			isfavorite: false,
+			current: 0,
+			product: [],
+			pagecontent: "",
+			title: "",
+			sharepic: "",
+			sharetypevisible: false,
+			showposter: false,
+			posterpic: "",
+			scrolltopshow: false,
+			kfurl:'',
+			timeDialogShow: false,
+			curTopIndex: 1,
+		    datalist: [],
+			event_rul: app.globalData.event_url,
+		};
+	},
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		console.log(sharewxdata)
+		console.log(query)
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+	onUnload: function () {
+		clearInterval(interval);
+	},
+	onReachBottom: function () {
+		if (!this.nodata && !this.nomore) {
+			this.pagenum = this.pagenum + 1;
+			this.getdatalist(true);
+		}
+	},
+
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.loading = true;
+			app.get('ApiKecheng/detail', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.textset = app.globalData.textset;
+				var product = res.product;
+				var pagecontent = JSON.parse(product.detail);
+				that.product = product;
+				that.pagecontent = pagecontent;
+				that.title = product.name;
+				that.isfavorite = res.isfavorite;
+				that.sharepic = product.pics[0];
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+				that.kfurl = '/pages/kefu/index?bid='+product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:product.name,pic:product.pic});
+			});
+		},
+		swiperChange: function (e) {
+			var that = this;
+			that.current = e.detail.current
+		},
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.btntype = e.currentTarget.dataset.btntype;
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+		currgg: function (e) {
+			console.log(e);
+			var that = this
+			this.ggname = e.ggname;
+			that.ggid = e.ggid
+			that.proid = e.proid
+			that.num = e.num
+		},
+		switchTopTab: function (e) {
+		  var that = this;
+		  this.curTopIndex = e.currentTarget.dataset.index;
+		  this.getdatalist();
+		},
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var id = that.opt.id ? that.opt.id : '';
+			var order = that.order;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			app.post('ApiKecheng/getmululist', {pagenum: pagenum,field: field,order: order,id:id}, function (res) { 
+				that.loading = false;
+				uni.stopPullDownRefresh();
+				var data = res.data;
+				if (pagenum == 1) {
+				  that.datalist = data;
+				  if (data.length == 0) {
+				    that.nodata = true;
+				  }
+				}else{
+				  if (data.length == 0) {
+				    that.nomore = true;
+				  } else {
+				    var datalist = that.datalist;
+				    var newdata = datalist.concat(data);
+				    that.datalist = newdata;
+				  }
+				}
+			});
+		},
+		todetail:function(e){
+			var that = this;
+		    var url = e.currentTarget.dataset.url;
+			var ismf = e.currentTarget.dataset.mianfei;
+			if(ismf==1 || that.product.ispay==1 || that.product.price==0){
+				app.goto(url);
+			}else{
+				app.error('请先购买课程');
+			}
+		},
+		//收藏操作
+		addfavorite: function () {
+			var that = this;
+			var proid = that.product.id;
+			app.post('ApiKecheng/addfavorite', {proid: proid,type: 'kecheng'}, function (data) {
+				if (data.status == 1) {
+					that.isfavorite = !that.isfavorite;
+				}
+				app.success(data.msg);
+			});
+		},
+		shareClick: function () {
+			this.sharetypevisible = true;
+		},
+		handleClickMask: function () {
+			this.sharetypevisible = false
+		},
+		showPoster: function () {
+			var that = this;
+			that.showposter = true;
+			that.sharetypevisible = false;
+			app.showLoading('生成海报中');
+			app.post('ApiKecheng/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+				if (data.status == 0) {
+					app.alert(data.msg);
+				} else {
+					that.posterpic = data.poster;
+				}
+			});
+		},
+		posterDialogClose: function () {
+			this.showposter = false;
+		},
+		showfuwudetail: function () {
+			this.showfuwudialog = true;
+		},
+		hidefuwudetail: function () {
+			this.showfuwudialog = false
+		},
+		showcuxiaodetail: function () {
+			this.showcuxiaodialog = true;
+		},
+		hidecuxiaodetail: function () {
+			this.showcuxiaodialog = false
+		},
+		getcoupon:function(){
+			this.showcuxiaodialog = false;
+			this.getdata();
+		},
+		onPageScroll: function (e) {
+			var that = this;
+			var scrollY = e.scrollTop;     
+			if (scrollY > 200) {
+				that.scrolltopshow = true;
+			}
+			if(scrollY < 150) {
+				that.scrolltopshow = false
+			}
+		},	
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			that.sharetypevisible = false;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/kecheng/detail?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/kecheng/detail'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		},
+		showsubqrcode:function(){
+			this.$refs.qrcodeDialog.open();
+		},
+		closesubqrcode:function(){
+			this.$refs.qrcodeDialog.close();
+		},
+		tobuy: function (e) {
+			var that=this
+			//购买
+			app.post('ApiKecheng/createOrder', {
+				kcid:that.product.id,
+			}, function(res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+					app.error(res.msg);
+					return;
+				}
+				app.goto('/pages/pay/pay?id=' + res.payorderid);
+			});
+		},
+		
+	}
+
+};
+</script>
+<style>
+.follow_topbar {height:88rpx; width:100%;max-width:640px; background:rgba(0,0,0,0.8); position:fixed; top:0; z-index:13;}
+.follow_topbar .headimg {height:64rpx; width:64rpx; margin:6px; float:left;}
+.follow_topbar .headimg image {height:64rpx; width:64rpx;}
+.follow_topbar .info {height:56rpx; padding:16rpx 0;}
+.follow_topbar .info .i {height:28rpx; line-height:28rpx; color:#ccc; font-size:24rpx;}
+.follow_topbar .info {height:80rpx; float:left;}
+.follow_topbar .sub {height:48rpx; width:auto; background:#FC4343; padding:0 20rpx; margin:20rpx 16rpx 20rpx 0; float:right; font-size:24rpx; color:#fff; line-height:52rpx; border-radius:6rpx;}
+.qrcodebox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.qrcodebox .img{width:400rpx;height:400rpx}
+.qrcodebox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.qrcodebox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+.goback{ position: absolute; top:0 ;width:64rpx ; height: 64rpx;z-index: 10000; margin: 30rpx;}
+.goback img{ width:64rpx ; height: 64rpx;}
+
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 420rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+
+.provideo{background:rgba(255,255,255,0.7);width:160rpx;height:54rpx;padding:0 20rpx 0 4rpx;border-radius:27rpx;position:absolute;bottom:30rpx;left:50%;margin-left:-80rpx;display:flex;align-items:center;justify-content:space-between}
+.provideo image{width:50rpx;height:50rpx;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+
+.videobox{width:100%;height:750rpx;text-align:center;background:#000}
+.videobox .video{width:100%;height:650rpx;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx;}
+
+.header {padding: 20rpx 3%;background: #fff; width: 100%; border-radius:10rpx; margin: auto; margin-bottom: 20rpx; position: relative;}
+.header .price_share{width:100%;height:100rpx;display:flex;align-items:center;justify-content:space-between}
+.header .price_share .price{display:flex;align-items:flex-end}
+.header .price_share .price .f1{font-size:50rpx;color:#51B539;font-weight:bold}
+.header .price_share .price .f2{font-size:26rpx;color:#C2C2C2;text-decoration:line-through;margin-left:30rpx;padding-bottom:5px}
+.header .price_share .share{display:flex;flex-direction:column;align-items:center;justify-content:center}
+.header .price_share .share .img{width:32rpx;height:32rpx;margin-bottom:2px}
+.header .price_share .share .txt{color:#333333;font-size:20rpx}
+.header .title {color:#000000;font-size:32rpx;line-height:42rpx;font-weight:bold;}
+.header .sellpoint{font-size:28rpx;color: #666;padding-top:20rpx;}
+.header .sales_stock{height:60rpx;line-height:60rpx;font-size:24rpx;color:#BBB; }
+.header .commission{display:inline-block;margin-top:20rpx;margin-bottom:10rpx;border-radius:10rpx;font-size:20rpx;height:44rpx;line-height:44rpx;padding:0 20rpx}
+
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+.service-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.service-item .prefix{padding-top: 2px;}
+.service-item .suffix{padding-left: 10rpx;}
+.service-item .suffix .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx;}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx; width: 100%; margin: auto; border-radius: 10rpx; background: #fff;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:40rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.bottombar{ width: 100%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:100rpx;padding:0 30rpx 0 10rpx;align-items:center;}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx;}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:50%;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:12rpx;overflow:hidden;display:flex;}
+.bottombar .tocart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold; background: #FD4A46; }
+.bottombar .cartnum{position:absolute;right:4rpx;top:-4rpx;color:#fff;border-radius:50%;width:32rpx;height:32rpx;line-height:32rpx;text-align:center;font-size:22rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+
+.pricebox{ width: 100%;border:1px solid #fff; justify-content: space-between;}
+
+.order-tab2{display:flex;width:auto;min-width:100%; padding-top: 10rpx; border-bottom: 1px solid #F7F7F7;}
+.order-tab2 .item{width:20%;padding:0 20rpx;font-size:28rpx;font-weight:bold;text-align: center; color:#999999; height:80rpx; line-height:80rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.order-tab2 .on{color:#222222;}
+.order-tab2 .after{display:none;position:absolute;left:47%;margin-left:-20rpx;bottom:0rpx;height:6rpx;border-radius:1.5px;width:60rpx}
+.order-tab2 .on .after{display:block}
+
+.mulubox{ padding-top: 35rpx; padding-left: 30rpx;}
+.left_box{ display: flex;}
+.left_box image{ width: 44rpx; height:44rpx; margin-right: 40rpx; margin-top: 26rpx; }
+.right_box{ border-bottom: 1px solid #F6F6F6; padding-bottom: 30rpx; width: 100%; justify-content: space-between;}
+.title_box .t1{ color: #1E252F; font-size: 28rpx; font-weight: bold;}
+.title_box .t2{ color: #B8B8B8;font-size: 24rpx;line-height: 60rpx; margin-right: 15rpx;}
+.skbtn{  background-color: #FFEEEC; text-align: center; margin-right: 10px; height: 44rpx; width: 95rpx; color: #FC6D65; font-size: 24rpx; line-height: 40rpx; border-radius: 22rpx; margin-top: 20rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/recordlog.vue b/activity/kecheng/recordlog.vue
new file mode 100644
index 0000000..4afa8ff
--- /dev/null
+++ b/activity/kecheng/recordlog.vue
@@ -0,0 +1,107 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap.stop="goto" :data-url="'complete?rid=' + item.id">
+					<view class="content flex" >
+						<view class="detail">
+							<text class="t1">{{item.title}}</text>
+							<text class="t2">{{item.date}}</text>
+						</view>
+						<view class="score">
+							<text class="t3">{{item.score}}</text>
+							<text class="t4">分</text>							
+						</view>
+					</view>		
+				
+				</view>
+			</block>
+		</view>
+		
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+	  opt:{},
+	  loading:false,
+      isload: false,
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      codtxt: "",
+			nodata:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+		var that = this;
+		var pagenum = that.pagenum;
+		var kcid = this.opt.kcid || 0;
+		that.nodata = false;
+		that.nomore = false;
+		that.loading = true;
+      app.post('ApiKecheng/recordlog', {kcid: kcid,pagenum: pagenum}, function (res) {
+		that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+			that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+  }
+};
+</script>
+<style>
+
+.order-content{display:flex;flex-direction:column}
+.order-box .content{display:flex;padding:16rpx 0px; background: #fff; margin:30rpx; border-radius:8rpx; padding: 30rpx; justify-content: space-between;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;width: 70%;}
+.order-box .content .detail .t1{font-size:28rpx;line-height:36rpx;margin-bottom:10rpx;color:#333;font-weight: bold;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #93949E;overflow: hidden;font-size: 26rpx;}
+.order-box .content .score .t3{height:40rpx;line-height:40rpx; font-size: 32rpx;color:#FF5347; font-weight: bold; margin-top: 30rpx; }
+.order-box .content .score .t4{ font-size: 24rpx;color:#FF5347; }
+.order-box .content .score{ margin-top: 30rpx;}
+
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/search.vue b/activity/kecheng/search.vue
new file mode 100644
index 0000000..30ff06d
--- /dev/null
+++ b/activity/kecheng/search.vue
@@ -0,0 +1,344 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container" :style="history_show?'height:100%;':''">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<text class="iconfont icon-search"></text>
+					<input :value="keyword" placeholder="商品搜索..." placeholder-style="font-size:24rpx;color:#FFFFFF" @confirm="searchConfirm" @input="searchChange" />
+				</view>
+				<view class="search-btn" @tap="searchbtn">
+					<text class="iconfont icon-pailie" v-if="!history_show && productlisttype=='itemlist'"></text>
+					<text class="iconfont icon-shipailie" v-if="!history_show && productlisttype=='item2'"></text>
+					<text v-if="history_show">搜索</text>
+				</view>
+			</view>
+			<view class="search-history" v-show="history_show">
+				<view>
+					<text class="search-history-title">最近搜索</text>
+					<view class="delete-search-history" @tap="deleteSearchHistory">
+						<image :src="event_rul +'/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+					</view>
+				</view>
+				<view class="search-history-list">
+					<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+					</view>
+					<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul +'/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+				</view>
+			</view>
+			<view class="search-navbar" v-show="!history_show">
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="!field?'color:'+t('color1'):''" data-field="sort" data-order="desc">综合</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='sales'?'color:'+t('color1'):''" data-field="sales" data-order="desc">销量</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+					<text :style="field=='sell_price'?'color:'+t('color1'):''">价格</text>
+					<text class="iconfont icon-danbianjiantou1" :style="field=='sell_price'&&order=='asc'?'color:'+t('color1'):''"></text>
+					<text class="iconfont icon-danbianjiantou" :style="field=='sell_price'&&order=='desc'?'color:'+t('color1'):''"></text>
+				</view>
+				<view class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view>
+			</view>
+			<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+				<view class="filter-scroll-view">
+					<scroll-view class="filter-scroll-view-box" scroll-y="true">
+						<view class="search-filter">
+							<view class="filter-title">筛选</view>
+							<view class="filter-content-title">商品分组</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchegid==''?'color:'+t('color1')+';':''" @tap.stop="groupClick" data-gid="">全部</view>
+								<block v-for="(item, index) in glist" :key="index">
+									<view class="filter-item" :style="catchegid==item.id?'color:'+t('color1')+';':''" @tap.stop="groupClick" :data-gid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<view class="filter-content-title">商品分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+'':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+								<block v-for="(item, index) in clist" :key="index">
+									<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+'':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<view class="search-filter-btn">
+								<view class="btn" @tap="filterReset">重置</view>
+								<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</uni-drawer>
+
+			
+		</view>
+		<view class="product-container">
+			<block v-if="datalist && datalist.length>0">
+				<dp-product-item v-if="productlisttype=='item2'" :data="datalist"></dp-product-item>
+				<dp-product-itemlist v-if="productlisttype=='itemlist'" :data="datalist"></dp-product-itemlist>
+			</block>
+			<nomore text="没有更多商品了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: true,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: true,
+		order: '',
+		field:'',
+		oldcid: "",
+		catchecid: "",
+		catchegid: "",
+		cid: "",
+		gid: '',
+		clist: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		this.keyword = this.opt.keyword || '';
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用商品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list');
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getprolist();
+    }
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			that.loading = true;
+			app.get('ApiShop/prolist', {cid: cid,gid: gid}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.glist = res.glist;
+				that.loaded();
+				console.log(that.keyword)
+				if(that.keyword){
+					//that.getprolist();
+				}
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiShop/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cpid:cpid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    }
+  }
+};
+</script>
+<style lang="scss">
+.container {background: #F5F5F5;height: 100vh;}
+.search-container {position: fixed;width: 100%;z-index:9;top:var(--window-top);background: #0A5D3B;}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height: 80rpx;border-radius: 40rpx;border: 0;background: rgba(255,255,255,.3);flex:1;padding: 0 28rpx;}
+.topsearch .f1 .icon-search{font-size: 40rpx;margin-right: 16rpx;color:#FFFFFF;}
+.topsearch .f1 input{height: 100%;flex: 1;font-size: 28rpx;color:#FFFFFF;}
+.topsearch .search-btn{
+	display:flex;align-items:center;color:#FFFFFF;text-align:center;margin-left:20rpx;
+	.iconfont {font-size:40rpx;}
+}
+.search-navbar {border-radius: 12rpx 12rpx 0 0;overflow: hidden;background: #F5F5F5;display: flex;text-align: center;align-items:center;padding:32rpx 0}
+.search-navbar-item {flex: 1;height: 28rpx;line-height: 28rpx;position: relative;font-size:28rpx;font-weight:bold;color:#333333}
+
+.search-navbar-item .icon-danbianjiantou,.icon-danbianjiantou1{font-size: 28rpx;color:#7D7D7D}
+.search-navbar-item .icon-danbianjiantou {margin-left: 10rpx;}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{min-width: 140rpx;box-sizing: border-box;background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 20rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%;font-size:26rpx;padding:206rpx 24rpx 0;}
+</style>
\ No newline at end of file
diff --git a/activity/kecheng/tiku.vue b/activity/kecheng/tiku.vue
new file mode 100644
index 0000000..a06f16d
--- /dev/null
+++ b/activity/kecheng/tiku.vue
@@ -0,0 +1,288 @@
+<template>
+<view>
+	<block v-if="isload">
+
+		<view class="wrap">
+			<view class="top flex">
+				<view class="f1" v-if="tkdata.type==1 && tkdata.rightcount==1">单选题</view>
+				<view class="f1" v-if="tkdata.type==1 && tkdata.rightcount==2">多选题</view>
+				<view class="f1" v-if="tkdata.type==2">填空题</view>
+				<view class="f2">倒计时：{{djs}}</view>
+				<view class="f3">{{hasnum}}/{{nums}}</view>
+			</view>
+				<view class="question" >
+					<view class="title" >
+						{{hasnum}}.{{tkdata.title}}
+					</view>
+					<block v-if="tkdata.type==1 && tkdata.rightcount==1">
+						<view class="option_group" >
+							<view :class="'option flex ' +(index==currentindex?'on':'') "  v-for="(item, index) in tkdata.option" @tap="selectOption" :data-index='index'>
+							{{tkdata.sorts[index]}}
+							<view class="after" ></view> 
+							<view class="t1">{{item}}</view></view>
+						</view>
+					</block>
+					<block v-if="tkdata.type==1 && tkdata.rightcount>1">
+						<view class="option_group" >
+							<view :class="'option flex '+(isActive.indexOf(index)!=-1?'on':'')"  v-for="(item, index) in tkdata.option" @tap="selectOption" :data-index='index'>
+							{{tkdata.sorts[index]}}
+							<view class="after" ></view> 
+							<view class="t1">{{item}}</view></view>
+						</view>
+					</block>
+					<block v-if="tkdata.type==2">
+						<view class="option_group">
+							<view class="uni-textarea">
+								<textarea placeholder-style="color:#222" placeholder="答:" @blur="bindTextAreaBlur" :value="right_option" />
+							</view>
+		
+						</view>
+					</block>
+				</view>
+	
+		</view>
+		<view class="bottom flex">
+			<block v-if="hasnum==1"><button class="upbut flex-x-center flex-y-center hui" >上一题</button></block>
+			<block v-if="hasnum>1"><button  @tap="prevquestion" data-dttype="up" class="upbut flex-x-center flex-y-center"  :style="{background:t('color1')}" >上一题</button></block>
+			<button v-if="nums==hasnum" @tap="finish" data-dttype="down" class="downbtn flex-x-center flex-y-center"  :style="{background:t('color1')}" >交卷</button>
+			<button v-else @tap="nextquestion" data-dttype="down" class="downbtn flex-x-center flex-y-center"  :style="{background:t('color1')}" >下一题</button>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			title: "",
+			datalist: [],
+			currentindex:'-1',
+			up:'',
+			djs: '',
+			tkdata:[],
+			set:{},
+			hasnum:0,
+			rid:0,
+			nums:0,
+			dtid:0,
+			lefttime:0,
+			right_option:'',
+			isActive: []
+		};
+	},
+	  onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+	  },
+	onUnload: function () {
+		clearInterval(interval);
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.loading = true;
+			app.post('ApiKecheng/getTiku', {kcid: id,tmid:that.tmid,op:that.op,rid:that.rid}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				if (res.status == 2) {
+					app.alert(res.msg);
+						app.goto('complete?rid=' + that.rid);return;
+				}
+				that.set = res.data.set;
+				that.tkdata = res.data.tkdata;
+				that.hasnum = res.data.hasnum;
+				that.rid = res.data.rid;
+				that.nums = res.data.nums;
+				that.dtid = res.data.dtid;
+				that.lefttime = res.data.lefttime;
+				if (res.data.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}else{
+					app.goto('complete?rid=' + res.rid);return;
+				}
+				that.loaded();		
+			});
+		},
+		//上一题
+		prevquestion:function(){
+				var that=this
+				that.loading = true;
+				app.post('ApiKecheng/prevquestion', {	dtid:that.dtid}, function(res) {
+					that.loading = false;
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					that.tkdata = res.data.tkdata;
+					that.hasnum = res.data.hasnum;
+					that.dtid = res.data.dtid;
+					that.isActive = [];
+					if(that.tkdata.type==1 && res.data.answer!=null){
+						if(that.tkdata.rightcount>1){
+							var answer = res.data.answer;
+							answer.map((item) => {
+							  that.isActive.push(item);
+							})
+						}
+						that.currentindex = res.data.answer;
+					}else{
+						that.right_option = res.data.answer;
+					}
+			});
+		},
+		//下一题
+		nextquestion:function(){
+				var that=this
+				var right_option='';
+				if(that.tkdata.type==1){
+					right_option = that.currentindex;
+					if(right_option==-1){
+						app.error('请选择答案');return;
+					}
+				}
+				if(that.tkdata.type==2){
+					right_option = that.right_option;
+					if(right_option=='' || right_option==undefined){
+						app.error('请填写答案');return;
+					}
+				}
+				that.loading = true;
+				app.post('ApiKecheng/nextquestion', {dtid:that.dtid,	right_option:right_option}, function(res) {
+					that.loading = false;
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					that.tkdata = res.data.tkdata;
+					that.hasnum = res.data.hasnum;
+					that.dtid = res.data.dtid;
+					that.isActive = [];
+					if(that.tkdata.type==1 && res.data.answer!=null){
+						if(that.tkdata.rightcount>1){
+							var answer = res.data.answer;
+							answer.map((item) => {
+							  that.isActive.push(item);
+							})
+							console.log(that.isActive)
+						}
+						that.currentindex = res.data.answer;
+					}else{
+						that.right_option = res.data.answer;
+					}
+					if(!res.data.answer){
+						that.currentindex='-1';
+						that.isActive=[];
+					}		
+					
+			});
+		},
+		getdjs: function () {
+		  var that = this;
+		  var totalsec = that.lefttime;
+		  if (totalsec <= 0) {
+		    that.djs = '00时00分00秒';
+				that.finish();
+			//that.toanswer();return;
+			//app.goto('complete?rid=' + that.rid);return;
+		  } else {
+		    var houer = Math.floor(totalsec / 3600);
+		    var min = Math.floor((totalsec - houer * 3600) / 60);
+		    var sec = totalsec - houer * 3600 - min * 60;
+		    var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+		    that.djs = djs;
+		  }
+		},
+		bindTextAreaBlur: function (e) {
+			var that=this
+			that.right_option = e.detail.value
+		},
+		selectOption: function (e) {
+			var index = e.currentTarget.dataset.index
+		  var that = this;
+		  if(that.tkdata.rightcount==1){
+			that.currentindex = index;
+		  }else{
+				if (that.isActive.indexOf(index) == -1) {
+					that.isActive.push(index); //选中添加到数组里
+				} else {
+					that.isActive.splice(that.isActive.indexOf(index), 1); //取消
+				}
+				that.currentindex = that.isActive;
+		  }
+		}, 
+		bindanswer:function(e){
+			var that=this;
+			var op = e.currentTarget.dataset.dttype
+			that.op = op;
+			that.toanswer();
+		},
+		finish:function(){
+			var that=this
+			var right_option='';
+			if(that.tkdata.type==1 && that.lefttime>0){
+				right_option = that.currentindex;
+				if(right_option==-1){
+					app.error('请选择答案');return;
+				}
+			}
+			if(that.tkdata.type==2  && that.lefttime>0){
+				right_option = that.right_option;
+				if(right_option=='' || right_option==undefined){
+					app.error('请填写答案');return;
+				}
+			}
+			app.post('ApiKecheng/tofinish', {
+				dtid:that.dtid,
+				right_option:right_option
+			}, function(res) {
+				app.showLoading(false);
+				if(res.status == 1){
+					clearInterval(interval);
+					app.goto('complete?rid=' + that.rid);return;
+				}
+			});
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+	}
+
+};
+</script>
+<style>
+.wrap{ background: #fff; margin: 30rpx; border-radius: 10rpx; padding: 30rpx;}
+
+.top{height: 120rpx; line-height: 100rpx; justify-content: space-between;}
+.top .f1{ color:#93949E;font-size: 28rpx;}
+.top .f2{ color:#FF5347 ; font-size: 28rpx;}
+.top .f3{ color:#93949E ; font-size: 28rpx;}
+.question .title{ font-size: 30rpx; color: #333; font-weight: bold;}
+
+.option_group .option{ position: relative; padding-left: 37rpx; height: 96rpx; line-height: 96rpx; background:#F8F4F4 ; margin-top: 30rpx; border-radius: 48rpx; }
+.option_group .option .t1{ margin-left: 40rpx;}
+.option_group .option.on{ background: #FDF1F1; color:#FF5347 ; border: 1px solid #FFAEA8 ; }
+.option_group .option.on .after{ border:1px solid #FF8D8D; }
+.option_group .option .after{ border:1px solid #BBB; height:29rpx;  position: absolute;left: 12%; margin-top: 35rpx;}
+.bottom .upbut{width:240rpx;height: 88rpx; line-height: 88rpx;color: #fff;  border-radius: 44rpx;border: none;font-size:28rpx;font-weight:bold; background: #FD4A46; }	
+.bottom .upbut.hui{ background:#E3E3E3;}
+.bottom .downbtn{margin-left:50rpx;width:360rpx;height: 88rpx; border-radius: 44rpx; line-height: 72rpx;color: #fff;  border: none;font-size:28rpx;font-weight:bold; background: #FD4A46; }	
+.bottom{ margin-top: 30rpx; padding: 30rpx;}
+.uni-textarea{ margin-top: 30rpx; background: #FAFAFA; border: 1px solid #EBE5E5;border-radius: 8rpx; padding: 30rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/buy.vue b/activity/luckycollage/buy.vue
new file mode 100644
index 0000000..abee2a4
--- /dev/null
+++ b/activity/luckycollage/buy.vue
@@ -0,0 +1,735 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="topay">
+		<view v-if="needaddress==0" class="address-add">
+			<view class="linkitem">
+				<text class="f1">联 系 人：</text>
+				<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+			<view class="linkitem">
+				<text class="f1">联系电话：</text>
+				<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+		</view>
+		<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/address?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+			<view class="f1"><image class="img" :src="event_rul +'/static/img/static/img/address.png'"/></view>
+			<view class="f2 flex1" v-if="address.name">
+				<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+				<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+			</view>
+			<view v-else class="f2 flex1">请选择收货地址</view>
+			<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"/>
+		</view>
+		<view class="buydata">
+			<view class="btitle"><image class="img" :src="event_rul +'/static/img/static/img/ico-shop.png'"/>{{business.name}}</view>
+			<view class="bcontent">
+				<view class="product">
+					<view class="item flex">
+						<view class="img">
+							<image class="img" v-if="guige.pic" :src="guige.pic"></image>
+							<image class="img" v-else :src="product.pic"></image>
+						</view>
+						<view class="info flex1">
+							<view class="f1">{{product.name}}</view>
+							<view class="f2">规格：{{guige.name}}</view>
+							<view class="f3">￥{{guige.sell_price}}<text v-if="buytype!=1" class="collage_icon">拼团价</text> × {{totalnum}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="freight">
+					<view class="f1">配送方式</view>
+					<view class="freight-ul">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <block v-for="(item, idx2) in freightList" :key="idx2">
+						 <view class="freight-li" :style="freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<view class="freighttips" v-if="freightList[freightkey].minpriceset==1 && freightList[freightkey].minprice > 0 && freightList[freightkey].minprice > product_price">满{{freightList[freightkey].minprice}}元起送，还差{{freightList[freightkey].minprice - product_price}}元</view>
+					<view class="freighttips" v-if="freightList[freightkey].isoutjuli==1">超出配送范围</view>
+				</view>
+				<view class="price" v-if="freightList[freightkey].pstimeset==1">
+					<view class="f1">{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</view>
+					<view class="f2" @tap="choosePstime">{{pstimetext==''?'请选择时间':pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+				<view class="storeitem" v-if="freightList[freightkey].pstype==1">
+					<view class="panel">
+						<view class="f1">取货地点</view>
+						<view class="f2" @tap="openMendian" :data-freightkey="freightkey" :data-storekey="freightList[freightkey].storekey"><text class="iconfont icondingwei"></text>{{freightList[freightkey].storedata[freightList[freightkey].storekey].name}}</view>
+					</view>
+					<block v-for="(item, idx) in freightList[freightkey].storedata" :key="idx">
+						<view class="radio-item" @tap.stop="choosestore" :data-index="idx" v-if="idx<5 || storeshowall==true">
+							<view class="f1">{{item.name}} </view>
+							<text style="color:#f50;">{{item.juli}}</text>
+							<view class="radio" :style="freightList[freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+					<view v-if="storeshowall==false && (freightList[freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+				</view>
+				<view class="price">
+					<text class="f1">商品金额</text>
+					<text class="f2">¥{{product_price}}</text>
+				</view>
+				<view class="price" v-if="leadermoney*1>0">
+					<text class="f1">团长优惠</text>
+					<text class="f2">-¥{{leadermoney}}</text>
+				</view>
+				<view class="price" v-if="leveldk_money*1>0">
+					<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+					<text class="f2">-¥{{leveldk_money}}</text>
+				</view>
+				<view class="price">
+					<text class="f1">运费</text>
+					<text class="f2">+¥{{freight_price}}</text>
+				</view>
+				<view class="price">
+					<view class="f1">{{t('优惠券')}}</view>
+					<view v-if="couponList.length>0" class="f2" @tap="showCouponList"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{couponrid!=0?couponList[couponkey].couponname:couponList.length+'张可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+					<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+				</view>
+
+				<view style="display:none">{{test}}</view>
+				<view class="form-item" v-for="(item,idx) in freightList[freightkey].formdata" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="radio-group" :name="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="checkbox-group">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector" :name="'form'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata[idx]">
+								<view class="form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix"/></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx"></view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<view class="scoredk flex" v-if="userinfo.score2money > 0">
+			<checkbox-group @change="scoredk" class="flex" style="width:100%">
+				<view class="f1">
+					<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+					<view style="font-size:22rpx;color:#999" v-if="userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+				</view>
+				<view class="f2">使用{{t('积分')}}抵扣
+					<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+				</view>
+			</checkbox-group>
+		</view>
+		<view style="width: 100%;height:110rpx"></view>
+		<view class="footer flex notabbarbot">
+			<view class="text1 flex1">总计：
+				<text style="font-weight:bold;font-size:36rpx">￥{{totalprice}}</text>
+			</view>
+			<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</button>
+		</view>
+		</form>
+
+		<view v-if="couponvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<couponlist :couponlist="couponList" :choosecoupon="true" :selectedrid="couponrid" :bid="product.bid" @chooseCoupon="chooseCoupon"></couponlist>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in freightList[freightkey].pstimeArr" :key="index" @tap="pstimeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		test:'test',
+
+		business:{},
+		productList: [],
+		freightList: [],
+		couponList: [],
+		couponrid: 0,
+		coupontype: 1,
+		address: [],
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		freightkey: 0,
+		freight_price: 0,
+		pstimetext: '',
+		freight_time: '',
+		usescore: 0,
+		totalprice: '0.00',
+		product_price: 0,
+		leveldk_money: 0,
+		scoredk_money: 0,
+		coupon_money: 0,
+		storedata: [],
+		storeid: '',
+		storename: '',
+		latitude: '',
+		longitude: '',
+		isload: 0,
+		leadermoney: 0,
+		couponvisible: false,
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		product: "",
+		guige: "",
+		userinfo: "",
+		buytype: "",
+		scorebdkyf: "",
+		totalnum: "",
+		havetongcheng: "",
+		weight: "",
+		goodsnum: "",
+		beizhu: "",
+		couponkey: 0,
+		storeshowall:false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this; //获取产品信息
+			that.loading = true;
+			app.get('ApiLuckyCollage/buy', {proid: that.opt.proid,ggid: that.opt.ggid,num: that.opt.num,buytype: that.opt.buytype}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg, function(){
+						app.goback()
+					});
+					return;
+				}
+				var product = res.product;
+				var freightList = res.freightList;
+				var userinfo = res.userinfo;
+				var couponList = res.couponList;
+				that.product = product;
+				that.guige = res.guige;
+				that.business = res.business;
+				that.freightList = freightList;
+				that.userinfo = userinfo;
+				that.couponList = couponList;
+				that.buytype = res.buytype;
+				that.address = res.address;
+				that.scorebdkyf = res.scorebdkyf;
+				that.totalnum = res.totalnum;
+				that.havetongcheng = res.havetongcheng;
+				that.linkman = res.linkman;
+				that.tel = res.tel;
+				var leadermoney = 0; //商品总价 重量
+
+				var product_price = res.product_price;
+
+				if (res.buytype == 2 && product.leadermoney * 1 > 0) {
+					leadermoney = product.leadermoney * 1;
+				}
+				leadermoney = leadermoney.toFixed(2); //会员折扣
+				var leveldk_money = 0;
+				if (userinfo.discount > 0 && userinfo.discount < 10) {
+					leveldk_money = (product_price - leadermoney) * (1 - userinfo.discount * 0.1);
+					leveldk_money = leveldk_money.toFixed(2);
+				}
+				that.product_price = res.product_price;
+				that.leadermoney = leadermoney;
+				that.leveldk_money = leveldk_money;
+				that.scoredk_money = userinfo.scoredk_money;
+				that.calculatePrice();
+				that.loaded();
+
+				if (res.needLocation == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						for (var j in freightList) {
+							if (freightList[j].pstype == 1) {
+								var storedata = freightList[j].storedata;
+
+								if (storedata) {
+									for (var x in storedata) {
+										if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+											var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+											storedata[x].juli = juli;
+										}
+									}
+									storedata.sort(function (a, b) {
+										return a["juli"] - b["juli"];
+									});
+									for (var x in storedata) {
+										if (storedata[x].juli) {
+											storedata[x].juli = storedata[x].juli + '千米';
+										}
+									}
+									freightList[j].storedata = storedata;
+								}
+							}
+						}
+						that.freightList = freightList;
+					});
+				}
+			});
+		},
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var product_price = parseFloat(that.product_price); //+商品总价
+      var leadermoney = parseFloat(that.leadermoney); //-团长优惠
+      var leveldk_money = parseFloat(that.leveldk_money); //-会员折扣
+      var coupon_money = parseFloat(that.coupon_money); //-优惠券抵扣 
+      var address = that.address; //算运费
+      var freightdata = that.freightList[that.freightkey];
+      if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+        var needaddress = 1;
+      } else {
+        var needaddress = 0;
+      }
+      that.needaddress = needaddress;
+      var freight_price = freightdata.freight_price;
+      if (that.coupontype == 4) {
+        freight_price = 0;
+        coupon_money = 0;
+      }
+      var totalprice = product_price - leadermoney - leveldk_money - coupon_money;
+      if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+      var oldtotalprice = totalprice;
+      if (that.usescore) {
+        var scoredk_money = parseFloat(that.scoredk_money); //-积分抵扣
+      } else {
+        var scoredk_money = 0;
+      }
+      totalprice = totalprice + freight_price - scoredk_money;
+      if (that.scorebdkyf == '1' && scoredk_money > 0 && totalprice < freight_price) {
+        //积分不抵扣运费
+        totalprice = freight_price;
+        scoredk_money = oldtotalprice - freight_price;
+      }
+      var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+
+      if (scoredk_money > 0 && scoredkmaxpercent > 0 && scoredkmaxpercent < 100 && scoredk_money > oldtotalprice * scoredkmaxpercent * 0.01) {
+        scoredk_money = oldtotalprice * scoredkmaxpercent * 0.01;
+        totalprice = oldtotalprice - scoredk_money;
+      }
+      if (totalprice < 0) totalprice = 0;
+      freight_price = freight_price.toFixed(2);
+      totalprice = totalprice.toFixed(2);
+      that.totalprice = totalprice
+			that.freight_price = freight_price;
+    },
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    changeFreight: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			this.freightkey = index;
+			that.calculatePrice();
+    },
+    chooseCoupon: function (e) {
+			var couponrid = e.rid;
+      var couponkey = e.key;
+
+      if (couponrid == this.couponrid) {
+        this.couponkey = 0;
+        this.couponrid = 0;
+        this.coupontype = 1;
+        this.coupon_money = 0;
+        this.couponvisible = false;
+      } else {
+        var couponList = this.couponList;
+        var coupon_money = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        if (coupontype == 4) {
+          coupon_money = this.freightprice;
+        }
+        this.couponkey = couponkey;
+        this.couponrid = couponrid;
+        this.coupontype = coupontype;
+        this.coupon_money = coupon_money;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+    },
+    choosePstime: function () {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      if (itemlist.length > 6) {
+        that.pstimeDialogShow = true;
+        that.pstimeIndex = -1;
+      } else {
+        uni.showActionSheet({
+          itemList: itemlist,
+          success: function (res) {
+						if(res.tapIndex >= 0){
+							var choosepstime = pstimeArr[res.tapIndex];
+							that.pstimetext = choosepstime.title;
+							that.freight_time = choosepstime.value;
+						}
+          }
+        });
+      }
+    },
+    pstimeRadioChange: function (e) {
+      var pstimeIndex = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var choosepstime = pstimeArr[pstimeIndex];
+      this.pstimetext = choosepstime.title;
+			this.freight_time = choosepstime.value;
+      this.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false
+    },
+    choosestore: function (e) {
+      var storekey = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey
+			var freightList = this.freightList
+			freightList[freightkey].storekey = storekey
+      this.freightList = freightList;
+    },
+    //提交并支付
+    topay: function (e) {
+      var that = this;
+      var buytype = this.buytype;
+      var freightkey = this.freightkey;
+      var freightid = this.freightList[freightkey].id;
+      var prodata = this.opt.prodata;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+      var usescore = this.usescore;
+      var couponkey = this.couponkey;
+      var couponrid = this.couponrid;
+			if(this.freightList[freightkey].pstype==1){
+				var storekey = this.freightList[freightkey].storekey
+				var storeid = this.freightList[freightkey].storedata[storekey].id;
+			}else{
+				var storeid = 0;
+			}
+      var freight_time = that.freight_time;
+
+      var needaddress = that.needaddress;
+      if (needaddress == 0) addressid = 0;
+
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+
+      if (this.freightList[freightkey].pstimeset == 1 && freight_time == '') {
+        app.error('请选择' + (this.freightList[freightkey].pstype == 0 ? '配送' : '提货') + '时间');
+        return;
+      }
+
+			var formdataSet = this.freightList[freightkey].formdata;
+      var formdata = e.detail.value;
+			var newformdata = {};
+			for (var i = 0; i < formdataSet.length;i++){
+				if (formdataSet[i].val3 == 1 && (formdata['form' + i] === '' || formdata['form' + i] === undefined || formdata['form' + i].length==0)){
+						app.alert(formdataSet[i].val1+' 必填');return;
+				}
+				if (formdataSet[i].key == 'selector') {
+						formdata['form' + i] = formdataSet[i].val2[formdata['form' + i]]
+				}
+				newformdata['form'+i] = formdata['form' + i];
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiLuckyCollage/createOrder', {
+        proid: that.opt.proid,
+        ggid: that.opt.ggid,
+        num: that.opt.num,
+        buytype: buytype,
+        teamid: that.opt.teamid,
+        storeid: storeid,
+        couponrid: couponrid,
+        freightid: freightid,
+        freight_time: freight_time,
+        addressid: addressid,
+        usescore: usescore,
+        linkman: linkman,
+        tel: tel,
+				formdata: newformdata,
+				shareid: that.opt.shareid
+      }, function (data) {
+				app.showLoading(false);
+      
+				if (data.status == 1) {
+					app.goto('/pages/pay/pay?id=' + data.payorderid);
+				}else{
+				  app.error(data.msg);
+				  return;
+				} 
+      });
+    },
+    showCouponList: function () {
+      this.couponvisible = true;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+    },
+		openMendian: function(e) {
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			console.log(storeinfo)
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		openLocation:function(e){
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			var latitude = parseFloat(storeinfo.latitude);
+			var longitude = parseFloat(storeinfo.longitude);
+			var address = storeinfo.name;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			app.chooseImage(function(data){
+				editorFormdata[idx] = data[0];
+				console.log(editorFormdata)
+				that.editorFormdata = editorFormdata
+				that.test = Math.random();
+			})
+		},
+		editorBindPickerChange:function(e){
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var val = e.detail.value;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			console.log(editorFormdata)
+			this.editorFormdata = editorFormdata
+			this.test = Math.random();
+		},
+		doStoreShowAll:function(){
+			this.storeshowall = true;
+		},
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product .img{ width:140rpx;height:140rpx}
+.collage_icon{ color:#fe7203;border:1px solid #feccaa;display:flex;align-items:center;font-size:20rpx;padding:0 6rpx;margin-left:6rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 96%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 2%;display: flex;align-items: center;z-index: 8;box-sizing:content-box}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.storeviewmore{width:100%;text-align:center;color:#889;height:40rpx;line-height:40rpx;margin-top:10rpx}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/classify.vue b/activity/luckycollage/classify.vue
new file mode 100644
index 0000000..d51a989
--- /dev/null
+++ b/activity/luckycollage/classify.vue
@@ -0,0 +1,348 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view @tap.stop="goto" :data-url="'prolist?bid='+bid" class="search-container">
+			<view class="search-box">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<view class="search-text">搜索感兴趣的商品</view>
+			</view>
+		</view>
+		<view class="content-container">
+			<view class="nav_left">
+				<view :class="'nav_left_items ' + (curIndex == -1 ? 'active' : '')" @tap="switchRightTab" data-index="-1" data-id="0"><view class="before" :style="{background:t('color1')}"></view>全部</view>
+				<block v-for="(item, index) in clist" :key="index">
+					<view :class="'nav_left_items ' + (curIndex == index ? 'active' : '')" @tap="switchRightTab" :data-index="index" :data-id="item.id"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+				</block>
+			</view>
+			<view class="nav_right">
+				<view class="nav_right-content">
+					<view class="nav-pai">
+						<view class="nav-paili" :style="(!field||field=='sort')?'color:'+t('color1'):''" @tap="changeOrder" data-field="sort" data-order="desc">综合</view> 
+						<view class="nav-paili" :style="field=='sales'?'color:'+t('color1'):''" @tap="changeOrder" data-field="sales" data-order="desc">销量</view> 
+						<view class="nav-paili" @tap="changeOrder" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+							<text :style="field=='sell_price'?'color:'+t('color1'):''">价格</text>
+							<text class="iconfont iconshangla" :style="field=='sell_price'&&order=='asc'?'color:'+t('color1'):''"></text>
+							<text class="iconfont icon-xia" :style="field=='sell_price'&&order=='desc'?'color:'+t('color1'):''"></text>
+						</view>  
+					</view>
+					<view class="classify-ul" v-if="curIndex>-1 && clist[curIndex].child.length>0">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <view class="classify-li" :style="curIndex2==-1?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeCTab" :data-id="clist[curIndex].id" data-index="-1">全部</view>
+						 <block v-for="(item, idx2) in clist[curIndex].child" :key="idx2">
+						 <view class="classify-li" :style="curIndex2==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeCTab" :data-id="item.id" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<scroll-view class="classify-box" scroll-y="true" @scrolltolower="scrolltolower">
+						<view class="product-itemlist">
+							<view class="item" v-for="(item,index) in datalist" :key="item.id" @click="goto" :data-url="''+ (item.linktype==1?'product2':'product')+'?id='+item.id">
+								<view class="flex">
+									<view class="product-pic">
+										<image class="image" :src="item.pic" mode="widthFix"/>
+									</view>
+									<view class="product-info">
+										<view class="p1"><text class="team_text">{{item.teamnum}}人拼</text><text class="name_1">{{item.name}}</text></view>
+										<view class="p2 flex">
+												<view>
+													<text class="t1" :style="{color:t('color1')}"><text style="font-size:20rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+													<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+												</view>
+												<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已拼{{item.sales}}</text></view>
+										</view>
+									</view>
+								</view>
+								
+								<view class="desc"><text>{{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text>
+								
+								<view v-if="item.linktype==1">
+										<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==1">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text>
+										<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==2">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_score}}积分</text>
+										<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==3">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_commission}}元佣金</text>
+								</view>
+								<view v-else>
+										<text v-if="item.teamnum-item.gua_num>0">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text>
+								</view>		
+								</view>
+							</view>
+						</view>
+						<nomore text="没有更多商品了" v-if="nomore"></nomore>
+						<nodata text="暂无相关商品" v-if="nodata"></nodata>
+						<view style="width:100%;height:100rpx"></view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+	</block>
+	<loading v-if="loading" loadstyle="left:62.5%"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+
+
+			pagenum: 1,
+
+			nomore: false,
+			nodata: false,
+
+			order: '',
+
+			field: '',
+
+			clist: [],
+
+			curIndex: -1,
+
+			curIndex2: -1,
+
+			datalist: [],
+
+			nodata: false,
+
+			curCid: 0,
+			proid:0,
+
+			buydialogShow: false,
+			bid:'',
+			event_rul: app.globalData.event_url,
+		};
+
+	},
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid ? this.opt.bid  : '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			var nowcid = that.opt.cid;
+			if (!nowcid) nowcid = '';
+			that.pagenum = 1;
+			that.datalist = [];
+			that.loading = true;
+			app.get('ApiLuckyCollage/classify', {cid:nowcid,bid:that.bid}, function (res) {
+				that.loading = false;
+			  var clist = res.data;
+			  that.clist = clist;
+			  if (nowcid) {
+			    for (var i = 0; i < clist.length; i++) {
+			      if (clist[i]['id'] == nowcid) {
+			        that.curIndex = i;
+			        that.curCid = nowcid;
+			      }
+			      var downcdata = clist[i]['child'];
+			      var isget = 0;
+			      for (var j = 0; j < downcdata; j++) {
+			        if (downcdata[j]['id'] == nowcid) {
+			          that.curIndex = i;
+			          that.curIndex2 = j;
+			          that.curCid = nowcid;
+			          isget = 1;
+			          break;
+			        }
+			      }
+			      if (isget) break;
+			    }
+			  }
+				that.loaded();
+				that.getdatalist();
+			});
+		},
+ 
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+
+			var that = this;
+     
+			var pagenum = that.pagenum;
+   
+			var cid = that.curCid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var order = that.order;
+    
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			var wherefield = {};
+			wherefield.pagenum = pagenum;
+			wherefield.field = field;
+			wherefield.order = order;
+			wherefield.bid = bid;
+			if(bid > 0){
+				wherefield.cid2 = cid;
+			}else{
+				wherefield.cid = cid;
+			}
+			app.post('ApiLuckyCollage/getprolist',wherefield, function (res) { 
+				that.loading = false;
+
+				uni.stopPullDownRefresh();
+
+				var data = res.data;
+				if (data.length == 0) {
+					if(pagenum == 1){
+						that.nodata = true;
+					}else{
+						that.nomore = true;
+					}
+				}
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+			});
+ 
+		},
+   
+		scrolltolower: function () {
+     
+			if (!this.nomore) {
+   
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+ 
+			}
+ 
+		},
+    
+		//改变子分类
+    
+		changeCTab: function (e) {
+    
+			var that = this;
+
+			var id = e.currentTarget.dataset.id;
+			var index = parseInt(e.currentTarget.dataset.index);
+
+			this.curIndex2 = index;
+			this.nodata = false;
+
+			this.curCid = id;
+
+			this.pagenum = 1;
+
+			this.datalist = [];
+
+			this.nomore = false;
+
+			this.getdatalist();
+
+		},
+    
+		//改变排序规则
+
+		changeOrder: function (e) {
+    
+			var t = e.currentTarget.dataset;
+  
+			this.field = t.field; 
+			this.order = t.order;
+ 
+			this.pagenum = 1;
+			this.datalist = []; 
+			this.nomore = false;
+			
+this.getdatalist();
+  
+		},
+   
+		//事件处理函数
+ 
+		switchRightTab: function (e) {
+  
+			var that = this;
+    
+			var id = e.currentTarget.dataset.id;
+   
+			var index = parseInt(e.currentTarget.dataset.index);
+  
+			this.curIndex = index;
+			this.curIndex2 = -1;
+			this.nodata = false;
+			this.curCid = id
+;
+			this.pagenum = 1; 
+			this.datalist = [];
+			this.nomore = false;
+  
+			this.getdatalist();
+ 
+		}
+,
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+	}
+
+};
+</script>
+<style>
+page {height:100%;}
+.container{width: 100%;height:100%;max-width:640px;background-color: #fff;color: #939393;display: flex;flex-direction:column}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.content-container{flex:1;height:100%;display:flex;overflow: hidden;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 0 20rpx}
+.nav_right-content{height:100%}
+.nav-pai{ width: 100%;display:flex;border-radius:10rpx; margin-bottom: 10rpx; align-items:center;justify-content:center; background: #fff;}
+.nav-paili{flex:1; text-align:center;color:#323232; font-size:28rpx;font-weight:bold;position: relative;height:80rpx;line-height:80rpx;}
+.nav-paili .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.nav-paili .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+
+.classify-ul{width:100%;height:100rpx;padding:0 10rpx;}
+.classify-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:22rpx;color:#6C737F;font-size:20rpx;text-align: center;height:44rpx; line-height:44rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+.classify-box{padding: 0 0 20rpx 0;width: 100%;height:calc(100% - 60rpx);overflow-y: scroll; border-top:1px solid #F5F6F8;}
+.classify-box .nav_right_items{ width:100%;border-bottom:1px #f4f4f4 solid;  padding:16rpx 0;  box-sizing:border-box;  position:relative; }
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;padding:20rpx 14rpx;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 160rpx;height:160rpx;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .name_1{ height: 46rpx;line-height: 46rpx;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:24rpx;line-height:35rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product-itemlist .product-info .p1 .team_text{ margin-right:10rpx;border-radius: 4rpx; color: #FF3143; background:#FFDED9 ; font-size: 20rpx; padding: 8rpx 6rpx;}
+.product-itemlist .product-info .p2{ justify-content:space-between;height:36rpx;line-height:36rpx;overflow:hidden; margin-top: 20rpx;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx; font-weight: bold;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:36rpx;line-height:36rpx;text-align:right;color:#999}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.item .desc{ display: flex; margin-top: 15rpx;background:linear-gradient(to right, #FF3143, #FF8F99); justify-content: space-between;  padding:0 10rpx; color: #fff;border-radius: 6rpx; line-height: 60rpx; font-size: 20rpx;}
+::-webkit-scrollbar{width: 0;height: 0;color: transparent;}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/comment.vue b/activity/luckycollage/comment.vue
new file mode 100644
index 0000000..5948452
--- /dev/null
+++ b/activity/luckycollage/comment.vue
@@ -0,0 +1,200 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form-content">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.propic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.proname}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul +'/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul +'/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiLuckyCollage/comment', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiLuckyCollage/comment', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/commentlist.vue b/activity/luckycollage/commentlist.vue
new file mode 100644
index 0000000..ac3bd8d
--- /dev/null
+++ b/activity/luckycollage/commentlist.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+				<text class="t3">规格：{{item.ggname}}</text>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiLuckyCollage/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/index.vue b/activity/luckycollage/index.vue
new file mode 100644
index 0000000..9168a79
--- /dev/null
+++ b/activity/luckycollage/index.vue
@@ -0,0 +1,183 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="navbg"></view>
+		<view class="nav">
+			<scroll-view scroll-x="true" :scroll-left="top_bar_scroll">
+				<view class="f1">
+					<block v-for="(item, index) in navlist" :key="index">
+					<view :class="'item ' + (selected==index?'active':'')" @tap="changetab" :data-index="index">
+							<view class="t3">{{item.seckill_date_m}}</view>
+							<view class="t1">{{item.showtime}}</view>
+							<view class="t2" v-if="item.active==-1">已结束</view>
+							<view class="t2" v-if="item.active==0">已开抢</view>
+							<view class="t2" v-if="item.active==1">拼团中</view>
+							<view class="t2" v-if="item.active==2">即将开始</view>
+					</view>
+					</block>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<image class="f1" mode="widthFix" :src="item.pic" @tap="goto" :data-url="'product2?id=' + item.id"></image>
+				<view class="f2">
+					<text class="t1">{{item.name}}</text>
+
+					<view class="t3">
+						<view class="text1">
+							<text class="x1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+							<text class="x2">￥{{item.market_price}}</text>
+						</view>
+						<button @tap="goto" :data-url="'product2?id=' + item.id" class="x3" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" v-if="item.istatus==1">立即抢购</button>
+						<button @tap="goto" :data-url="'product2?id=' + item.id" class="x3 xx1" v-else-if="item.istatus==-1">去看看</button>
+						<button @tap="goto" :data-url="'product2?id=' + item.id" class="x3" v-else :style="{background:t('color2')}">抢先看看</button>
+					</view>
+				</view>
+			</view>
+			<view class="item" style="display:block" v-if="nodata"><nodata></nodata></view>
+			<nomore v-if="nomore"></nomore>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			bid:'',
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      navlist: "",
+      activetime: "",
+      activeindex: "",
+      selected: "",
+      top_bar_scroll: "",
+			kaituan_duration: "",
+      nowtime: "",
+      nomore: false,
+			nodata:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st;
+		this.bid = this.opt.bid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getDataList(true);
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiLuckyCollage/index', {}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+				} else {
+					that.navlist = res.navlist;
+					that.activetime = res.activetime;
+					that.activeindex = res.selected;
+					that.selected = res.selected;
+					that.top_bar_scroll = (res.selected - 2) * uni.getSystemInfoSync().windowWidth / 750 * 150;
+					that.kaituan_duration = res.kaituan_duration;
+					that.nowtime = res.nowtime;
+					that.getDataList();
+				}
+				that.loaded();
+			});
+		},
+    changetab: function (e) {
+      var index = e.currentTarget.dataset.index;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.selected = index;
+      this.getDataList();
+    },
+    getDataList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var selected = that.selected;
+      var navlist = that.navlist;
+      var pagenum = that.pagenum;
+			that.nomore = false;
+			that.nodata = false;
+      app.post('ApiLuckyCollage/getprolist2', {bid:that.bid,kaituan_date: navlist[selected].kaituan_date,kaituan_time: navlist[selected].kaituan_time,pagenum: pagenum}, function (res) {
+        uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{width:100%;overflow:hidden}
+.navbg{width: 100%;position:relative}
+.navbg:after {background: linear-gradient(90deg,rgba(253, 74, 70, 1) 0%,rgba(253, 74, 70, 0.8) 100%);content: '';width: 160%;height:300rpx;position: absolute;left: -30%;top:0;border-radius: 0 0 50% 50%;z-index:1}
+.nav {width: 100%;position:relative;z-index:2}
+.nav>scroll-view {overflow: visible !important;padding-top:20rpx;padding-bottom:20rpx}
+.nav .f1 {flex-grow: 0;flex-shrink: 0;display:flex;align-items:center;color:#fff;position:relative;z-index:2}
+.nav .f1 .item{flex-grow: 0;flex-shrink: 0;width:150rpx;text-align:center;padding:16rpx 0;opacity: 0.6;}
+.nav .f1 .item .t1 {font-size:34rpx;font-weight:bold}
+.nav .f1 .item .t2 {font-size:24rpx}
+.nav .f1 .item .t3 {font-size:30rpx;}
+
+.nav .f1 .item.active {position: relative;color:#fff;opacity:1}
+
+.content{width:94%;margin-left:3%;position:relative;z-index:3}
+.data-empty{background:#fff;border-radius:16rpx}
+.content .item{width:100%;display:flex;padding: 20rpx;background:#fff;border-radius:16rpx;margin-bottom:20rpx}
+.item .f1{width:200rpx;height:200rpx;margin-right:20rpx;}
+.item .f2{position: relative; padding-right: 20rpx;flex:1;display:flex;flex-direction:column}
+.item .f2 .t1{font-size:28rpx;font-weight:bold;color: #222;margin-top: 2px;height:80rpx;overflow:hidden}
+.item .f2 .t2{width:100%;margin-top:12rpx;display:flex;align-items:center}
+.item .f2 .t2 .x2{padding-left:16rpx;font-size:24rpx;font-weight:bold}
+.item .f2 .t3{width:100%;margin-top:20rpx;display:flex;align-items:flex-end}
+.item .f2 .t3 .x1{font-size:32rpx;font-weight:bold}
+.item .f2 .t3 .x2{color:#999999;font-size:24rpx;text-decoration:line-through;padding-left:8rpx}
+.item .f2 .t3 .x3{position:absolute;bottom:0;right:0;border: 0;color: #fff;font-size:28rpx;padding:0 28rpx;height:54rpx;line-height:50rpx;border-radius:54rpx;margin:0}
+.item .f2 .t3 .x3.xx1{background:#888}
+.item .f2 .t3 .text1{margin-top: 40rpx;}
+.progress{width:240rpx;font-size:24rpx}
+.nomore-footer-tips{background:#fff!important}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/orderdetail.vue b/activity/luckycollage/orderdetail.vue
new file mode 100644
index 0000000..1ea79d4
--- /dev/null
+++ b/activity/luckycollage/orderdetail.vue
@@ -0,0 +1,340 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择货到付款' : '已成功付款'}}</view>
+
+				<block v-if="detail.buytype!=1">
+					<view class="t2" v-if="team.status==1">拼团中</view>
+					<view class="t2" v-if="team.status==2 && detail.freight_type!=1">拼团成功,我们会尽快为您发货</view>
+					<view class="t2" v-if="team.status==2 && detail.freight_type==1">拼团成功,请尽快前往自提地点取货</view>
+					<view class="t2" v-if="team.status==3">拼团失败,已退款</view>
+				</block>
+				<block v-else>
+					<view class="t2" v-if="detail.freight_type!=1">我们会尽快为您发货</view>
+					<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+				</block>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<text class="t2" user-select="true" selectable="true">发货信息：{{detail.express_com}} {{detail.express_no}}</text>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openMendian" :data-storeinfo="storeinfo" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==0 && shopset.comment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.leveldk_money > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.coupon_money > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk_money > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<block v-if="detail.status==1">
+					<block v-if="detail.buytype!=1">
+						<text v-if="team.status==1" class="t2">拼团中</text>
+						<text v-if="team.status==2 && detail.freight_type!=1" class="t2">拼团成功,待发货</text>
+						<text v-if="team.status==2 && detail.freight_type==1" class="t2">拼团成功,待提货</text>
+						<text v-if="team.status==3" class="t2">拼团失败,已退款</text>
+					</block>
+					<block v-else>
+						<text v-if="detail.freight_type!=1" class="t2">待发货</text>
+						<text v-if="detail.freight_type==1" class="t2">待提货</text>
+					</block>
+				</block>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.money>0">
+				<text class="t1">未中奖红包</text>
+				<text class="t2 red" >￥{{detail.money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot" v-if="detail.status!=3">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+
+			
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">查看物流</view>
+			</block>
+			
+			<block v-if="([1,2,3]).includes(detail.status) && invoice && team.status==2">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=lucky_collage&orderid=' + detail.id">发票</view>
+			</block>
+			<block v-if="(detail.buytype==1 || team.status==2) && (detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3">
+				<view class="btn2">已完成</view>
+			</block>
+			<block v-if="detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul + '/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		textset:{},
+		detail:{},
+		team:{},
+		storeinfo:{},
+		shopset:{},
+		invoice:0,
+		event_rul: app.globalData.event_url,
+    }
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function (option) {
+			var that = this;
+			that.loading = true;
+			app.get('ApiLuckyCollage/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.shopset = res.shopset;
+				that.textset = app.globalData.textset;
+				that.invoice = res.invoice;
+				that.loaded();
+			});
+		},
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiLuckyCollage/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiLuckyCollage/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiLuckyCollage/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height:80rpx;line-height:40rpx;color: #000;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;background:#FB4343;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/orderlist.vue b/activity/luckycollage/orderlist.vue
new file mode 100644
index 0000000..2241ba5
--- /dev/null
+++ b/activity/luckycollage/orderlist.vue
@@ -0,0 +1,233 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+			<view class="order-box" @tap.stop="goto" :data-url="'orderdetail?id=' + item.id">
+				<view class="head">
+					<text class="flex1">订单号：{{item.ordernum}}</text>
+					<text v-if="item.status==0" class="st0">待付款</text>
+					<block v-if="item.status==1">
+						<block v-if="item.buytype!=1">
+							<text v-if="item.team.status==1" class="st1">拼团中</text>
+							<text v-if="item.team.status==2 && item.freight_type!=1" class="st1">拼团成功,待发货</text>
+							<text v-if="item.team.status==2 && item.freight_type==1" class="st1">拼团成功,待提货</text>
+							<text v-if="item.team.status==3" class="st4">拼团失败,已退款</text>
+						</block>
+						<block v-else>
+							<text v-if="item.freight_type!=1" class="st1">待发货</text>
+							<text v-if="item.freight_type==1" class="st1">待提货</text>
+						</block>
+					</block>
+
+					<text v-if="item.status==2" class="st2">待收货</text>
+					<text v-if="item.status==3" class="st3">已完成</text>
+					<text v-if="item.status==4" class="st4">已关闭</text>
+				</view>
+
+				<view class="content" style="border-bottom:none">
+					<view @tap.stop="goto" :data-url="'product?id=' + item.proid">
+						<image :src="item.propic"></image>
+					</view>
+					<view class="detail">
+						<text class="t1">{{item.proname}}</text>
+						<text class="t2">{{item.ggname}}</text>
+						<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+					</view>
+				</view>
+				<view class="bottom">
+					<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+					<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+				</view>
+				<view class="op">
+					<block v-if="([1,2,3]).includes(item.status) && item.invoice && item.team.status==2">
+						<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=lucky_collage&orderid=' + item.id">发票</view>
+					</block>
+					<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+					<view @tap.stop="goto" :data-url="'team?teamid=' + item.teamid" class="btn2" v-if="item.buytype!=1">查看团</view>
+					<block v-if="item.status==0">
+						<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+					</block>
+				
+					<block v-if="item.status==2">
+
+						<view class="btn2" @tap.stop="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">查看物流</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id">确认收货</view>
+					</block>
+					<block v-if="item.status==4">
+						<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+					</block>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      nodata: false
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiLuckyCollage/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiLuckyCollage/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiLuckyCollage/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiLuckyCollage/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.order-tab{position:fixed;top:var(--window-top);z-index:11;display:flex;width:100%; height:90rpx;border-bottom: 1px #f4f4f4 solid;background: #fff; margin-bottom: 10rpx;}
+.order-tab .item{flex:1;font-size:28rpx; text-align: center; color:#666; height: 90rpx; line-height: 90rpx; overflow: hidden;position:relative}
+.order-tab .on{color: #323233;}
+.order-tab .on:after{content:'';position:absolute;left:50%;margin-left:-40rpx;bottom:0;height:3px;border-radius:1.5px;background:#ff4a03;width:80rpx}
+
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 204rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 204rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;flex-wrap: wrap;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+/*.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px; font-size: 14px; position: absolute; bottom: 10px; right: 10px; background: #fff; }*/
+.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px;}
+
+.zan-tex{clear:both; display: block; width: 100%; color: #565656; font-size: 12px; height: 30px; line-height: 30px; text-align: center;  }
+.ind-bot{ width: 100%; float: left; text-align: center; height: 50px; line-height: 50px; font-size: 13px; color: #ccc; background:#F2F2F2}
+
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/product.vue b/activity/luckycollage/product.vue
new file mode 100644
index 0000000..c3904e9
--- /dev/null
+++ b/activity/luckycollage/product.vue
@@ -0,0 +1,653 @@
+<template>
+<view>
+	<block v-if="isload">
+	<view class="container">
+		<view class="containerbox">
+			<view class="swiper-container">
+				<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+					<block v-for="(item, index) in product.pics" :key="index">
+						<swiper-item class="swiper-item">
+							<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="imageCount">{{current+1}}/{{product.pics.length}}</view>
+			</view>
+			
+			<view class="collage_title">
+				<view class="f1">
+					<view class="t1">
+						<view class="x1">￥</view>
+						<view class="x2">{{product.sell_price}}</view>
+						<view class="t2">￥{{product.market_price}}</view>
+						<view class="x3">{{product.teamnum}}人拼</view>
+					</view>
+		
+				</view>
+				<view class="f2">已拼{{product.sales}}件</view>
+			</view>
+		</view>
+		<view class="header"> 
+			<view class="title">
+				<view class="lef">
+					<text>{{product.name}}</text>
+				</view>
+				<view class="share" @tap="shareClick">
+					<image :src="event_rul +'/static/img/static/img/share.png'"></image>
+					<text>分享</text>
+				</view>
+			</view>
+			<view class="title2 flex">
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_1.png'"></image><view class="t1">参与拼团</view><view class="t1"><text class="t1_1">{{product.teamnum}}</text>人成团</view></view>
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_2.png'"></image><view class="t1"><text class="t1_1">{{product.gua_num}}</text>人拼中发货</view><view class="t1"><text class="t1_1">{{product.teamnum-product.gua_num}}</text>人未中退款</view></view>
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_3.png'"></image><view class="t1">未中补贴</view><view class="t1"><text class="t1_1">{{product.fy_money_val}}</text>元参与奖</view></view>
+			</view>
+			
+			
+		</view>
+		<view class="teamlist" v-if="teamCount > 0">
+			<view class="label"><view class="after" :style="{background:t('color1')}"></view>{{teamCount}}人在拼单，可直接参与</view>
+			<scroll-view :scroll-y="true" class="content">
+				<view v-for="(item, index) in teamList" :key="index" class="item">
+					<view class="f1">
+						<image :src="item.headimg"></image>		
+						<image :src="event_rul +'/static/img/static/img/wh.png'" class="img1"></image>		
+					</view>
+					<view class="f2">
+						<view class="t1">还差{{item.teamnum - item.num}}人拼成</view>
+						<view class="t2">剩余{{item.djs}}</view>
+					</view>
+					<button class="f3" @tap="buydialogShow" data-btntype="3" :data-teamid="item.id">去参团</button>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="commentbox" v-if="shopset.comment==1 && commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评度 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul +'/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul + '/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"/></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		<view class="shop" v-if="shopset.showjd==1">
+			<image :src="business.logo" class="p1"/>
+			<view class="p2 flex1">
+				<view class="t1">{{business.name}}</view>
+				<view class="t2">{{business.desc}}</view>
+			</view>
+			<button class="p4" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" :data-url="product.bid==0?'/pages/index/index':'/pages/business/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+		</view>
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+		
+
+		<view style="width:100%;height:70px;"></view>
+
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':'notabbarbot'" v-if="product.status==1">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="'prolist?bid='+product.bid">
+					<image class="img" :src="event_rul +'/static/img/static/img/shou.png'"/>
+					<view class="t1">首页</view>
+				</view>
+				<view class="item  " @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+				<view class="item" @tap="addfavorite">
+					<image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'"/>
+					<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+				</view>
+			</view>
+			<view class="op">
+				<view class="tocart" :style="{background:t('color2')}" @tap="buydialogShow" data-btntype="1"><text>￥{{product.market_price}}</text><text>单独购买</text></view>
+				<view class="tobuy" :style="{background:t('color1')}" @tap="buydialogShow" data-btntype="2"><text>￥{{product.sell_price}}</text><text>发起拼团</text></view>
+			</view>
+		</view>
+
+
+		<view :hidden="buydialogHidden">
+			<view class="buydialog-mask">
+				<view class="buydialog" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<view class="close" @tap="buydialogChange">
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="image"></image>
+					</view>
+					<view class="title">
+						<image :src="guigelist[ks].pic?guigelist[ks].pic:product.pic" class="img" @tap="previewImage" :data-url="guigelist[ks].pic?guigelist[ks].pic:product.pic"></image>
+						<!-- <text class="name">{{product.name}}</text> -->
+						<view class="price" v-if="btntype==1"><text class="t1">￥</text>{{guigelist[ks].market_price}}</view>
+						<view class="price" v-else><text class="t1">￥</text>{{guigelist[ks].sell_price}} <text v-if="guigelist[ks].market_price > guigelist[ks].sell_price" class="t2">￥{{guigelist[ks].market_price}}</text></view>
+						<view class="choosename">已选规格: {{guigelist[ks].name}}</view>
+						<view class="stock">剩余{{guigelist[ks].stock}}件</view>
+					</view>
+
+					<view v-for="(item, index) in guigedata" :key="index" class="guigelist flex-col">
+						<view class="name">{{item.title}}</view>
+						<view class="item flex flex-y-center">
+							<block v-for="(item2, index2) in item.items" :key="index2">
+								<view :data-itemk="item.k" :data-idx="item2.k" :class="'item2 ' + (ggselected[item.k]==item2.k ? 'on':'')" @tap="ggchange">{{item2.title}}</view>
+							</block>
+						</view>
+					</view>
+					<view class="buynum flex flex-y-center">
+						<view class="flex1">购买数量：</view>
+						<view class="addnum">
+							<view class="minus"><image class="img" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="gwcminus"/></view>
+							<input class="input" type="number" :value="gwcnum" @input="gwcinput"></input>
+							<view class="plus"><image class="img" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="gwcplus"/></view>
+						</view>
+					</view>
+					<view class="op">
+						<block v-if="btntype==1">
+							<button class="tobuy" :style="{background:t('color2')}" @tap="tobuy" data-type="1">确定</button>
+						</block>
+						<block v-if="btntype==2">
+							<button class="tobuy" :style="{background:t('color1')}" @tap="tobuy" data-type="2">下一步</button>
+						</block>
+						<block v-if="btntype==3">
+							<button class="tobuy" :style="{background:t('color1')}" @tap="tobuy" data-type="3">确 定</button>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<view v-if="sharetypevisible" class="popup__container">
+		<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+		<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+			<!-- <view class="popup__title">
+				<text class="popup__title-text">请选择分享方式</text>
+				<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+			</view> -->
+			<view class="popup__content">
+				<view class="sharetypecontent">
+					<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<button class="f1" open-type="share" v-else>
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</button>
+					<view class="f2" @tap="showPoster">
+						<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+						<text class="t1">生成分享图片</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="posterDialog" v-if="showposter">
+		<view class="main">
+			<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+			<view class="content">
+				<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+			</view>
+		</view>
+	</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		indexurl:app.globalData.indexurl,
+		tabnum: 1,
+		buydialogHidden: true,
+		num: 1,
+		teamCount:0,
+		sysset:{},
+		shopset:{},
+		isfavorite: false,
+		btntype: 1,
+		ggselected: [],
+		guigedata:[],
+		guigelist:[],
+		ks: '',
+		gwcnum: 1,
+		nodata: 0,
+		product:{},
+		userinfo: [],
+		current: 0,
+		pagecontent: "",
+		business:{},
+		commentcount:0,
+		commentlist:[],
+		nowtime: "",
+		teamList: [],
+		teamid: "",
+		sharetypevisible: false,
+		showposter: false,
+		posterpic: "",
+		kfurl:'',
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiLuckyCollage/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var pagecontent = JSON.parse(res.product.detail);
+				that.pagecontent = pagecontent;
+				that.business = res.business;
+				that.commentcount = res.commentcount;
+				that.commentlist = res.commentlist;
+				that.ggselected = res.ggselected;
+				that.guigedata = res.guigedata;
+				that.guigelist = res.guigelist;
+				that.isfavorite = res.isfavorite;
+				that.ks = res.ks;
+				that.nowtime = res.nowtime;
+				that.product = res.product;
+				that.shopset = res.shopset;
+				that.sysset = res.sysset;
+				that.teamCount = res.teamCount;
+				that.teamList = res.teamList;
+				setInterval(function () {
+					that.nowtime = that.nowtime + 1;
+					that.getdjs();
+				}, 1000);
+				uni.setNavigationBarTitle({
+					title: res.product.name
+				});
+				that.kfurl = '/pages/kefu/index?bid='+res.product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:res.product.name,pic:res.product.pic});
+			});
+		},
+    swiperChange: function (e) {
+      var that = this;
+      that.current = e.detail.current;
+    },
+    getdjs: function () {
+      var that = this;
+      var nowtime = that.nowtime;
+      for (var i in that.teamList) {
+        var thisteam = that.teamList[i];
+        var totalsec = thisteam.createtime * 1 + thisteam.teamhour * 3600 - nowtime * 1;
+        if (totalsec <= 0) {
+          that.teamList[i].djs = '00时00分00秒';
+        } else {
+          var houer = Math.floor(totalsec / 3600);
+          var min = Math.floor((totalsec - houer * 3600) / 60);
+          var sec = totalsec - houer * 3600 - min * 60;
+          var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        }
+				that.teamList[i].djs = djs;
+      }
+    },
+    //加入购物车
+    buydialogShow: function (e) {
+      var btntype = e.currentTarget.dataset.btntype;
+      if (btntype == 3) {
+        this.teamid = e.currentTarget.dataset.teamid
+      }
+      this.btntype = btntype;
+      this.buydialogHidden = !this.buydialogHidden;
+    },
+    buydialogChange: function (e) {
+      this.buydialogHidden = !this.buydialogHidden;
+    },
+    //选择规格
+    ggchange: function (e) {
+      var idx = e.currentTarget.dataset.idx;
+      var itemk = e.currentTarget.dataset.itemk;
+      var ggselected = this.ggselected;
+      ggselected[itemk] = idx;
+      var ks = ggselected.join(',');
+      this.ggselected = ggselected;
+      this.ks = ks;
+    },
+    tobuy: function (e) {
+      var type = e.currentTarget.dataset.type;
+      var that = this;
+      var ks = that.ks;
+      var proid = that.product.id;
+      var ggid = that.guigelist[ks].id;
+      var num = that.gwcnum;
+			var shareid = that.opt.pid;
+      app.goto('buy?proid=' + proid + '&ggid=' + ggid + '&num=' + num + '&shareid='+shareid+'&buytype=' + type + (type == 3 ? '&teamid=' + that.teamid : ''));
+    },
+    //加
+    gwcplus: function (e) {
+      var gwcnum = this.gwcnum + 1;
+      var ggselected = this.ks;
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        app.error('库存不足');
+        return;
+      }
+      this.gwcnum = this.gwcnum + 1
+    },
+    //减
+    gwcminus: function (e) {
+      var gwcnum = this.gwcnum - 1;
+      var ggselected = this.ks;
+      if (gwcnum <= 0) {
+        return;
+      }
+      this.gwcnum = this.gwcnum - 1
+    },
+    //输入
+    gwcinput: function (e) {
+      var ggselected = this.ks;
+      var gwcnum = parseInt(e.detail.value);
+      if (gwcnum < 1) return 1;
+
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        return this.guigelist[ggselected].stock;
+      }
+      this.gwcnum = gwcnum;
+    },
+    //收藏操作
+    addfavorite: function () {
+      var that = this;
+      var proid = that.product.id;
+			app.showLoading('收藏中');
+      app.post('ApiLuckyCollage/addfavorite', {proid: proid,type: 'luckycollage'}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          that.isfavorite = !that.isfavorite
+        }
+        app.success(data.msg);
+      });
+    },
+    tabClick: function (e) {
+      this.tabnum = e.currentTarget.dataset.num;
+    },
+    shareClick: function () {
+      this.sharetypevisible = true;
+    },
+    handleClickMask: function () {
+      this.sharetypevisible = false;
+    },
+    showPoster: function () {
+      var that = this;
+      that.showposter = true;
+      that.sharetypevisible = false;
+      app.showLoading('努力生成中');
+			app.post('ApiLuckyCollage/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.alert(data.msg);
+        } else {
+          that.posterpic = data.poster;
+        }
+      });
+    },
+    posterDialogClose: function () {
+      this.showposter = false;;
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/luckycollage/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/luckycollage/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+	}
+}
+</script>
+<style>
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+.containerbox{ position: relative;}
+
+.header {width: 95%;padding: 0 3%;background: #fff; margin:0 20rpx;border-radius: 0px 0px 16rpx 16rpx;}
+.header .title {padding: 10px 0px;line-height:44rpx;font-size:32rpx;display:flex;}
+.header .title .lef{display:flex;flex-direction:column;justify-content: center;flex:1;color:#222222;font-weight:bold}
+.header .title .lef .t2{ font-size:26rpx;color:#999;padding-top:10rpx;font-weight:normal}
+.header .title .share{width:88rpx;height:88rpx;padding-left:20rpx;border-left:0 solid #f5f5f5;text-align:center;font-size:24rpx;color:#222;display:flex;flex-direction:column;align-items:center}
+.header .title .share image{width:32rpx;height:32rpx;margin-bottom:4rpx}
+
+.header .price{height: 86rpx;overflow: hidden;line-height: 86rpx;border-top: 1px solid #eee;}
+.header .price .t1 .x1{ color: #e94745; font-size: 34rpx;}
+.header .price .t1 .x2{ color: #939393; margin-left: 10rpx; text-decoration: line-through;font-size:24rpx}
+.header .price .t2{color: #aaa; font-size: 24rpx;}
+.header .fuwupoint{width:100%;font-size:24rpx;color:#999;display:flex;flex-wrap:wrap;border-top:1px solid #eee;padding:10rpx 0}
+.header .fuwupoint .t{ padding:4rpx 20rpx 4rpx 0}
+.header .fuwupoint .t:before{content: "";	display: inline-block;	vertical-align: middle;	margin-top: -4rpx;	margin-right: 10rpx;	width: 24rpx;	height: 24rpx;	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;	background-size: 24rpx auto; }
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 80rpx; line-height: 80rpx; padding: 0 3%; color: #505050; }
+.choose .f2{ width: 40rpx; height: 40rpx;}
+
+.teamlist{ width:95%;margin:0 20rpx;border-radius: 16rpx;   background:#fff;padding:10rpx 20rpx;font-size:26rpx;margin-top:20rpx;display:flex;flex-direction:column}
+.teamlist .label{ padding-left: 30rpx; height: 100rpx; position: relative; width:100%;color:#222222;font-weight:bold; line-height: 80rpx;}
+.teamlist .label .after{display:block;position:absolute;border-right:10rpx solid red;top:20rpx;left:10rpx;height:36rpx; border-radius:1.5px;}
+.teamlist .content{ width:100%;max-height:300rpx;overflow:scroll}
+.teamlist .item{width:100%;display:flex;align-items:center;padding:12rpx 3px;border-bottom:0px solid #f5f5f5}
+.teamlist .item .f1{overflow:hidden;display:flex;align-items:center}
+.teamlist .item .f1 image{width:80rpx;height:80rpx; border-radius: 50%;}
+.teamlist .item .f1 .img1{ position: absolute;left:10%; background: #D9D9D9; }
+.teamlist .item .f1 .t1{padding-left:6rpx;font-size:30rpx;color:#333}
+.teamlist .item .f2{ margin:0 8rpx; width: 160px; margin-left: 50px;}
+.teamlist .item .f2 .t1{font-size:24rpx;color:#333}
+.teamlist .item .f2 .t2{font-size:22rpx;color:#999}
+.teamlist .item .f3{ background: linear-gradient(90deg, #FF3143 0%, #FE6748 100%);color:#fff;border-radius:26rpx;padding:0 20rpx;height:50rpx;border:0;text-align:right;font-size:26rpx;display:flex;align-items:center}
+.teamlist .item .f3:after{border:0}
+
+
+.shop{width:95%;margin:0 20rpx;display:flex;align-items:center; border-radius: 16rpx; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 136rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:50%;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:100%;background:#fff;padding:0 3%;margin-top:20rpx}
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{ width: 96%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:120rpx;padding:0 2% 0 2%;align-items:center;box-sizing:content-box}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:10rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:90rpx;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tocart{ width:50%; height: 100rpx;color: #fff; border-radius: 88rpx 0px 0px 88rpx;background: #fa938a; font-size: 28rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.bottombar .tobuy{ width:50%; height: 100rpx;color: #fff; border-radius: 0px 88rpx 88rpx 0px;background: #df2e24; font-size:28rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+
+
+.buydialog-mask{ position: fixed; top: 0px; left: 0px; width: 100%; background: rgba(0,0,0,0.5); bottom: 0px;z-index:10}
+.buydialog{ position: fixed; width: 100%; left: 0px; bottom: 0px; background: #fff;z-index:11;border-radius:20rpx 20rpx 0px 0px}
+.buydialog .close{ position: absolute; top: 0; right: 0;padding:20rpx;z-index:12}
+.buydialog .close .image{ width: 30rpx; height:30rpx; }
+.buydialog .title{ width: 94%;position: relative; margin: 0 3%; padding:20rpx 0px; border-bottom:0; height: 190rpx;}
+.buydialog .title .img{ width: 160rpx; height: 160rpx; position: absolute; top: 20rpx; border-radius: 10rpx; border: 0 #e5e5e5 solid;background-color: #fff}
+.buydialog .title .price{ padding-left:180rpx;width:100%;font-size: 36rpx;height:70rpx; color: #FC4343;overflow: hidden;}
+.buydialog .title .price .t1{ font-size:26rpx}
+.buydialog .title .price .t2{ font-size:26rpx;text-decoration:line-through;color:#aaa}
+.buydialog .title .choosename{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+.buydialog .title .stock{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+
+.buydialog .guigelist{ width: 94%; position: relative; margin: 0 3%; padding:0px 0px 10px 0px; border-bottom: 0; }
+.buydialog .guigelist .name{ height:70rpx; line-height: 70rpx;}
+.buydialog .guigelist .item{ font-size: 30rpx;color: #333;flex-wrap:wrap}
+.buydialog .guigelist .item2{ height:60rpx;line-height:60rpx;margin-bottom:4px;border:0; border-radius:4rpx; padding:0 40rpx;color:#666666; margin-right: 10rpx; font-size:26rpx;background:#F4F4F4}
+.buydialog .guigelist .on{color:#FC4343;background:rgba(252,67,67,0.1);font-weight:bold}
+.buydialog .buynum{ width: 94%; position: relative; margin: 0 3%; padding:10px 0px 10px 0px; }
+.buydialog .addnum {font-size: 30rpx;color: #666;width:auto;display:flex;align-items:center}
+.buydialog .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .img{width:24rpx;height:24rpx}
+.buydialog .addnum .input{flex:1;width:70rpx;border:0;text-align:center;color:#2B2B2B;font-size:24rpx}
+.buydialog .op{width:90%;margin:20rpx 5%;border-radius:36rpx;overflow:hidden;display:flex;margin-top:100rpx;}
+.buydialog .addcart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none; font-size:28rpx;font-weight:bold}
+.buydialog .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;}
+.buydialog .nostock{flex:1;height: 72rpx; line-height: 72rpx; background:#aaa; color: #fff; border-radius: 0px; border: none;}
+
+.collage_title{width:95%;height:110rpx; position: absolute; bottom: 0; background-image: url('https://v2d.diandashop.com/static/img/xypt_bg.png'); background-size: 100%; display:flex;align-items:center;padding:0 40rpx; margin:0 20rpx;}
+.collage_title .f1{flex:1;display:flex;flex-direction:column;}
+.collage_title .f1 .t1{display:flex;align-items:center;height:60rpx;line-height:60rpx; margin-top: 20rpx;}
+.collage_title .f1 .t1 .x1{font-size:28rpx;color:#fff}
+.collage_title .f1 .t1 .x2{font-size:48rpx;color:#fff;padding-right:20rpx}
+.collage_title .f1 .t1 .x3{margin-left: 60rpx;font-size:24rpx;font-weight:bold;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:20rpx;background:#fff;color:#ED533A}
+.collage_title .f1 .t2{color:rgba(255,255,255,0.6);font-size:20rpx;text-decoration: line-through;margin-top: 10rpx;}
+.collage_title .f2{color:#fff;font-size:28rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+
+.title2{ align-items: center; padding-bottom: 20rpx;}
+.title2 .p1{ font-size: 20rpx;border-bottom-right-radius:40rpx; margin: auto; width: 30%;padding:30rpx 0; text-align: center; border: 1rpx solid #FF3143; border: 1px solid rgba(255, 49, 67, 0.2); margin-right: 10rpx;}
+.title2 .t1{ line-height: 40rpx;}
+.title2 .t1 .t1_1{ color:#FF3143}
+.title2 image{ width: 80rpx; height: 80rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/product2.vue b/activity/luckycollage/product2.vue
new file mode 100644
index 0000000..f629eb2
--- /dev/null
+++ b/activity/luckycollage/product2.vue
@@ -0,0 +1,718 @@
+<template>
+<view>
+	<block v-if="isload">
+	<view class="container">
+		<view class="containerbox">
+			<view class="swiper-container">
+				<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+					<block v-for="(item, index) in product.pics" :key="index">
+						<swiper-item class="swiper-item">
+							<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="imageCount">{{current+1}}/{{product.pics.length}}</view>
+			</view>
+			
+			<view class="collage_title">
+				<view class="f1">
+					<view class="t1">
+						<view class="x1">￥</view>
+						<view class="x2">{{product.sell_price}}</view>
+						<view class="t2">￥{{product.market_price}}</view>
+						<view class="x3">{{product.teamnum}}人团</view>
+					</view>
+		
+				</view>
+						<view  v-if="product.isktdate==1">
+							<view class="f2" v-if="kaituan_status==0 || kaituan_status==1">
+									<view class="t1">距{{kaituan_status==0?'开始':'结束'}}还剩</view>
+									<view class="t2" id="djstime"><text class="djsspan">{{djshour}}</text> : <text class="djsspan">{{djsmin}}</text> : <text class="djsspan">{{djssec}}</text></view>	
+							</view>
+							<view class="f2" v-if="kaituan_status==2">
+								<view class="t1">今日已结束</view>
+							</view>
+						</view>
+						<view v-else>
+								<view class="f2">已团{{product.sales}}件</view>
+						</view>
+			</view>
+		</view>
+		<view class="header"> 
+			<view class="title">
+				<view class="lef">
+					<text>{{product.name}}</text>
+				</view>
+				<view class="share" @tap="shareClick">
+					<image :src="event_rul +'/static/img/static/img/share.png'"></image>
+					<text>分享</text>
+				</view>
+			</view>
+			<view class="title2 flex">
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_1.png'"></image><view class="t1">参与拼团</view><view class="t1"><text class="t1_1">{{product.teamnum}}</text>人成团</view></view>
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_2.png'"></image><view class="t1"><text class="t1_1">{{product.gua_num}}</text>人拼中发货</view><view class="t1"><text class="t1_1">{{product.teamnum-product.gua_num}}</text>人未中退款</view></view>
+				<view class="p1">
+					<image :src="event_rul +'/static/img/static/img/pintuan_3.png'"></image><view class="t1">未中补贴</view>
+					<view class="t1" v-if="product.bzjl_type==1"><text class="t1_1">{{product.fy_money_val}}</text>元参与奖</view>
+					<view class="t1" v-if="product.bzjl_type==2"><text class="t1_1">{{product.bzj_score}}</text>积分</view>
+					<view class="t1" v-if="product.bzjl_type==3"><text class="t1_1">{{product.bzj_commission}}</text>元佣金</view>
+					<view class="t1" v-if="product.bzjl_type==4"><text class="t1_1"></text>优惠券</view>
+								
+				</view>
+			</view>
+			
+			
+		</view>
+		<view class="teamlist" v-if="teamCount > 0">
+			<view class="label"><view class="after" :style="{background:t('color1')}"></view>{{teamCount}}人在拼单，可直接参与</view>
+			<scroll-view :scroll-y="true" class="content">
+				<view v-for="(item, index) in teamList" :key="index" class="item">
+					<view class="f1">
+						<image :src="item.headimg"></image>		
+						<image :src="event_rul +'/static/img/static/img/wh.png'" class="img1"></image>		
+					</view>
+					<view class="f2">
+						<view class="t1">还差{{item.teamnum - item.num}}人拼成</view>
+						<view class="t2">剩余{{item.djs}}</view>
+					</view>
+					<button class="f3" @tap="buydialogShow" data-btntype="3" :data-teamid="item.id">去参团</button>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="commentbox" v-if="shopset.comment==1 && commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评度 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul +'/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"/></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		<view class="shop" v-if="shopset.showjd==1">
+			<image :src="business.logo" class="p1"/>
+			<view class="p2 flex1">
+				<view class="t1">{{business.name}}</view>
+				<view class="t2">{{business.desc}}</view>
+			</view>
+			<button class="p4" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" :data-url="product.bid==0?'/pages/index/index':'/pages/business/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+		</view>
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+		
+
+		<view style="width:100%;height:70px;"></view>
+
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':'notabbarbot'" v-if="product.status==1">
+			<view class="item" @tap="goto" :data-url="'prolist?bid='+product.bid">
+				<image class="img" :src="event_rul +'/static/img/static/img/shou.png'"/>
+				<view class="t1">首页</view>
+			</view>
+			<view class="item  " @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+				<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+				<view class="t1">客服</view>
+			</view>
+			<button class="item" v-else open-type="contact">
+				<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+				<view class="t1">客服</view>
+			</button>
+			<view class="item" @tap="addfavorite">
+				<image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'"/>
+				<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+			</view>
+			<view class="tocart" :style="{background:t('color2')}" @tap="buydialogShow" data-btntype="1"><text>￥{{product.market_price}}</text><text>单独购买</text></view>
+					<view class="tobuy" :style="{background:t('color1')}" @tap="buydialogShow" data-btntype="2"  v-if="kaituan_status==1 && product.isktdate==1"><text>￥{{product.sell_price}}</text><text>发起拼团</text></view>
+					<view class="tobuy flex-x-center flex-y-center" style="background:#ccc" v-else-if="kaituan_status!=1 && product.isktdate==1">发起拼团</view>
+				<view  v-else class="tobuy" :style="{background:t('color1')}" @tap="buydialogShow" data-btntype="2"><text>￥{{product.sell_price}}</text><text>发起拼团</text></view>
+		</view>
+		<view :hidden="buydialogHidden">
+			<view class="buydialog-mask">
+				<view class="buydialog" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<view class="close" @tap="buydialogChange">
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="image"></image>
+					</view>
+					<view class="title">
+						<image :src="guigelist[ks].pic?guigelist[ks].pic:product.pic" class="img" @tap="previewImage" :data-url="guigelist[ks].pic?guigelist[ks].pic:product.pic"></image>
+						<!-- <text class="name">{{product.name}}</text> -->
+						<view class="price" v-if="btntype==1"><text class="t1">￥</text>{{guigelist[ks].market_price}}</view>
+						<view class="price" v-else><text class="t1">￥</text>{{guigelist[ks].sell_price}} <text v-if="guigelist[ks].market_price > guigelist[ks].sell_price" class="t2">￥{{guigelist[ks].market_price}}</text></view>
+						<view class="choosename">已选规格: {{guigelist[ks].name}}</view>
+						<view class="stock">剩余{{guigelist[ks].stock}}件</view>
+					</view>
+
+					<view v-for="(item, index) in guigedata" :key="index" class="guigelist flex-col">
+						<view class="name">{{item.title}}</view>
+						<view class="item flex flex-y-center">
+							<block v-for="(item2, index2) in item.items" :key="index2">
+								<view :data-itemk="item.k" :data-idx="item2.k" :class="'item2 ' + (ggselected[item.k]==item2.k ? 'on':'')" @tap="ggchange">{{item2.title}}</view>
+							</block>
+						</view>
+					</view>
+					<view class="buynum flex flex-y-center">
+						<view class="flex1">购买数量：</view>
+						<view class="addnum">
+							<view class="minus"><image class="img" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="gwcminus"/></view>
+							<input class="input" type="number" :value="gwcnum" @input="gwcinput" max="1"></input>
+							<view class="plus"><image class="img" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="gwcplus"/></view>
+						</view>
+					</view>
+					<view class="op">
+						<block v-if="btntype==1">
+							<button class="tobuy" :style="{background:t('color2')}" @tap="tobuy" data-type="1">确定</button>
+						</block>
+						<block v-if="btntype==2">
+							<button class="tobuy" :style="{background:t('color1')}" @tap="tobuy" data-type="2">下一步</button>
+						</block>
+						<block v-if="btntype==3">
+							<button class="tobuy" :style="{background:t('color1')}" @tap="tobuy" data-type="3">确 定</button>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<view v-if="sharetypevisible" class="popup__container">
+		<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+		<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+			<!-- <view class="popup__title">
+				<text class="popup__title-text">请选择分享方式</text>
+				<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+			</view> -->
+			<view class="popup__content">
+				<view class="sharetypecontent">
+					<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</view>
+					<button class="f1" open-type="share" v-else>
+						<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+						<text class="t1">分享给好友</text>
+					</button>
+					<view class="f2" @tap="showPoster">
+						<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+						<text class="t1">生成分享图片</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="posterDialog" v-if="showposter">
+		<view class="main">
+			<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+			<view class="content">
+				<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+			</view>
+		</view>
+	</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+var interval2 = null;
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			indexurl:app.globalData.indexurl,
+			tabnum: 1,
+      buydialogHidden: true,
+      num: 1,
+			teamCount:0,
+			sysset:{},
+			shopset:{},
+      isfavorite: false,
+      btntype: 1,
+      ggselected: [],
+			guigedata:[],
+			guigelist:[],
+      ks: '',
+      gwcnum: 1,
+      nodata: 0,
+			product:{},
+      userinfo: [],
+      current: 0,
+      pagecontent: "",
+			business:{},
+			commentcount:0,
+			commentlist:[],
+      nowtime: "",
+      teamList: [],
+      teamid: "",
+      sharetypevisible: false,
+      showposter: false,
+      posterpic: "",
+			kfurl:'',	
+			kaituan_status:0,
+			kaituan_duration:0,
+			kaituan_starttime:0,
+			djshour:'00',
+			djsmin:'00',
+			djssec:'00',
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiLuckyCollage/product2', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var pagecontent = JSON.parse(res.product.detail);
+				that.pagecontent = pagecontent;
+				that.business = res.business;
+				that.commentcount = res.commentcount;
+				that.commentlist = res.commentlist;
+				that.ggselected = res.ggselected;
+				that.guigedata = res.guigedata;
+				that.guigelist = res.guigelist;
+				that.isfavorite = res.isfavorite;
+				that.ks = res.ks;
+				that.nowtime = res.nowtime;
+				that.product = res.product;
+				that.shopset = res.shopset;
+				that.sysset = res.sysset;
+				that.teamCount = res.teamCount;
+				that.teamList = res.teamList;
+				that.nowtime = res.nowtime;
+				that.kaituan_duration = res.shopset.duration,
+				that.kaituan_starttime = res.begin_time,
+				that.kaituan_endtime = res.endtime,
+				that.kaituan_status = res.begin_status,
+				setInterval(function () {
+					that.nowtime = that.nowtime + 1;
+					that.getdjs();
+				}, 1000);
+				uni.setNavigationBarTitle({
+					title: res.product.name
+				});
+				that.kfurl = '/pages/kefu/index?bid='+res.product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.getdjs2();
+				clearInterval(interval2);
+				interval2 = setInterval(function(){
+					that.nowtime2 = that.nowtime2+1;
+					that.getdjs2();
+				},1000)
+				that.loaded({title:res.product.name,pic:res.product.pic});
+			});
+		},
+    swiperChange: function (e) {
+      var that = this;
+      that.current = e.detail.current;
+    },
+    getdjs: function () {
+      var that = this;
+      var nowtime = that.nowtime;
+      for (var i in that.teamList) {
+        var thisteam = that.teamList[i];
+        var totalsec = thisteam.createtime * 1 + thisteam.teamhour * 3600 - nowtime * 1;
+        if (totalsec <= 0) {
+          that.teamList[i].djs = '00时00分00秒';
+        } else {
+          var houer = Math.floor(totalsec / 3600);
+          var min = Math.floor((totalsec - houer * 3600) / 60);
+          var sec = totalsec - houer * 3600 - min * 60;
+          var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        }
+				that.teamList[i].djs = djs;
+      }
+    },
+		
+		getdjs2:function(){
+			var that = this
+			var nowtime = that.nowtime*1;
+			var kaituan_starttime = that.kaituan_starttime*1;
+			var kaituan_endtime = that.kaituan_endtime;
+			if(kaituan_endtime < nowtime){ //已结束
+				that.kaituan_status = 2
+				that.djshour = '00';
+				that.djsmin = '00';
+				that.djssec = '00';
+			}else{
+				if(kaituan_starttime > nowtime){ //未开始
+					that.kaituan_status = 0
+					var totalsec = kaituan_starttime - nowtime;
+				}else{ //进行中
+					that.kaituan_status = 1
+					var totalsec = kaituan_endtime - nowtime;
+				}
+				var houer = Math.floor(totalsec/3600);
+				var min = Math.floor((totalsec - houer *3600)/60);
+				var sec = totalsec - houer*3600 - min*60
+				var djs = (houer<10?'0':'')+houer+'时'+(min<10?'0':'')+min+'分'+(sec<10?'0':'')+sec+'秒';
+				var djshour = (houer<10?'0':'')+houer
+				var djsmin = (min<10?'0':'')+min
+				var djssec = (sec<10?'0':'')+sec
+				that.djshour = djshour;
+				that.djsmin = djsmin;
+				that.djssec = djssec;
+			}
+			console.log(that.kaituan_status);
+		},
+    //加入购物车
+    buydialogShow: function (e) {
+      var btntype = e.currentTarget.dataset.btntype;
+      if (btntype == 3) {
+        this.teamid = e.currentTarget.dataset.teamid
+      }
+      this.btntype = btntype;
+      this.buydialogHidden = !this.buydialogHidden;
+    },
+    buydialogChange: function (e) {
+      this.buydialogHidden = !this.buydialogHidden;
+    },
+    //选择规格
+    ggchange: function (e) {
+      var idx = e.currentTarget.dataset.idx;
+      var itemk = e.currentTarget.dataset.itemk;
+      var ggselected = this.ggselected;
+      ggselected[itemk] = idx;
+      var ks = ggselected.join(',');
+      this.ggselected = ggselected;
+      this.ks = ks;
+    },
+    tobuy: function (e) {
+      var type = e.currentTarget.dataset.type;
+      var that = this;
+      var ks = that.ks;
+      var proid = that.product.id;
+      var ggid = that.guigelist[ks].id;
+      var num = that.gwcnum;
+			var shareid = that.opt.pid;
+      app.goto('buy?proid=' + proid + '&ggid=' + ggid + '&num=' + num + '&shareid='+shareid+'&buytype=' + type + (type == 3 ? '&teamid=' + that.teamid : ''));
+    },
+    //加
+    gwcplus: function (e) {
+      var gwcnum = this.gwcnum + 1;
+      var ggselected = this.ks;
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        app.error('库存不足');
+        return;
+      }
+      this.gwcnum =  1
+    },
+    //减
+    gwcminus: function (e) {
+      var gwcnum = this.gwcnum - 1;
+      var ggselected = this.ks;
+      if (gwcnum <= 0) {
+        return;
+      }
+      this.gwcnum = this.gwcnum - 1
+    },
+    //输入
+    gwcinput: function (e) {
+      var ggselected = this.ks;
+      var gwcnum = parseInt(e.detail.value);
+      return 1;
+			
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        return this.guigelist[ggselected].stock;
+      }
+      this.gwcnum = 1;
+    },
+    //收藏操作
+    addfavorite: function () {
+      var that = this;
+      var proid = that.product.id;
+			app.showLoading('收藏中');
+      app.post('ApiLuckyCollage/addfavorite', {proid: proid,type: 'luckycollage'}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          that.isfavorite = !that.isfavorite
+        }
+        app.success(data.msg);
+      });
+    },
+    tabClick: function (e) {
+      this.tabnum = e.currentTarget.dataset.num;
+    },
+    shareClick: function () {
+      this.sharetypevisible = true;
+    },
+    handleClickMask: function () {
+      this.sharetypevisible = false;
+    },
+    showPoster: function () {
+      var that = this;
+      that.showposter = true;
+      that.sharetypevisible = false;
+      app.showLoading('努力生成中');
+			app.post('ApiLuckyCollage/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.alert(data.msg);
+        } else {
+          that.posterpic = data.poster;
+        }
+      });
+    },
+    posterDialogClose: function () {
+      this.showposter = false;;
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/luckycollage/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/luckycollage/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+	}
+}
+</script>
+<style>
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+.containerbox{ position: relative;}
+
+.header {width: 95%;padding: 0 3%;background: #fff; margin:0 20rpx;border-radius: 0px 0px 16rpx 16rpx;}
+.header .title {padding: 10px 0px;line-height:44rpx;font-size:32rpx;display:flex;}
+.header .title .lef{display:flex;flex-direction:column;justify-content: center;flex:1;color:#222222;font-weight:bold}
+.header .title .lef .t2{ font-size:26rpx;color:#999;padding-top:10rpx;font-weight:normal}
+.header .title .share{width:88rpx;height:88rpx;padding-left:20rpx;border-left:0 solid #f5f5f5;text-align:center;font-size:24rpx;color:#222;display:flex;flex-direction:column;align-items:center}
+.header .title .share image{width:32rpx;height:32rpx;margin-bottom:4rpx}
+
+.header .price{height: 86rpx;overflow: hidden;line-height: 86rpx;border-top: 1px solid #eee;}
+.header .price .t1 .x1{ color: #e94745; font-size: 34rpx;}
+.header .price .t1 .x2{ color: #939393; margin-left: 10rpx; text-decoration: line-through;font-size:24rpx}
+.header .price .t2{color: #aaa; font-size: 24rpx;}
+.header .fuwupoint{width:100%;font-size:24rpx;color:#999;display:flex;flex-wrap:wrap;border-top:1px solid #eee;padding:10rpx 0}
+.header .fuwupoint .t{ padding:4rpx 20rpx 4rpx 0}
+.header .fuwupoint .t:before{content: "";	display: inline-block;	vertical-align: middle;	margin-top: -4rpx;	margin-right: 10rpx;	width: 24rpx;	height: 24rpx;	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;	background-size: 24rpx auto; }
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 80rpx; line-height: 80rpx; padding: 0 3%; color: #505050; }
+.choose .f2{ width: 40rpx; height: 40rpx;}
+
+.teamlist{ width:95%;margin:0 20rpx;border-radius: 16rpx;   background:#fff;padding:10rpx 20rpx;font-size:26rpx;margin-top:20rpx;display:flex;flex-direction:column}
+.teamlist .label{ padding-left: 30rpx; height: 100rpx; position: relative; width:100%;color:#222222;font-weight:bold; line-height: 80rpx;}
+.teamlist .label .after{display:block;position:absolute;border-right:10rpx solid red;top:20rpx;left:10rpx;height:36rpx; border-radius:1.5px;}
+.teamlist .content{ width:100%;max-height:300rpx;overflow:scroll}
+.teamlist .item{width:100%;display:flex;align-items:center;padding:12rpx 3px;border-bottom:0px solid #f5f5f5}
+.teamlist .item .f1{overflow:hidden;display:flex;align-items:center}
+.teamlist .item .f1 image{width:80rpx;height:80rpx; border-radius: 50%;}
+.teamlist .item .f1 .img1{ position: absolute;left:10%; background: #D9D9D9; }
+.teamlist .item .f1 .t1{padding-left:6rpx;font-size:30rpx;color:#333}
+.teamlist .item .f2{ margin:0 8rpx; width: 160px; margin-left: 50px;}
+.teamlist .item .f2 .t1{font-size:24rpx;color:#333}
+.teamlist .item .f2 .t2{font-size:22rpx;color:#999}
+.teamlist .item .f3{ background: linear-gradient(90deg, #FF3143 0%, #FE6748 100%);color:#fff;border-radius:26rpx;padding:0 20rpx;height:50rpx;border:0;text-align:right;font-size:26rpx;display:flex;align-items:center}
+.teamlist .item .f3:after{border:0}
+
+
+.shop{width:95%;margin:0 20rpx;display:flex;align-items:center; border-radius: 16rpx; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 136rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:50%;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:100%;background:#fff;padding:0 3%;margin-top:20rpx}
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{ padding:10rpx;width: 100%; position: fixed;bottom: 0px; left: 0px; background: #fff; height: 120rpx;}
+.bottombar .favorite{width: 15%;color:#707070;font-size:26rpx}
+.bottombar .favorite .fa{ font-size:40rpx;height:50rpx;line-height:50rpx}
+.bottombar .favorite .img{ width:50rpx;height:50rpx}
+.bottombar .favorite .t1{font-size:24rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .cart{width: 15%;font-size:26rpx;color:#707070}
+.bottombar .cart .img{ width:50rpx;height:50rpx}
+.bottombar .cart .t1{font-size:24rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .tocart{ width: 30%; height: 100rpx;color: #fff; border-radius: 88rpx 0px 0px 88rpx;background: #fa938a; font-size: 28rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.bottombar .tobuy{ width:30%; height: 100rpx;color: #fff; border-radius: 0px 88rpx 88rpx 0px;background: #df2e24; font-size:28rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.bottombar .item{width: 15%;font-size:24rpx;color:#222222; text-align: center; margin-top:12rpx }
+.bottombar .item .img{ width:50rpx;height:50rpx}
+
+.buydialog-mask{ position: fixed; top: 0px; left: 0px; width: 100%; background: rgba(0,0,0,0.5); bottom: 0px;z-index:10}
+.buydialog{ position: fixed; width: 100%; left: 0px; bottom: 0px; background: #fff;z-index:11;border-radius:20rpx 20rpx 0px 0px}
+.buydialog .close{ position: absolute; top: 0; right: 0;padding:20rpx;z-index:12}
+.buydialog .close .image{ width: 30rpx; height:30rpx; }
+.buydialog .title{ width: 94%;position: relative; margin: 0 3%; padding:20rpx 0px; border-bottom:0; height: 190rpx;}
+.buydialog .title .img{ width: 160rpx; height: 160rpx; position: absolute; top: 20rpx; border-radius: 10rpx; border: 0 #e5e5e5 solid;background-color: #fff}
+.buydialog .title .price{ padding-left:180rpx;width:100%;font-size: 36rpx;height:70rpx; color: #FC4343;overflow: hidden;}
+.buydialog .title .price .t1{ font-size:26rpx}
+.buydialog .title .price .t2{ font-size:26rpx;text-decoration:line-through;color:#aaa}
+.buydialog .title .choosename{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+.buydialog .title .stock{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+
+.buydialog .guigelist{ width: 94%; position: relative; margin: 0 3%; padding:0px 0px 10px 0px; border-bottom: 0; }
+.buydialog .guigelist .name{ height:70rpx; line-height: 70rpx;}
+.buydialog .guigelist .item{ font-size: 30rpx;color: #333;flex-wrap:wrap}
+.buydialog .guigelist .item2{ height:60rpx;line-height:60rpx;margin-bottom:4px;border:0; border-radius:4rpx; padding:0 40rpx;color:#666666; margin-right: 10rpx; font-size:26rpx;background:#F4F4F4}
+.buydialog .guigelist .on{color:#FC4343;background:rgba(252,67,67,0.1);font-weight:bold}
+.buydialog .buynum{ width: 94%; position: relative; margin: 0 3%; padding:10px 0px 10px 0px; }
+.buydialog .addnum {font-size: 30rpx;color: #666;width:auto;display:flex;align-items:center}
+.buydialog .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .img{width:24rpx;height:24rpx}
+.buydialog .addnum .input{flex:1;width:70rpx;border:0;text-align:center;color:#2B2B2B;font-size:24rpx}
+.buydialog .op{width:90%;margin:20rpx 5%;border-radius:36rpx;overflow:hidden;display:flex;margin-top:100rpx;}
+.buydialog .addcart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none; font-size:28rpx;font-weight:bold}
+.buydialog .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;}
+.buydialog .nostock{flex:1;height: 72rpx; line-height: 72rpx; background:#aaa; color: #fff; border-radius: 0px; border: none;}
+
+.collage_title{width:95%;height:110rpx; position: absolute; bottom: 0; background-image: url('https://v2d.diandashop.com/static/img/xypt_bg.png'); background-size: 100%; display:flex;align-items:center;padding:0 40rpx; margin:0 20rpx;}
+.collage_title .f1{flex:1;display:flex;flex-direction:column;}
+.collage_title .f1 .t1{display:flex;align-items:center;height:60rpx;line-height:60rpx; margin-top: 20rpx;}
+.collage_title .f1 .t1 .x1{font-size:28rpx;color:#fff}
+.collage_title .f1 .t1 .x2{font-size:48rpx;color:#fff;padding-right:20rpx}
+.collage_title .f1 .t1 .x3{margin-left: 60rpx;font-size:24rpx;font-weight:bold;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:20rpx;background:#fff;color:#ED533A}
+.collage_title .f1 .t2{color:rgba(255,255,255,0.6);font-size:20rpx;text-decoration: line-through;margin-top: 10rpx;}
+.collage_title .f2{color:#fff;font-size:28rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+
+.title2{ align-items: center; padding-bottom: 20rpx;}
+.title2 .p1{ font-size: 20rpx;border-bottom-right-radius:40rpx; margin: auto; width: 30%;padding:30rpx 0; text-align: center; border: 1rpx solid #FF3143; border: 1px solid rgba(255, 49, 67, 0.2); margin-right: 10rpx;}
+.title2 .t1{ line-height: 40rpx;}
+.title2 .t1 .t1_1{ color:#FF3143}
+.title2 image{ width: 80rpx; height: 80rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/prolist.vue b/activity/luckycollage/prolist.vue
new file mode 100644
index 0000000..3ed3900
--- /dev/null
+++ b/activity/luckycollage/prolist.vue
@@ -0,0 +1,192 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="输入商品名称" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+				</view>
+			</view>
+			<view class="datalist flex" >
+				<block v-for="(item, index) in datalist" :key="index">
+				<view :data-url="linktype+'?id=' + item.id" @tap="goto" class="collage-product">
+					<view class="product-pic">
+						<image :src="item.pic" mode="widthFix"></image>
+						<view class="desc">
+							<text v-if="item.gua_num>0">{{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text>
+							<text v-else  style="line-height: 80rpx;">{{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text>
+							<view v-if="item.linktype==1">
+								<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==1">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text>
+								<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==2">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_score}}积分</text>
+								<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==3">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_commission}}元佣金</text>
+								<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==4">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}优惠券</text>
+							</view>
+							<view v-else>
+									<text v-if="item.teamnum-item.gua_num>0">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text>
+							</view>
+						</view>
+					</view> 
+					<view class="product-info">
+						<view class="p1">{{item.name}}</view>
+						<view class="p2">
+							<view class="p2-1">
+								<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+								<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+							</view>
+						</view>
+						<view class="p3">
+							<view class="t1"><text class="team_text">{{item.teamnum}}人拼</text> 已拼成<text style="font-size:32rpx;color:#f40;padding:0 2rpx;">{{item.sales}}</text>件</view>
+							
+						</view>
+					</view>
+				</view>
+				</block>
+			</view>
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+		<button class="covermy" @tap="goto" data-url="orderlist">我的拼团</button>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		keyword: '',
+		bid:'',
+		pics: [],
+		pagenum: 1,
+		st: '',
+		datalist: [],
+		nomore: false,
+		nodata:false,
+		linktype:'product',
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid || '';
+		this.cid = this.opt.cid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+		getdata: function (loadmore) {
+			var that = this;
+			app.get('ApiIndex/getCustom',{}, function (customs) {
+					if(customs.data.includes('plug_luckycollage')) {
+						that.linktype = 'product2';
+					}
+			});
+			
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var pagenum = that.pagenum;
+      var st = that.st;
+			var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiLuckyCollage/prolist', {cid:that.cid,bid:that.bid,keyword: keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.pics = res.pics;
+					that.clist = res.clist;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+				that.loaded();
+      });
+		},
+		
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.pagenum = 1;
+			this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		searchChange: function (e) {
+		  this.keyword = e.detail.value;
+		},
+		searchConfirm: function (e) {
+		  var that = this;
+		  var keyword = e.detail.value;
+		  that.keyword = keyword;
+		  that.getdata();
+		}
+	}
+}
+</script>
+<style>
+.container{background:#f4f4f4}
+
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+
+.swiper {width:94%;margin:0 3%;height: 350rpx;margin-top: 20rpx;border-radius:20rpx;overflow:hidden}
+.swiper image {width: 100%;overflow: hidden;}
+
+.category{width:94%;margin:0 3%;padding-top: 10px;padding-bottom: 10px;flex-direction:row;white-space: nowrap; display:flex;}
+.category .item{width: 150rpx;display: inline-block; text-align: center;}
+.category .item image{width: 80rpx;height: 80rpx;margin: 0 auto;border-radius: 50%;}
+.category .item .t1{display: block;color: #666;}
+
+.datalist{width:96%;margin:0 3%; flex-wrap: wrap;}
+.collage-product { background: #fff; width: 47%;margin-right:20rpx;padding:20rpx 20rpx;margin-top: 20rpx;border-radius:20rpx}
+.collage-product .product-pic { background: #ffffff;overflow:hidden; position: relative;}
+.collage-product .product-pic .desc{ display: flex; width: 100%; flex-wrap: wrap; position: absolute; bottom: 0; background: #FF3143; opacity: 0.7; color:#fff;font-size: 20rpx;height:80rpx; padding:5rpx 10rpx}
+.collage-product .product-pic image{width: 100%;height:180rpx;}
+.collage-product .product-info {padding: 5rpx 10rpx;flex:1}
+.collage-product .product-info .p1 {color:#222;font-weight:bold;font-size:28rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.collage-product .product-info .p2{font-size: 32rpx;height:40rpx;line-height: 40rpx; margin-bottom: 10rpx; }
+.collage-product .product-info .p2 .t1{color: #FF3143;font-size: 36rpx;font-weight: bold; }
+.collage-product .product-info .p2 .t2 {margin-left: 10rpx;font-size: 26rpx;color: #888;text-decoration: line-through;}
+.collage-product .product-info .p3{font-size: 24rpx;height:50rpx;line-height:50rpx;overflow:hidden;display:flex;}
+.collage-product .product-info .p3 .t1{color:#aaa;font-size:24rpx;flex:1;}
+.collage-product .product-info .p3 .t2{height: 50rpx;line-height: 50rpx;overflow: hidden;border: 1px #FF3143 solid;border-radius:10rpx;}
+.collage-product .product-info .p3 .t2 .x1{padding: 10rpx 24rpx;}
+.collage-product .product-info .p3 .t2 .x2{padding: 14rpx 24rpx;background: #FF3143;color:#fff;}
+.collage-product .product-info .p3 .team_text{ padding:0rpx 10rpx; margin-right:10rpx;border-radius: 4rpx; color: #FF3143;  background:#FFDED9 ; font-size: 20rpx; display: inline-block;}
+.covermy{position:absolute;z-index:99999;cursor:pointer;display:flex;flex-direction:column;align-items:center;justify-content:center;overflow:hidden;z-index:9999;top:260rpx;right:0;color:#fff;background-color:rgba(17,17,17,0.3);width:140rpx;height:60rpx;font-size:26rpx;border-radius:30rpx 0px 0px 30rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/refund.vue b/activity/luckycollage/refund.vue
new file mode 100644
index 0000000..5cb7f2e
--- /dev/null
+++ b/activity/luckycollage/refund.vue
@@ -0,0 +1,100 @@
+<template>
+<view class="container">
+	<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-item">
+			<text class="label">退款原因</text>
+			<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+		</view>
+		<view class="form-item">
+			<text class="label">退款金额(元)</text>
+			<view class="flex"><input name="money" type="digit" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+		</view>
+		<button class="ref-btn" form-type="submit">确定</button>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: '',
+      totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+
+    var that = this;
+    that.orderid = that.opt.orderid;
+    that.totalprice = that.opt.price;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loaded();
+		},
+    formSubmit: function (e) {
+      //console.log(e);return;
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+
+      if (money <= 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			
+			app.showLoading('提交中');
+      app.post('ApiLuckyCollage/refund', {
+        orderid: orderid,
+        reason: reason,
+        money: money
+      }, function (data) {
+				app.showLoading(false);
+        app.alert(data.msg);
+        var pages = getCurrentPages();
+
+        if (pages.length > 1) {
+          var prePage = pages[pages.length - 2];
+          prePage.onLoad();
+        }
+
+        setTimeout(function () {
+          app.goback();
+        }, 1000);
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-item{ width:100%;background: #fff; padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.ref-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; text-align: center; color: #fff; font-size: 16px; border-radius: 8px;border: none; background: #ff8758; }
+</style>
\ No newline at end of file
diff --git a/activity/luckycollage/team.vue b/activity/luckycollage/team.vue
new file mode 100644
index 0000000..367f7c3
--- /dev/null
+++ b/activity/luckycollage/team.vue
@@ -0,0 +1,443 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container">
+			<view class="topbg">
+				<image :src="pre_url + '/static/img/collage_teambg.png'" class="image"/>
+			</view>
+			<view class="topbox" @tap="goto" :data-url="'product?id=' + product.id">
+				<view class="left">
+					<image :src="product.pic"></image>
+				</view>
+				<view class="right">
+					<view class="f1">{{product.name}}</view>
+					<view class="f2"><view class="t1">{{product.teamnum}}人团</view></view>
+					<view class="f3">
+						<view class="t1">￥</view>
+						<view class="t2">{{product.sell_price}}</view>
+						<view class="t3">{{product.sales}}人已拼</view>
+					</view>
+				</view>
+			</view>
+			<view class="title2 flex">
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_1.png'"></image><view class="t1">参与拼团</view><view class="t1"><text class="t1_1">{{product.teamnum}}</text>人成团</view></view>
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_2.png'"></image><view class="t1"><text class="t1_1">{{product.gua_num}}</text>人拼中发货</view><view class="t1"><text class="t1_1">{{product.teamnum-product.gua_num}}</text>人未中退款</view></view>
+				<view class="p1"><image :src="event_rul +'/static/img/static/img/pintuan_3.png'"></image>
+						<view class="t1">未中补贴</view>
+						<view v-if="product.linktype==1">
+							<view class="t1" v-if="product.bzjl_type==1"><text class="t1_1">{{product.fy_money_val}}</text>元参与奖</view>
+							<view class="t1" v-if="product.bzjl_type==2"><text class="t1_1">{{product.bzj_score}}</text>积分</view>
+							<view class="t1" v-if="product.bzjl_type==3"><text class="t1_1">{{product.bzj_commission}}</text>元佣金</view>
+							<view class="t1" v-if="product.bzjl_type==4"><text class="t1_1"></text>优惠券</view>
+						</view>
+						<view v-else>
+						<view class="t1">未中补贴</view><view class="t1"><text class="t1_1">{{product.fy_money_val}}</text>元参与奖</view>
+						</view>
+				</view>
+
+			</view>
+			<view class="teambox">
+				<view class="userlist">
+					<view v-for="(item, index) in userlist" :key="index" class="item">
+						<image :src="item.headimg?item.headimg:event_rul +'/static/img/static/img/wh.png'" class="f1"></image>
+						<text class="f2" v-if="item.id == team.mid">团长</text>
+						<view v-if="team.status==2 && item.iszj==1">已中奖</view>
+						<view v-if="team.status==2 && item.iszj==0">未中奖</view>
+					</view>
+				</view>
+				<view class="join-text" v-if="team.status==1">
+					<view>仅剩<text class="join-te1">{{team.teamnum-team.num}}</text>个名额</view>
+					<view style="font-size:28rpx;color:#f80"> {{rtimeformat}} 后结束</view>
+				</view>
+				<view class="join-text" v-if="team.status==2">
+					
+					
+					
+					已满员,拼团成功</view>
+				<view class="join-text" v-if="team.status==3">拼团失败</view>
+				<button class="join-btn" @tap="shareClick" v-if="team.status==1 && haveme==1">邀请好友参团</button>
+				<button class="join-btn" @tap="buydialogChange" v-if="team.status==1 && haveme==0">我要参团</button>
+			</view>
+			<view :hidden="buydialogHidden">
+				<view class="buydialog-mask">
+					<view class="buydialog">
+						<view class="close" @tap="buydialogChange">
+							<image :src="event_rul +'/static/img/static/img/close.png'" class="buydialog-canimg"></image>
+						</view>
+						<view class="title">
+							<image :src="guigelist[ks].pic?guigelist[ks].pic:product.pic" class="img" @tap="previewImage" :data-url="guigelist[ks].pic?guigelist[ks].pic:product.pic"></image>
+							<view class="price"><text class="t1">￥</text>{{guigelist[ks].sell_price}} <text v-if="guigelist[ks].market_price > guigelist[ks].sell_price" class="t2">￥{{guigelist[ks].market_price}}</text></view>
+							<view class="choosename">已选规格: {{guigelist[ks].name}}</view>
+							<view class="stock">剩余{{guigelist[ks].stock}}件</view>
+						</view>
+
+						<view v-for="(item, index) in guigedata" :key="index" class="guigelist flex-col">
+							<view class="name">{{item.title}}</view>
+							<view class="item flex flex-y-center">
+								<block v-for="(item2, index2) in item.items" :key="index2">
+									<view :data-itemk="item.k" :data-idx="item2.k" :class="'item2 ' + (ggselected[item.k]==item2.k ? 'on':'')" @tap="ggchange">{{item2.title}}</view>
+								</block>
+							</view>
+						</view>
+						<view class="buynum flex flex-y-center">
+							<view class="flex1">购买数量：</view>
+							<view class="f2 flex flex-y-center">
+								<text class="minus flex-x-center" @tap="gwcminus">-</text>
+								<input class="flex-x-center" type="number" :value="gwcnum" @input="gwcinput"></input>
+								<text class="plus flex-x-center" @tap="gwcplus">+</text>
+							</view>
+						</view>
+						<block>
+						<button class="tobuy" @tap="tobuy" data-type="3">确 定</button>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		tabnum: 1,
+		ggselected: [],
+		guigedata: [],
+		guigelist:[],
+		haveme:0,
+		ks: '',
+		gwcnum: 1,
+		showdetail: false,
+		buydialogHidden: true,
+		team: [],
+		userlist: [],
+		product: [],
+		rtime: '',
+		rtimeformat: '',
+		isfavorite: "",
+		sharetypevisible: false,
+		showposter: false,
+		posterpic: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		clearInterval(interval);
+		this.getdata();
+	},
+	onUnload: function () {
+		clearInterval(interval);
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:'就差你了，快来一起拼团~ ' + this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:'就差你了，快来一起拼团~ ' + this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var teamid = that.opt.teamid;
+			that.loading = true;
+			app.get('ApiLuckyCollage/team', {teamid: teamid}, function (res) {
+				that.loading = false;
+
+				that.ggselected  = res.ggselected;
+				that.guigedata  = res.guigedata;
+				that.guigelist  = res.guigelist;
+				that.haveme  = res.haveme;
+				that.ks  = res.ks;
+				that.product  = res.product;
+				that.rtime  = res.rtime;
+				that.shopset  = res.shopset;
+				that.sysset  = res.sysset;
+				that.team  = res.team;
+				that.userlist  = res.userlist;
+				that.getrtime();
+				interval =	setInterval(function () {
+					that.getrtime();
+				}, 1000);
+				that.loaded({title:'就差你了，快来一起拼团~ ',desc:res.product.name,pic:res.product.pic});
+			});
+		},
+    buydialogChange: function (e) {
+      this.buydialogHidden = !this.buydialogHidden
+    },
+    //选择规格
+    ggchange: function (e) {
+      var idx = e.currentTarget.dataset.idx;
+      var itemk = e.currentTarget.dataset.itemk;
+      var ggselected = this.ggselected;
+      ggselected[itemk] = idx;
+      var ks = ggselected.join(',');
+      this.ggselected = ggselected;
+      this.ks = ks;
+    },
+    //加
+    gwcplus: function (e) {
+      var gwcnum = this.gwcnum + 1;
+      var ggselected = this.ks;
+
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        app.error('库存不足');
+        return;
+      }
+      this.gwcnum = this.gwcnum + 1;
+    },
+    //减
+    gwcminus: function (e) {
+      var gwcnum = this.gwcnum - 1;
+      var ggselected = this.ks;
+
+      if (gwcnum <= 0) {
+        return;
+      }
+      this.gwcnum = this.gwcnum - 1;
+    },
+    //输入
+    gwcinput: function (e) {
+      var ggselected = this.ks;
+      var gwcnum = parseInt(e.detail.value);
+      if (gwcnum < 1) return 1;
+      if (gwcnum > this.guigelist[ggselected].stock) {
+        return this.guigelist[ggselected].stock;
+      }
+      this.gwcnum = gwcnum;
+    },
+    tobuy: function (e) {
+      var type = e.currentTarget.dataset.type;
+      var that = this;
+      var ggselected = that.ks;
+      var proid = that.product.id;
+      var ggid = that.guigelist[ggselected].id;
+      var num = that.gwcnum; //var prodata = proid + ',' + ggid + ',' + num;
+	  var shareid = that.opt.pid;
+      app.goto('buy?proid=' + proid + '&shareid='+shareid+ '&num=' + num + '&ggid=' + ggid + '&buytype=' + type + '&teamid=' + that.team.id);
+    },
+    getrtime: function () {
+      var rtime = this.rtime - 1;
+      if (rtime < 0) {
+        this.rtimeformat = '0秒';
+        this.rtime = rtime;
+      } else {
+        var hours = Math.floor(rtime / 3600); //计算相差分钟数  
+        var leave2 = rtime % 3600; //计算小时数后剩余的毫秒数  
+        var minutes = Math.floor(leave2 / 60); //计算相差秒数  
+        var seconds = leave2 % 60; //计算分钟数后剩余的毫秒数
+        var rtimeformat = hours + "小时" + minutes + "分" + seconds + "秒";
+        this.rtimeformat = rtimeformat;
+        this.rtime = rtime;
+      }
+    },
+    shareClick: function () {
+      this.sharetypevisible = true;
+    },
+    handleClickMask: function () {
+      this.sharetypevisible = false;
+    },
+    showPoster: function () {
+      var that = this;
+      that.showposter = true;
+      that.sharetypevisible = false;
+			app.showLoading('努力生成中');
+      app.post('ApiLuckyCollage/getTeamPoster', {proid: that.product.id,teamid: that.team.id}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.alert(data.msg);
+        } else {
+          that.posterpic = data.poster;
+        }
+      });
+    },
+    posterDialogClose: function () {
+      this.showposter = false;
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/collage/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/collage/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+  }
+};
+</script>
+<style>
+.topbg{width:100%;height:248rpx;position:relative;z-index:0}
+.topbg .image{width:100%;height:100%}
+.topbox{width:94%;margin:0 3%;margin-top:-140rpx;background:#fff;border-radius:16rpx;padding:24rpx;display:flex;position:relative;z-index:1}
+.topbox .left{flex-shrink:0;width:240rpx;height:240rpx;}
+.topbox .left image{width:100%;height:100%}
+.topbox .right{flex:1;padding-left:20rpx;padding-right:20rpx;display:flex;flex-direction:column}
+.topbox .right .f1{color:#32201B;height:80rpx;line-height:40rpx;font-size:30rpx;font-weight:bold;overflow:hidden}
+.topbox .right .f2{display:flex;margin-top:10rpx}
+.topbox .right .f2 .t1{display:flex;background:rgba(255, 49, 67,0.2);border-radius:20rpx;padding:0 20rpx;height:40rpx;line-height:40rpx;color:#FF3143;font-size:24rpx;}
+.topbox .right .f3{display:flex;align-items:center;color:#FF3143;margin-top:40rpx}
+.topbox .right .f3 .t1{font-size:28rpx}
+.topbox .right .f3 .t2{font-size:40rpx;font-weight:bold;flex:1}
+.topbox .right .f3 .t3{font-size:26rpx;font-weight:bold;}
+
+.teambox{width:94%;margin:0 3%;margin-top:20rpx;background:#fff;border-radius:16rpx;padding:24rpx;display:flex;flex-direction:column}
+
+.userlist{width: 100%;background: #fff;text-align: center;padding-top:40rpx;margin-top:20rpx;}
+.userlist .item{display: inline-block;width:120rpx; height:120rpx;position: relative;}
+.userlist .item .f1{width:100rpx; height:100rpx;border-radius: 50%;border: 1px #ffc32a solid;}
+.userlist .item .f2{background: #ffab33;border-radius:100rpx;padding:4rpx 16rpx;border:1px #fff solid;position: absolute;top: 0px; left: -20rpx;color: #9f7200;font-size: 30rpx;}
+
+.join-text{color:#000;padding: 30rpx 0;font-size:36rpx;font-weight: 600;background: #fff; text-align: center;width: 100%;}
+
+.join-btn{width: 90%;margin:20rpx 5%;background: linear-gradient(90deg, #FF3143 0%, #FE6748 100%);color: #fff;font-size: 30rpx;height:80rpx;border-radius:40rpx}
+
+.buydialog-mask{ position: fixed; top: 0px; left: 0px; width: 100%; background: rgba(0,0,0,0.5); bottom: 0px;z-index:9}
+.buydialog{ position: absolute; width: 100%; left: 0px; bottom: 0px; background: #fff;z-index:9}
+.buydialog .close{ position: absolute; top: 0; right: 0;padding:20rpx;z-index:9999}
+.buydialog .close image{ width: 30rpx; height:30rpx; }
+.buydialog .title{ width: 94%;position: relative; margin: 0 3%; padding:20rpx 0px; border-bottom: 1px #e5e5e5 solid; height: 140rpx;}
+.buydialog .title .img{ width: 160rpx; height: 160rpx; position: absolute; top: -40rpx; border-radius: 10rpx; border: 1px #e5e5e5 solid;background-color: #fff}
+.buydialog .title .price{ padding-left:180rpx;width:100%;font-size: 36rpx;height:50rpx; color: #ff4a03;overflow: hidden;}
+.buydialog .title .price .t1{ font-size:24rpx}
+.buydialog .title .price .t2{ font-size:26rpx;text-decoration:line-through;color:#aaa}
+.buydialog .title .choosename{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 30rpx;line-height:30rpx;}
+.buydialog .title .stock{ padding-left:180rpx;width: 100%;font-size: 22rpx;height: 30rpx;line-height:30rpx;color:#aaa}
+
+.buydialog .guigelist{ width: 94%; position: relative; margin: 0 3%; padding:0px 0px 10px 0px; border-bottom: 1px #e5e5e5 solid; }
+.buydialog .guigelist .name{ height:70rpx; line-height: 70rpx;}
+.buydialog .guigelist .item{ font-size: 30rpx;color: #333;}
+.buydialog .guigelist .item2{ height:50rpx;line-height:50rpx;border: 1px #a9a9a9 solid; border-radius:8rpx; padding:0 10rpx; color: #353535; margin-right: 10rpx; font-size:26rpx;}
+.buydialog .guigelist .on{ border: 1px #ff4a03 solid;color: #ff4a03;}
+.buydialog .buynum{ width: 94%; position: relative; margin: 0 3%; padding:10px 0px 10px 0px; }
+.buydialog .buynum .f2{ border:1px solid #aaa}
+.buydialog .buynum .f2 input{flex:1;width:70rpx;border-left:1px solid #aaa;border-right:1px solid #aaa;text-align:center}
+.buydialog .buynum .f2 .plus{width:50rpx;}
+.buydialog .buynum .f2 .minus{width:50rpx;}
+.buydialog .addcart{height: 45px; line-height: 45px; background: #e94745; color: #fff; border-radius: 0px; border: none; font-size:16px; }
+.buydialog .tobuy{ height: 45px; line-height: 45px; background: #ff6801; color: #fff; border-radius: 0px; border: none; font-size:16px; }
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+
+.title2{ background: #fff; padding:20rpx;align-items: center; margin: 20rpx;border-radius: 10rpx;}
+.title2 .p1{ font-size: 20rpx;border-bottom-right-radius:40rpx; margin: auto; width: 30%;padding:30rpx 0; text-align: center; border: 1rpx solid #FF3143; border: 1px solid rgba(255, 49, 67, 0.2); margin-right: 10rpx;}
+.title2 .t1{ line-height: 40rpx;}
+.title2 .t1 .t1_1{ color:#FF3143}
+.title2 image{ width: 80rpx; height: 80rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/luntan/detail.vue b/activity/luntan/detail.vue
new file mode 100644
index 0000000..e36f162
--- /dev/null
+++ b/activity/luntan/detail.vue
@@ -0,0 +1,1179 @@
+<template>
+	<view class="container">
+		<block>
+			<swiper style="width: 750rpx;height:750rpx; " :indicator-dots="true" :autoplay="true" :interval="3000"
+				:duration="1000">
+				<swiper-item v-for="(item,index) in detail.pics" :key="index">
+					<view class="swiper-item" style="width: 750rpx;height:750rpx;">
+						<image @click="preImg(detail.pics,index)" :src="item" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="pages-bd">
+				<view class="info_box flex j-between al-item-center">
+					<view class="left" @click.stop="goto" :data-url="'/diary/info/info?id='+detail.mid">
+						<image :src="detail.headimg" mode=""></image>
+						<text class="txt">{{detail.nickname||''}}</text>
+					</view>
+					<button type="default" v-if="info.isMy" class="right-d flex flex-colum al-item-center j-around" @tap="edSle(detail.id)" :style="{'background-color':'transparent'}">
+						<text class="d1 border-rius-r"></text>
+						<text class="d1 border-rius-r"></text>
+						<text class="d1 border-rius-r"></text>
+					</button>
+					<view v-else class="right" :class="{'isfollow': info.isfollow}" @tap="Follow(info)">
+						{{info.isfollow?'已关注':'关注'}}
+					</view>
+				</view>
+				<view class="note-info">
+					<view class="note-info__title">
+						{{detail.title}}
+					</view>
+					<view class="note-info__txt" v-html="detail.content"></view>
+				</view>
+				<view class="topic-list flex">
+					<view class="topic-list__item flex al-item-center" @tap="goto" :data-url="'/diary/topic/topic?id='+item.id"
+						v-for="(item,index) in info.topicList" :key='index'>
+						<view class="icon-box flex j-center al-item-center">
+							<view class="icon">#</view>
+						</view>
+						<view class="item-name">{{item.topic_name}}</view>
+					</view>
+				</view>
+				<view class="issue-time">{{detail.is_edit == 0 ? detail.showtime : '编辑于 ' + detail.showtime }}</view>
+				<scroll-view class="shop-scroll" v-if="info.proList && info.proList.length > 0" scroll-x="true">
+					<view class="shop-list flex">
+						<view class="shop-list__item flex al-item-center"
+							:class="info.proList && info.proList.length>1 ? (info.proList.length>2 ? 'amount-b': 'amount-a'): ''"
+							@tap="toShopDetail(item)" v-for="(item,index) in info.proList" :key="index" >
+							<image class="item-hd" :src="item.pic" mode=""></image>
+							<view class="item-bd flex1 flex flex-colum j-between overflow-hd">
+								<text class="item-bd__name text-overflow-tx">{{item.name}}</text>
+								<text class="item-bd__price"><text class="symbol">￥</text>{{ item.sell_price}}</text>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<!--评论-->
+				<view class="comment-list">
+					<view class="comment-list__hd"><text class="t1">精选评论</text><text style="color: #999;">(共{{plcount}}条)</text>
+					</view>
+					<view class="comment-list__bd" v-if="datalist.length" id="datalist">
+						<block v-for="(item, idx) in datalist" :key="idx">
+							<view class="comment-item flex">
+								<view class="comment-item__hd">
+									<image class="comment-item__hd-img" :src="item.headimg"></image>
+								</view>
+								<view class="comment-item__bd">
+									<view class="comment-item__name">{{item.nickname}}</view>
+									<view class="comment-item__txt" >
+										<rich-text :nodes="item.content"></rich-text>
+									</view>
+									 <view class="comment-item__time">{{item.createtime}}</view>
+									<block v-if="item.replylist && item.replylist.length > 0">
+										<view class="comment-item__reply">
+											<block v-for="(hfitem, index) in item.replylist" :key="index">
+												<block v-if="index < 1 || item.plShow">
+													<view class="reply-item flex">
+														<image class="reply-item__hd" :src="hfitem.headimg" mode=""></image>
+														<view class="reply-item__bd">
+															<view class="reply-item__name">{{hfitem.nickname}}</view>
+															<view class="reply-item__txt">
+																<rich-text :nodes="hfitem.content"></rich-text>
+															</view>
+															<view class="reply-item__time">{{hfitem.createtime}}</view>
+															<!-- <view class="reply-item__del" v-if="hfitem.mid==mid"
+																@tap="delplreply" :data-id="hfitem.id">删除</view> -->
+														</view>
+													</view>
+												</block>
+											</block>
+											
+											<view @click="plShowFn(item)" class="plShow-txt" v-if="item.replylist.length >= 2 && !item.plShow">
+												展开{{item.replylist.length-1}}条回复
+											</view>
+											<view @click="plShowFn(item)" class="plShow-txt" v-if="item.replylist.length >= 2 && item.plShow">
+												收回
+											</view>
+										</view>
+									</block>
+									<view class="comment-item__more flex al-item-center j-between">
+										<view class="more-reply flex">
+											<text class="more-txt" style="cursor:pointer" @tap="goto"
+												:data-url="'pinglun?type=1&id=' + detail.id + '&hfid=' + item.id">回复</text>
+											<!-- <text  class="more-del" v-if="item.mid==mid" @tap="delpinglun" :data-id="item.id">删除</text> -->
+										</view>
+										<view class="more-praise flex al-item-center" @tap="pzan" :data-id="item.id" :data-index="idx">
+											<image class="more-praise__img" :src="'https://dev.lansoft.shop/static/img/static/img/lt_like' + (item.iszan==1?'2':'') + '.png'"></image>
+											{{item.zan}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</block>
+					</view>
+					<view v-else style="text-align: center; color:#999;">
+						快一起来评论吧!
+					</view>
+				</view>
+				<view class="comment-add flex al-item-cent j-between">
+					<view class="comment-add__inp" @tap="goto" :data-url="'pinglun?type=0&id=' + detail.id">
+						<text class="iconfont icon-qianbi"></text>
+						说点什么...
+					</view>
+					<view class="comment-add__info flex al-item-center">
+						<view class="info-item flex al-item-center" open-type="share" @click="shareClick">
+							<text class="iconfont icon-fenxiang"></text>
+							<text class="info-txt">{{detail.share_num >= 10000 ? (detail.share_num / 10000).toFixed(1)+'万': detail.share_num}}</text>
+						</view>
+						
+						
+						<view class="info-item flex al-item-center" @tap="zan" :data-id="detail.id">
+							<text class="iconfont" :style="{'color':iszan?'red':''}"
+								:class="{'icon-aixin_shixin':iszan,'icon-aixin':!iszan}"></text>
+							<text class="info-txt">{{detail.zan >= 10000 ? (detail.zan / 10000).toFixed(1)+'万': detail.zan}}</text>
+						</view>
+						<view class="info-item flex al-item-center" @click="favFn">
+							<text :style="{'color':info.isfavorite?'#EC2828':''}"
+								:class="{'icon-Collection':info.isfavorite,'icon-shoucang':!info.isfavorite}"
+								class="iconfont"></text>
+						
+							<text class="info-txt">{{info.favoriteCount >= 10000 ? (info.favoriteCount / 10000).toFixed(1)+'万': info.favoriteCount}}</text>
+						</view>
+						<view class="info-item flex al-item-center" @tap="goto" :data-url="'pinglun?type=0&id=' + detail.id">
+							<text class="iconfont icon-xiaoxi"></text>
+							<text class="info-txt">{{plcount >= 10000 ? (plcount / 10000).toFixed(1)+'万': (plcount || 0)}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<!-- 分享 -->
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popupshare__close2" @tap.stop="handleClickMask" />
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else  @tap="sharMust">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'" />
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter" @touchmove.stop.prevent="moveHandle">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose">
+					<image class="img" :src="event_rul +'/static/img/static/img/close.png'" />
+				</view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage"
+						:data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+		<popmsg ref="popmsg"></popmsg>
+		
+		<view class="hitn-n position-f" v-show="hintShow">
+			<view class="hint-bx position-a">
+				<image class="hint-img" :src="event_rul + '/static/images/hint-n.png'" mode="widthFix"></image>
+				<view class="content position-a  flex flex-colum al-item-center">
+					<text class="title font-w">温馨提示</text>
+					<text class="text">该笔记已删除！</text>
+				</view>
+			</view>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+
+	export default {
+		data() {
+			return {
+				plcount: 0,
+				info: {},
+				opt: {},
+				loading: false,
+				pre_url: app.globalData.pre_url,
+				isload: false,
+				menuindex: -1,
+
+				detail: {},
+				datalist: [],
+				pagenum: 1,
+				id: 0,
+				nomore: false,
+				iszan: "",
+				title: "",
+				sharepic: "",
+				
+				sharetypevisible: false,
+				showposter: false,
+				posterpic: "",
+				product: [],
+				event_rul: app.globalData.event_url,
+				timeouts: null,
+				
+				hintShow:false,
+				hintTime: null,
+			};
+		},
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			this.id = this.opt.id || 0;
+			this.getdata();
+		},
+		onShareAppMessage: function() {
+			return this._sharewx({
+				title: this.detail.title,
+				pic: this.detail.pics[0]
+			});
+		},
+		onShareTimeline: function() {
+			var sharewxdata = this._sharewx({
+				title: this.detail.title,
+				pic: this.detail.pics[0]
+			});
+			var query = (sharewxdata.path).split('?')[1];
+			console.log(sharewxdata)
+			console.log(query)
+			return {
+				title: sharewxdata.title,
+				imageUrl: sharewxdata.imageUrl,
+				query: query
+			}
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		onReachBottom: function() {
+			if (!this.nodata && !this.nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getdata(true);
+			}
+		},
+		onUnload() {
+			clearTimeout(this.timeouts)
+			clearTimeout(this.hintTime)
+		},
+		methods: {
+			// 跳转商品详情
+			toShopDetail(data) {
+				if(data.sign == 0) {
+					app.goto('/pages/shop/product?id='+data.id)
+				}else {
+					uni.navigateToMiniProgram({
+					  appId: data.appid,
+					  path: data.path + '?id=' + data.id,
+					  success: res => {
+					    // 打开成功
+					  }
+					})
+				}
+				
+			},
+			// 编辑、删除
+			edSle(id) {
+				uni.showActionSheet({
+					itemList: ['编辑笔记', '删除笔记'],
+					success: res => {
+						if(res.tapIndex == 0) {
+							this.editData(id)
+						}else {
+							this.delDrafts(id)
+						}
+						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮', id);
+					},
+					fail: function (res) {
+						// console.log(res.errMsg);
+					}
+				});
+			},
+			// 编辑笔记
+			editData(id) {
+				let url = 'ApiLuntan/detail'
+				let dataurl = '/diary/issue/issue?type=note'
+		
+				app.post(url, {
+					id: id,
+					// isdraft: 1
+				}, res => {
+					if(res.status == 1) {
+						uni.navigateTo({
+							url:dataurl+'&editId='+ id + '&detail='+JSON.stringify(res.detail) + '&recordlist=' + JSON.stringify(res.proList)
+						})
+					}else {
+						app.error(res.msg)
+					}
+			
+				})
+			},
+			// 删除笔记
+			delDrafts(id) {
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该笔记吗?',
+					confirmColor: this.t('color1'),
+					success:  (res) => {
+						if (res.confirm) {
+							app.get('ApiLuntan/deltie',{id:id},(res)=>{
+								if(res.status == 1) {
+									app.error(res.msg)
+									this.timeouts = setTimeout(() => {
+										uni.navigateBack()
+									}, 1200)
+									
+								}else {
+									app.error(res.msg)
+								}
+							})
+						} else if (res.cancel) {
+							
+						}
+					}
+				});
+			
+			
+			},
+			//  阻止滑动
+			moveHandle(){
+					return true
+			},
+			sharemp: function() {
+				app.error('点击右上角发送给好友或分享到朋友圈');
+				this.sharetypevisible = false
+			},
+			shareapp: function() {
+				var that = this;
+				that.sharetypevisible = false;
+				uni.showActionSheet({
+					itemList: ['发送给微信好友', '分享到微信朋友圈'],
+					success: function(res) {
+						if (res.tapIndex >= 0) {
+							var scene = 'WXSceneSession';
+							if (res.tapIndex == 1) {
+								scene = 'WXSenceTimeline';
+							}
+							var sharedata = {};
+							sharedata.provider = 'weixin';
+							sharedata.type = 0;
+							sharedata.scene = scene;
+							sharedata.title = that.detail.title;
+							// sharedata.summary = that.detail.sharedesc || that.detail.sellpoint;
+							sharedata.href = app.globalData.pre_url + '/h5/' + app.globalData.aid +
+								'.html#/pages/shop/product?scene=id_' + that.detail.id + '-pid_' + app
+								.globalData.mid;
+							sharedata.imageUrl = that.detail.pic[0];
+							var sharelist = app.globalData.initdata.sharelist;
+							if (sharelist) {
+								for (var i = 0; i < sharelist.length; i++) {
+									if (sharelist[i]['indexurl'] == '/pages/shop/product') {
+										sharedata.title = sharelist[i].title;
+										sharedata.summary = sharelist[i].desc;
+										sharedata.imageUrl = sharelist[i].pic;
+										if (sharelist[i].url) {
+											var sharelink = sharelist[i].url;
+											if (sharelink.indexOf('/') === 0) {
+												sharelink = app.globalData.pre_url + '/h5/' + app
+													.globalData.aid + '.html#' + sharelink;
+											}
+											if (app.globalData.mid > 0) {
+												sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') +
+													'pid=' + app.globalData.mid;
+											}
+											sharedata.href = sharelink;
+										}
+									}
+								}
+							}
+							uni.share(sharedata);
+						}
+					}
+				});
+			},
+			// 关闭分享
+			handleClickMask() {
+				this.sharetypevisible = false
+			},
+			shareClick: function() {
+				this.sharetypevisible = true;
+			},
+			posterDialogClose: function() {
+				this.showposter = false;
+			},
+			// 分享必调的接口
+			sharMust() {
+				app.post('ApiShortvideo/shareNum', {
+					type: this.opt.type,
+					id: this.detail.id
+				}, res => {
+				})
+			},
+			showPoster: function() {
+				var that = this;
+				that.showposter = true;
+				that.sharetypevisible = false;
+				app.showLoading('生成海报中');
+				app.post('ApiShortvideo/getposter', {
+					proid: that.detail.id
+				}, function(data) {
+					app.showLoading(false);
+					if (data.status == 0) {
+						app.alert(data.msg);
+					} else {
+						that.posterpic = data.poster;
+					}
+				});
+			},
+			preImg(arr,index){
+				uni.previewImage({urls:arr,current:index})
+			},
+			plShowFn(item){
+				item.plShow = !item.plShow
+			},
+			favFn() {
+				app.post('ApiShop/addfavorite', {
+					proid: this.info.detail.id,
+					type: 'note'
+				}, (res) => {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					if (res.msg == '已收藏') {
+						this.info.isfavorite = 1
+						this.info.favoriteCount++
+
+					} else {
+						this.info.isfavorite = 0
+						this.info.favoriteCount--
+					}
+				})
+			},
+			Follow(item) {
+				app.post('ApiMy/addFollow', {
+					follow_id: item.detail.mid,
+					type: 'user'
+				}, (res) => {
+					// this.info = res.data
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					if (res.msg == '已关注') {
+						item.isfollow = 1
+
+					} else {
+						item.isfollow = 0
+					}
+				})
+			},
+			getdata: function(loadmore) {
+				if (!loadmore) {
+					this.pagenum = 1;
+					this.datalist = [];
+				}
+				var that = this;
+				var pagenum = that.pagenum;
+				that.loading = true;
+				that.nodata = false;
+				that.nomore = false;
+				app.post('ApiLuntan/detail', {
+					pagenum: pagenum,
+					id: that.id
+				}, function(res) {
+					that.loading = false;
+					if(res.datalist) {
+						res.datalist.forEach((item,index)=>{
+							item.plShow = false;
+						})
+					}
+
+					var data = res.datalist;
+					that.info = res;
+					if (pagenum == 1) {
+						if(that.info.status == 1 && that.info.detail.is_del == 1) {
+							that.hintShow = true
+							that.hintTime = setTimeout(() => {
+								that.hintShow = false
+								uni.navigateBack()
+							}, 2000)
+							return
+						}
+						that.mid = res.mid;
+						that.datalist = res.datalist;
+						that.plcount = res.plcount;
+						that.iszan = res.iszan;
+						that.detail = res.detail;
+						that.myscore = res.myscore;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+						that.loaded({
+							title: res.detail.content,
+							pic: res.detail.pics[0]
+						});
+							console.log("ccccccc",that.datalist)
+					} else {
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var datalist = that.datalist;
+							var newdata = datalist.concat(data);
+							that.datalist = newdata;
+						}
+					}
+				});
+			},
+			zan: function(e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id;
+				app.post("ApiLuntan/zan", {
+					id: id
+				}, function(res) {
+					if (res.type == 0) {
+						//取消点赞
+						var iszan = 0;
+					} else {
+						var iszan = 1;
+					}
+					that.iszan = iszan;
+					that.detail.zan = res.zancount;
+				});
+			},
+			pzan: function(e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id;
+				var index = e.currentTarget.dataset.index;
+				var datalist = that.datalist;
+				app.post("ApiLuntan/pzan", {
+					id: id
+				}, function(res) {
+					if (res.type == 0) {
+						//取消点赞
+						var iszan = 0;
+					} else {
+						var iszan = 1;
+					}
+					datalist[index].iszan = iszan;
+					datalist[index].zan = res.zancount;
+					that.datalist = datalist;
+				});
+			},
+			showpinglun: function() {},
+			deltie: function(e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id;
+				app.confirm('确定要删除吗?', function() {
+					app.post("ApiLuntan/deltie", {
+						id: id
+					}, function(res) {
+						app.success(res.msg);
+						setTimeout(function() {
+							app.goback(true);
+						}, 1000);
+					});
+				});
+			},
+			delpinglun: function(e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id;
+				app.confirm('确定要删除吗?', function() {
+					app.post("ApiLuntan/delpinglun", {
+						id: id
+					}, function(res) {
+						app.success(res.msg);
+						setTimeout(function() {
+							that.onLoad();
+						}, 1000);
+					});
+				});
+			},
+			delplreply: function(e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id;
+				app.confirm('确定要删除吗?', function() {
+					app.post("ApiLuntan/delplreply", {
+						id: id
+					}, function(res) {
+						app.success(res.msg);
+						setTimeout(function() {
+							that.onLoad();
+						}, 1000);
+					});
+				});
+			}
+		}
+	};
+</script>
+<style lang="scss">
+.container {
+	background: #FFFFFF;
+	padding-bottom: calc(160rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
+}
+.pages-bd {
+	padding: 0 32rpx;
+}
+	.topic-list {
+		flex-wrap: wrap;
+		margin-bottom: 10rpx;
+		&__item {
+			background: #F6F6F6;
+			border-radius: 4rpx;
+			font-size: 32rpx;
+			padding: 8rpx;
+			margin: 0 20rpx 10rpx 0;
+			.icon-box {
+				flex-shrink: 0;
+				background: radial-gradient(#dcf5eb,#e9fdf6);
+				border-radius: 50%;
+				width: 34rpx;
+				height: 34rpx;
+				margin-right: 8rpx;
+			}
+			.icon{
+				font-size: 26rpx;
+				color: #0A5D3B;
+			}
+			.item-name {
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #666666;
+				line-height: 34rpx;
+			}
+		}
+	}
+	.issue-time {
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 34rpx;
+	}
+	.shop-scroll {
+		padding-top: 86rpx;
+		position: relative;
+		&::before {
+			content: "";
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 48rpx;
+			border-top: 1rpx solid #EBEBEB;
+		}
+	}
+	.shop-list {
+		white-space: nowrap;
+		& ::-webkit-scrollbar {
+			display: none;
+		}
+		&__item {
+			width: 100%;
+			flex-shrink: 0;
+			box-sizing: border-box;
+			background: rgba($color: #000000, $alpha: 0.02);
+			border-radius: 4rpx;
+			overflow: hidden;
+			padding-right: 8rpx;
+			&.amount-a {
+				flex: 1;
+			}
+			&.amount-b {
+				width: 296rpx;
+			}
+			&:not(:last-child) {
+				margin-right: 20rpx;
+			}
+			.item-hd {
+				width: 88rpx;
+				height: 88rpx;
+				flex-shrink: 0;
+				margin-right: 16rpx;
+			}
+			.item-bd {
+				flex: 1;
+				padding-top: 8rpx;
+				&__name {
+					font-size: 24rpx;
+					color: #333333;
+					line-height: 34rpx;
+				}
+				&__price {
+					margin-top: 4rpx;
+					font-size: 28rpx;
+					font-weight: bold;
+					color: #ED5925;
+					line-height: 40rpx;
+					.symbol {
+						font-size: 22rpx;
+						height: 32rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.note-info {
+		padding-bottom: 20rpx;
+		color: #333333;
+		&__title {
+			font-weight: bold;
+			line-height: 44rpx;
+			font-size: 32rpx;
+			margin-bottom: 26rpx;
+		}
+		&__txt {
+			font-size: 32rpx;
+			line-height: 50rpx;
+		}
+	}
+
+	.info_box {
+		padding: 28rpx 0;
+
+		.left {
+			display: flex;
+			align-items: center;
+			font-size: 28rpx;
+			font-weight: bpld;
+			color: #333333;
+			line-height: 40rpx;
+			image {
+				width: 66rpx;
+				height: 66rpx;
+				border-radius: 50rpx;
+				margin-right: 16rpx;
+
+			}
+		}
+		.right-d {
+			width: 36rpx;
+			height: 30rpx;
+			// padding: 10rpx;
+			margin: 0;
+			// border-radius: 80rpx;
+			.d1 {
+				width: 100%;
+				height: 2rpx;
+				background-color: #999999;
+			}
+		}
+
+		.right {
+			width: 120rpx;
+			height: 52rpx;
+			background: linear-gradient(to right,#00AE68 0%,#096742 100%);
+			border-radius: 26rpx;
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 52rpx;
+			text-align: center;
+			&.isfollow {
+				background: none;
+				color: #0A5D3B;
+					position: relative;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 0;
+						right: 0;
+						top: 0;
+						bottom: 0;
+						border: 1px solid #0A5D3B;
+						border-radius: 26rpx;
+					}
+			}
+		}
+	}
+	
+	.comment-list {
+		margin-top: 56rpx;
+		&__hd {
+			font-size: 28rpx;
+			color: #666666;
+			line-height: 40rpx;
+			margin-bottom: 24rpx;
+		}
+	}
+	.comment-item {
+		&:not(:first-child) {
+			padding-top: 60rpx;
+			position: relative;
+			&::before {
+				content: "";
+				position: absolute;
+				border-top: 1rpx solid #EBEBEB;
+				top: 32rpx;
+				right: -32rpx;
+				left: 90rpx;
+				transform: scaleY(0.5);
+			}
+		}
+		&__hd {
+			width: 68rpx;
+			height: 68rpx;
+			border-radius: 50%;
+			overflow: hidden;
+			flex-shrink: 0;
+			margin-right: 22rpx;
+			&-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		&__bd {
+			flex: 1;
+		}
+		&__name {
+			font-size: 28rpx;
+			color: #999999;
+			line-height: 40rpx;
+		}
+		&__txt {
+			margin-top: 4rpx;
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+		}
+		&__time {
+			font-size: 22rpx;
+			color: #999999;
+			line-height: 32rpx;
+		}
+		.reply-item {
+			margin-bottom: 20rpx;
+			&__hd {
+				flex-shrink: 0;
+				width: 48rpx;
+				height: 48rpx;
+				border-radius: 50%;
+				margin-right: 16rpx;
+			}
+			&__bd {
+				flex: 1;
+				font-size: 28rpx;
+				line-height: 40rpx;
+			}
+			&__name {
+				color: #999999;
+				margin-bottom: 4rpx;
+			}
+			&__txt {
+				color: #333333;
+				word-break: break-word;
+			}
+			&__time {
+				font-size: 22rpx;
+				color: #999999;
+				line-height: 32rpx;
+			}
+			&__del {
+				font-size: 20rpx;
+				color: #0A5D3B;
+				cursor: pointer;
+			}
+		}
+		&__more {
+			margin-top: 12rpx;
+			.more-reply {
+				color: #0A5D3B;
+				font-size: 24rpx
+			}
+			.more-txt,.more-del {
+				cursor: pointer;
+			}
+			.more-del {
+				margin-left: 20rpx;
+			}
+			.more-praise {
+				color: #333333;
+				&__img {
+					width: 30rpx;
+					height: 30rpx;
+					margin-right: 16rpx
+				}
+			}
+		}
+		.plShow-txt {
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #0A5D3B;
+			line-height: 40rpx;
+			margin-top: -4rpx;
+		}
+	}
+	.comment-add {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 24rpx 24rpx;		
+		padding-bottom: calc(24rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+		background: #FFFFFF;
+		&__inp {
+			background: #F6F6F6;
+			flex: 1;
+			min-width: 240rpx;
+			height: 68rpx;
+			border-radius: 34rpx;
+			padding: 14rpx 24rpx;
+			font-size: 24rpx;
+			color: #666666;
+			line-height: 40rpx;
+			flex-shrink: 0;
+			.icon-qianbi {
+				font-size: 30rpx;
+				flex-shrink: 0;
+				margin-right: 12rpx;
+			}
+		}
+		&__info {
+			flex: 1;
+			justify-content: flex-end;
+			.info-item {
+				margin-left: 16rpx;
+				.iconfont {
+					font-size: 40rpx;
+					&.icon-fenxiang {
+						font-size: 34rpx;
+					}
+				}
+			}
+			.info-txt {
+				margin-left: 8rpx;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #333333;
+				line-height: 34rpx;
+			}
+		}
+	}
+
+	// 分享弹框
+	.sharetypecontent {
+		border-radius: 20rpx;
+		height: 250rpx;
+		width: 710rpx;
+		margin: 20rpx;
+		display: flex;
+		padding: 50rpx;
+		align-items: flex-end
+	}
+	
+	.sharetypecontent .f1 {
+		color: #51c332;
+		width: 50%;
+		height: 150rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background: #fff;
+		font-size: 28rpx;
+		border: 0
+	}
+	
+	.sharetypecontent button::after {
+		border: 0
+	}
+	
+	.sharetypecontent .f1 .img {
+		width: 90rpx;
+		height: 90rpx
+	}
+	
+	.sharetypecontent .f2 {
+		color: #51c332;
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+	
+	.sharetypecontent .f2 .img {
+		width: 90rpx;
+		height: 90rpx
+	}
+	
+	.sharetypecontent .t1 {
+		height: 60rpx;
+		line-height: 60rpx;
+		color: #666
+	}
+	.popup__container {
+		border-radius: 20rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: auto;
+		z-index: 1000;
+		background: #fff
+	}
+	.popupshare__close2 {
+		position: absolute;
+		top: 10rpx;
+		right: 10rpx;
+		z-index: 1000;
+		width: 50rpx;
+		height: 50rpx;
+		padding: 10rpx;
+	}
+	.popup__overlay {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 11;
+		opacity: 0.3;
+		background: #000
+	}
+	
+	.popup__modal {
+		width: 100%;
+		position: absolute;
+		bottom: 0;
+		color: #3d4145;
+		overflow-x: hidden;
+		overflow-y: hidden;
+		opacity: 1;
+		padding-bottom: 20rpx;
+		background: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+		z-index: 12;
+		min-height: 600rpx;
+		max-height: 1000rpx;
+	}
+	
+	.popup__title {
+		text-align: center;
+		padding: 30rpx;
+		position: relative;
+		position: relative
+	}
+	
+	.popup__title-text {
+		font-size: 32rpx
+	}
+	
+	.popup__close {
+		position: absolute;
+		top: 34rpx;
+		right: 34rpx
+	}
+	
+	.popup__content {
+		width: 100%;
+		max-height: 880rpx;
+		overflow-y: scroll;
+		padding: 20rpx 0;
+	}
+	
+	.posterDialog {
+		// border-radius: 20rpx;
+		position: fixed;
+		z-index: 1000;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.8);
+		top: var(--window-top);
+		left: 0
+	}
+
+	.posterDialog .main {
+		width: 80%;
+		margin: 60rpx 10% 30rpx 10%;
+		background: #fff;
+		position: relative;
+		border-radius: 20rpx
+	}
+
+	.posterDialog .close {
+		position: absolute;
+		padding: 20rpx;
+		top: 0;
+		right: 0
+	}
+
+	.posterDialog .close .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.posterDialog .content {
+		width: 100%;
+		padding: 70rpx 20rpx 30rpx 20rpx;
+		color: #333;
+		font-size: 30rpx;
+		text-align: center
+	}
+
+	.posterDialog .content .img {
+		width: 540rpx;
+		height: 960rpx
+	}
+	
+	// 提示弹框
+	.hitn-n {
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		background-color: #7F7F7F;
+		z-index: 996;
+		.hint-bx {
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			z-index: 6;
+			.hint-img {
+				width: 600rpx;
+			}
+			
+			.content {
+				width: 100%;
+				top: 180rpx;
+				left: 0;
+				.title {
+					font-size: 36rpx;
+				}
+				
+				.text {
+					margin-top: 40rpx;
+					color: #666;
+				}
+			}
+		}
+	}
+</style>
diff --git a/activity/luntan/fatie.vue b/activity/luntan/fatie.vue
new file mode 100644
index 0000000..deed96b
--- /dev/null
+++ b/activity/luntan/fatie.vue
@@ -0,0 +1,253 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="formsubmit">
+		<view class="st_box">
+			<view class="st_title flex-y-center">
+				<view @tap="goback" style="width:100rpx"><image :src="event_rul +'/static/img/static/img/goback.jpg'"></image></view>
+				<view style="margin-right:40%">我要发帖</view>
+
+			</view>
+			<view class="st_form">
+				<view v-if="cateArr">
+					<picker @change="cateChange" :value="cindex" :range="cateArr" style="height:80rpx;line-height:80rpx;border-bottom:1px solid #EEEEEE;font-size:18px">
+						<view class="picker">{{cindex==-1? '请选择发帖类型' : cateArr[cindex]}}</view>
+					</picker>
+				</view>
+				<!-- <view v-if="cateArr">
+					<picker @change="cateChange" :value="cindex" :range="cateArr" style="height:80rpx;line-height:80rpx;border-bottom:1px solid #EEEEEE;font-size:18px">
+						<view class="picker">{{cindex==-1? '请选择曝光标签' : cateArr[cindex]}}</view>
+					</picker>
+				</view> -->
+				<view><textarea placeholder="输入内容" name="content" maxlength="-1"></textarea></view>
+				
+				<view class="uploadbtn_ziti1">
+					插入图片
+				</view>
+				<view class="flex" style="flex-wrap:wrap;padding-top:20rpx;">
+					<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" @tap="xuanzhuan" :data-index="index" data-field="pics"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" v-if="pics.length<9">
+						
+					</view>
+					
+				</view>
+				
+				<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+			
+			<view class="uploadbtn_ziti2">
+				插入视频
+			</view>
+				<view class="flex-y-center" style="width:100%;padding:20rpx 0;margin-top:20rpx;">
+					<image :src="event_rul +'/static/img/static/img/uploadvideo.png'" style="width:200rpx;height:200rpx;background:#eee;" @tap="uploadvideo"></image><text v-if="video" style="padding-left:20rpx;color:#333">已上传短视频</text></view>
+				<input type="text" hidden="true" name="video" :value="video" maxlength="-1"></input>
+			</view>
+		</view>
+		<view class="st_title flex-y-center">
+			<button form-type="submit">发表</button>
+		</view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		datalist: [],
+		content_pic: [],
+		pagenum: 1,
+		cateArr: [],
+		cindex: -1,
+		pics:[],
+		video: '',
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiLuntan/fatie', {}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.clist = res.clist;
+				var clist = res.clist;
+				if (clist.length > 0) {
+					var cateArr = [];
+					for (var i in clist) {
+						if (that.opt && that.opt.cid == clist[i].id) {
+							that.cindex = i;
+						}
+						cateArr.push(clist[i].name);
+					}
+				} else {
+					cateArr = false;
+				}
+				that.cateArr = cateArr
+				that.loaded();
+			});
+		},
+    cateChange: function (e) {
+      this.cindex = e.detail.value;
+    },
+    formsubmit: function (e) {
+      var that = this;
+      console.log(e);
+      var clist = that.clist;
+      if (clist.length > 0) {
+        if (that.cindex == -1) {
+          app.error('请选择分类');
+          return false;
+        }
+        var cid = clist[that.cindex].id;
+      } else {
+        var cid = 0;
+      }
+      var formdata = e.detail.value;
+      var content = formdata.content;
+      var pics = formdata.pics;
+      var video = formdata.video;
+      if (content == '' && pics == '') {
+        app.error('请输入内容');
+        return false;
+      }
+      app.post('ApiLuntan/fatie', {cid: cid,pics: pics,content: content,video: video}, function (res) {
+        app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+    uploadvideo: function () {
+      var that = this;
+      console.log(11);
+      uni.chooseVideo({
+        sourceType: ['album', 'camera'],
+        maxDuration: 60,
+        success: function (res) {
+          var tempFilePath = res.tempFilePath;
+          app.showLoading('上传中');
+          uni.uploadFile({
+            url: app.globalData.baseurl + 'ApiImageupload/uploadImg/aid/' + app.globalData.aid + '/platform/' + app.globalData.platform + '/session_id/' + app.globalData.session_id,
+            filePath: tempFilePath,
+            name: 'file',
+            success: function (res) {
+              app.showLoading(false);
+              var data = JSON.parse(res.data);
+
+              if (data.status == 1) {
+                that.video = data.url;
+              } else {
+                app.alert(data.msg);
+              }
+            },
+            fail: function (res) {
+              app.showLoading(false);
+              app.alert(res.errMsg);
+            }
+          });
+        },
+        fail: function (res) {
+          console.log(res); //alert(res.errMsg);
+        }
+      });
+    },
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+page{background:#f7f7f7}
+.st_box{ padding: 20rpx 0 }
+.st_title{ display: flex; justify-content: space-between;padding:24rpx;  }
+.st_title1{ display: flex; justify-content: space-between;padding:24rpx;border-bottom: 1px solid #D0D0D0  }
+.st_title image{width: 18rpx;height:32rpx}
+.st_title text{ color:#242424; font-size: 36rpx}
+/* .st_title button{ background: #31C88E; border-radius:6rpx; line-height: 48rpx;border: none; padding:0 20rpx ;color:#fff;margin:0} */
+
+
+.st_title button{
+    background: #1658c6;
+    border-radius: 3px;
+    line-height: 24px;
+    border: none;
+    padding: 0 10px;
+    color: #fff;
+    font-size: 20px;
+    text-align: center;
+    /* margin: 0; */
+    width: 300px;
+    display: flex;
+    height: 50px;
+    justify-content: center;
+    align-items: center;}
+
+
+
+.st_form{ padding: 24rpx;background: #ffffff;margin: 10px;border-radius: 15px;}
+.st_form input{ width: 100%;height: 120rpx; border: none;border-bottom:1px solid #EEEEEE;}
+.st_form input::-webkit-input-placeholder { /* WebKit browsers */ color:    #BBBBBB; font-size: 24rpx}
+.st_form textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;border-bottom:1px solid #EEEEEE;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+.uploadbtn_ziti1{height:30rpx; line-height: 30rpx;font-size:30rpx; margin-top: 20rpx;}
+.uploadbtn_ziti2{height:30rpx; line-height: 30rpx;font-size:30rpx; padding-top: 20rpx; margin-top: 20rpx;border-top:1px solid #EEEEEE;}
+</style>
\ No newline at end of file
diff --git a/activity/luntan/ltlist.vue b/activity/luntan/ltlist.vue
new file mode 100644
index 0000000..9e5a586
--- /dev/null
+++ b/activity/luntan/ltlist.vue
@@ -0,0 +1,188 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="搜索感兴趣的帖子" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm"></input>
+				</view>
+			</view>
+		<view class="container2">
+			<image :src="banner" style="width:100%;height:auto" mode="widthFix" v-if="banner"></image>
+			<view class="datalist">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="item" @tap="goto" :data-url="'detail?id=' + item.id">
+					<view class="top">
+						<image :src="item.headimg" class="f1"></image>
+						<view class="f2">
+							<view class="t1">{{item.nickname}}</view>
+							<view class="t2">{{item.showtime}}</view>
+						</view>
+					</view>
+					<view class="con">
+						<view class="f1"><text style="white-space:pre-wrap;">{{item.content}}</text></view>
+						<view class="f2" v-if="item.pics">
+							<image v-for="(pic, idx) in item.pics" :key="idx" :src="pic" mode="widthFix" style="height:auto"></image>
+						</view>
+						<video class="video" id="video" :src="item.video" v-if="item.video" @tap.stop="playvideo"></video>
+					</view>
+					<view class="bot">
+						<view class="f1"><image :src="event_rul +'/static/img/static/img/lt_read.png'" style="margin-top:0"></image>{{item.readcount}}</view>
+						<view class="f1" style="margin-left:60rpx;"><image :src="event_rul +'/static/img/static/img/lt_pinglun.png'"></image>{{item.plcount}}</view>
+						<view class="f2"></view>
+						<view class="f3" @tap.stop="zan" :data-id="item.id" :data-index="index"><image :src="event_rul +'/static/img/static/img/lt_like' + (item['iszan']==0?'':'2') + '.png'"></image>{{item.zan}}</view>
+					</view>
+				</view>
+			</block>
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+			</view>
+		</view>
+		<view class="covermy" :class="menuindex>-1?'tabbarbot':'notabbarbot'" @tap="goto" :data-url="'fatie?cid=' + cid"><image :src="pre_url+'/static/img/lt_fatie.png'"></image></view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		cid:'',
+		datalist: [],
+		pagenum: 1,
+		keyword: '',
+		nomore: false,
+		nodata: false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.cid = this.opt.cid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+      that.loading = true;
+      app.post('ApiLuntan/ltlist', {cid: that.cid,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+        that.loaddingmore = false;
+        var data = res.datalist;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					uni.setNavigationBarTitle({
+						title: res.title
+					});
+					that.pernum = res.pernum;
+					that.datalist = res.datalist;
+					that.banner = res.banner;
+					that.title = res.title;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.getdata();
+    },
+    zan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var index = e.currentTarget.dataset.index;
+      var datalist = that.datalist;
+      app.post("ApiLuntan/zan", {id: id}, function (res) {
+        if (res.type == 0) {
+          //取消点赞
+          datalist[index].iszan = 0;
+          datalist[index].zan = datalist[index].zan - 1;
+        } else {
+          datalist[index].iszan = 1;
+          datalist[index].zan = datalist[index].zan + 1;
+        }
+        that.datalist = datalist;
+      });
+    },
+    playvideo: function () {}
+  }
+};
+</script>
+<style>
+.container2{width:100%;padding:20rpx;background:#fff;}
+
+.topsearch{width:100%;padding:20rpx 20rpx;margin-bottom:10rpx;margin-bottom:10rpx;background:#fff}
+.topsearch .f1{height:70rpx;border-radius:35rpx;border:0;background-color:#f5f5f5;flex:1}
+.topsearch .f1 image{width:30rpx;height:30rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+
+.navbox{background: #fff;height: auto;overflow: hidden;}
+.nav_li{width:25%;text-align: center;box-sizing: border-box;padding:30rpx 0 10rpx;float: left;color:#222;font-size:24rpx}
+.nav_li image{width:80rpx;height: 80rpx;margin-bottom:10rpx;}
+
+.listtitle{width:100%;padding:0 24rpx;color:#222;font-weight:bold;font-size:32rpx;height:60rpx;line-height:60rpx}
+.datalist{width:100%;padding:0 24rpx;}
+.datalist .item{width:100%;display:flex;flex-direction:column;padding:24rpx 0;border-bottom:1px solid #f1f1f1}
+.datalist .item .top{width:100%;display:flex;align-items:center}
+.datalist .item .top .f1{width:80rpx;height:80rpx;border-radius:50%;margin-right:16rpx}
+.datalist .item .top .f2 .t1{color:#222;font-weight:bold;font-size:28rpx}
+.datalist .item .top .f2 .t2{color:#bbb;font-size:24rpx}
+.datalist .item .con{width:100%;padding:24rpx 0;display:flex;flex-direction:column;color:#000}
+.datalist .item .con .f2{margin-top:10rpx;display:flex;flex-wrap:wrap}
+.datalist .item .con .f2 image{width:31%;margin-right:2%;margin-bottom:10rpx;border-radius:8rpx}
+.datalist .item .con .video{width:80%;height:300rpx;margin-top:20rpx}
+.datalist .item .bot{width:100%;display:flex;align-items:center;color:#222222;font-size:28rpx}
+.datalist .item .bot .f1{display:flex;align-items:center;font-weight:bold}
+.datalist .item .bot .f1 image{width:36rpx;height:36rpx;margin-right:16rpx;margin-top:2px}
+.datalist .item .bot .f2{flex:1;}
+.datalist .item .bot .f3{display:flex;align-items:center;font-weight:bold}
+.datalist .item .bot .f3 image{width:40rpx;height:40rpx;margin-right:16rpx}
+.datalist .item .bot .btn2{color:#fff;background:#FE1A29;border:1px solid #FE1A29;padding:6rpx 40rpx;font-size:24rpx;border-radius:40rpx;margin-left:16rpx}
+
+.covermy{position:fixed;z-index:99999;bottom:0;right:0;width:130rpx;height:130rpx;box-sizing:content-box}
+.covermy image{width:100%;height:100%}
+
+.nomore-footer-tips{background:#fff!important}
+</style>
\ No newline at end of file
diff --git a/activity/luntan/pinglun.vue b/activity/luntan/pinglun.vue
new file mode 100644
index 0000000..1ac7084
--- /dev/null
+++ b/activity/luntan/pinglun.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<view class="box2">
+		<view class="header">
+			<view class="f1" @tap="goback"><text class="fa fa-angle-left"></text></view>
+			<view class="f2" id="box2_title">{{title}}</view>
+			<view class="f3" @tap="subpinglun">发表</view>
+		</view>
+		<textarea style="width:100%;height:50vh" placeholder="写评论..." id="editcontent" :value="content" @input="setcontent"></textarea>
+		<view style="height:100rpx"></view>
+		<view class="bottom">
+			<view @tap="showface"><image :src="event_rul + '/static/img/static/img/emote.png'"></image></view>
+		</view>
+		<wxface v-if="faceshow" @selectface="selectface"></wxface>
+	</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		title: '发表评论',
+		type: 0,
+		id: '',
+		hfid: '',
+		faceshow: false,
+		content: '',
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type
+		this.id = this.opt.id
+		this.hfid = this.opt.hfid
+    if (this.hfid) {
+      this.title = '回复评论';
+    }
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata(){
+			this.loaded();
+		},
+    showface: function () {
+      this.faceshow = !this.faceshow;
+    },
+    selectface: function (face) {
+      var content = this.content + face;
+      this.faceshow = false;
+      this.content = content;
+    },
+    setcontent: function (e) {
+      this.content = e.detail.value;
+    },
+    subpinglun: function () {
+      var that = this;
+      var id = that.id;
+      var type = that.type;
+      var hfid = that.hfid;
+      var content = that.content;
+
+      if (content == '') {
+        app.error('请输入评论内容');
+        return;
+      }
+      app.showLoading('提交中');
+      app.post("ApiLuntan/subpinglun", {id: id,type: type,hfid: hfid,content: content}, function (res) {
+        app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+/* m/dietitian/detail.wxss */
+page{ background: #fff}
+
+.box2{background:#fff;height:100vh;}
+.box2 .header{width:100%;height:92rpx;line-height:92rpx;background:#fafafa;border-bottom:1px solid #cfcfcf;display:flex;text-align:center}
+.box2 .header .f1{width:80rpx;font-size:44rpx}
+.box2 .header .f2{flex:1;font-size:32rpx;color:#111}
+.box2 .header .f3{width:100rpx;font-size:32rpx;color:#1b9af4}
+.box2 textarea{width:100%;height:80vh;border:0;color:#333;padding:20rpx;font-size:32rpx}
+.box2 .bottom{width:100%;max-width:750px;margin:0 auto;position:fixed;display:flex;align-items:center;bottom:0;left:0;right:0;height:100rpx;background:#fff;z-index:996;border-top:1px solid #f7f7f7;padding:0 20rpx}
+.box2 .bottom image{width:60rpx;height:60rpx}
+
+.plbox{width:100%;padding:40rpx 20rpx}
+.plbox_title{font-size:28rpx;height:6rpx;line-height:6rpx;margin-bottom:20rpx}
+.plbox_title .t1{color:#000;font-weight:bold}
+.plbox_content .plcontent{vertical-align: middle;color:#111}
+.plbox_content .plcontent image{ width:44rpx;height:44rpx;vertical-align: inherit;}
+.plbox_content .item1{width:100%;margin-bottom:20rpx}
+.plbox_content .item1 .f1{width:80rpx;}
+.plbox_content .item1 .f1 image{width:60rpx;height:60rpx;border-radius:50%}
+.plbox_content .item1 .f2{flex:1}
+.plbox_content .item1 .f2 .t1{}
+.plbox_content .item1 .f2 .t2{color:#000;margin:10rpx 0;line-height:60rpx;}
+.plbox_content .item1 .f2 .t3{color:#999;font-size:20rpx}
+.plbox_content .item1 .f2 .pzan image{width:32rpx;height:32rpx;margin-right:2px}
+.plbox_content .item1 .f2 .phuifu{margin-left:6px;color:#507DAF}
+.plbox_content .relist{width:100%;background:#f5f5f5;padding:4rpx 20rpx;margin-bottom:20rpx}
+.plbox_content .relist .item2{font-size:24rpx;margin-bottom:10rpx}
+
+.copyright{display:none}
+</style>
\ No newline at end of file
diff --git a/activity/peisong/common.css b/activity/peisong/common.css
new file mode 100644
index 0000000..bdf3c75
--- /dev/null
+++ b/activity/peisong/common.css
@@ -0,0 +1,12 @@
+.tabbar{height: auto; position: relative;}
+.tabbar-icon {width: 50rpx;height: 50rpx;}
+.tabbar-bar {display: flex;flex-direction: row;width: 100%;height:100rpx;position: fixed;bottom: 0;padding:10rpx 0 0 0;background: #fff;font-size: 24rpx;color: #999;border-top: 1px solid #e5e5e5;z-index: 8;box-sizing:content-box}
+.tabbar-item {flex: 1;text-align: center;overflow: hidden;}
+.tabbar-image-box {height: 54rpx;margin-bottom: 4rpx;}
+.tabbar-text {line-height: 30rpx;font-size: 24rpx;color:#222222}
+.tabbar-text.active{color:#06A051}
+.tabbar-bot{height:110rpx;width:100%;box-sizing:content-box}
+@supports(bottom: env(safe-area-inset-bottom)){
+	.tabbar-bot{padding-bottom:env(safe-area-inset-bottom);}
+	.tabbar-bar{padding-bottom:env(safe-area-inset-bottom);}
+}
\ No newline at end of file
diff --git a/activity/peisong/dating.vue b/activity/peisong/dating.vue
new file mode 100644
index 0000000..75b8a65
--- /dev/null
+++ b/activity/peisong/dating.vue
@@ -0,0 +1,321 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view>
+			<view class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<input class="search-text" placeholder="搜索商家" placeholder-style="color:#aaa;font-size:24rpx" @confirm="searchConfirm"/>
+				</view>
+			</view>
+			<block v-for="(item, index) in datalist" :key="item.id">
+			<view class="order-box" @tap="goto" :data-url="'orderdetail?id=' + item.id">
+				<view class="head">
+					
+					<view class="f1" v-if="item.leftminute>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">{{item.leftminute}}分钟内</text> 送达</view>
+					<view class="f1" v-else><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已超时<text class="t1" style="margin-left:10rpx">{{-item.leftminute}}分钟</text></view>
+					<view class="flex1"></view>
+					<view class="f2"><text class="t1">{{item.ticheng}}</text>元</view>
+				</view>
+				<view class="content">
+					<view class="f1">
+						<view class="t1"><text class="x1">{{item.juli}}</text><text class="x2">{{item.juli_unit}}</text></view>
+						<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+						<view class="t3"><text class="x1">{{item.juli2}}</text><text class="x2">{{item.juli2_unit}}</text></view>
+					</view>
+					<view class="f2">
+						<view class="t1">{{item.binfo.name}}</view>
+						<view class="t2">{{item.binfo.address}}</view>
+						<view class="t3">{{item.orderinfo.address}}</view>
+						<view class="t2">{{item.orderinfo.area}}</view>
+					</view>
+					<view class="f3" @tap.stop="daohang" :data-index="index"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+				</view>
+				<view class="op">
+					<view class="flex1"></view>
+					<view class="btn1" @tap.stop="qiangdan" :data-id="item.id">抢单</view>
+				</view>
+			</view>
+			</block>
+		
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+		<!-- <view style="width:100%;height:120rpx"></view> -->
+		<!-- <view class="bottom">
+			<view class="my">
+				<image :src="event_rul +'/static/img/static/img/my.png'" class="img"/>
+				<text>我的</text>
+			</view>
+			<view class="btn1" @tap="setpsst" data-st="1" v-if="psuser.status==0">暂停接单中</view>
+			<view class="btn2" :style="{background:t('color1')}" @tap="setpsst" data-st="0" v-if="psuser.status==1">开启接单中</view>
+		</view> -->
+		
+		<view class="tabbar">
+			<view class="tabbar-bot"></view>
+			<view class="tabbar-bar" style="background-color:#ffffff">
+				<view @tap="goto" data-url="dating" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/home2.png'"></image>
+					</view>
+					<view class="tabbar-text active">大厅</view>
+				</view>
+				<view @tap="goto" data-url="orderlist" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/order.png'"></image>
+					</view>
+					<view class="tabbar-text">订单</view>
+				</view>
+				<view @tap="goto" data-url="orderlist?st=4" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/orderwc.png'"></image>
+					</view>
+					<view class="tabbar-text">已完成</view>
+				</view>
+				<view @tap="goto" data-url="my" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/my.png'"></image>
+					</view>
+					<view class="tabbar-text">我的</view>
+				</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<view style="display:none">{{timestamp}}</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata: false,
+		interval1:null,
+		timestamp:'',
+		nowtime:'',
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onUnload:function(){
+		clearInterval(this.interval1);
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiPeisong/dating', {st: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+				if(res.status==0){
+					app.alert(res.msg);
+					return;
+				}
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+					that.nowtime = res.nowtime
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+					that.updatemylocation(false);
+					clearInterval(that.interval1);
+					that.interval1 = setInterval(function(){
+						that.updatemylocation(true);
+						that.nowtime = that.nowtime + 10;
+					},10000)
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		updatemylocation:function(needload){
+			console.log('updatemylocation');
+			var that = this;
+			app.getLocation(function(res){
+				var longitude = res.longitude;
+				var latitude = res.latitude;
+				var datalist = that.datalist;
+				for(var i in datalist){
+					var thisdata = datalist[i];
+					var rs = that.getdistance(thisdata.longitude2,thisdata.latitude2,longitude,latitude,1);
+					thisdata.juli2 = rs.juli;
+					thisdata.juli2_unit = rs.unit;
+					thisdata.leftminute = parseInt((thisdata.yujitime - that.nowtime) / 60);
+					datalist[i] = thisdata;
+				}
+				that.datalist = datalist;
+				that.timestamp = parseInt((new Date().getTime())/1000);
+				app.get('ApiPeisong/updatemylocation',{longitude:longitude,latitude:latitude,t:that.timestamp},function(){
+					//if(needload) that.getdata();
+				});
+			});
+		},
+		getdistance: function (lng1, lat1, lng2, lat2) {
+			if(!lat1 || !lng1 || !lat2 || !lng2) return '';
+			var rad1 = lat1 * Math.PI / 180.0;
+			var rad2 = lat2 * Math.PI / 180.0;
+			var a = rad1 - rad2;
+			var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+			var r = 6378137;
+			var juli = r * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(rad1) * Math.cos(rad2) * Math.pow(Math.sin(b / 2), 2)));
+			var unit = 'm';
+			if(juli> 1000){
+				juli = juli/1000;
+				unit = 'km';
+			}
+			juli = juli.toFixed(1);
+			return {juli:juli,unit:unit}
+		},
+    qiangdan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要接单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiPeisong/qiangdan', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		daohang:function(e){
+			var that = this;
+			var index = e.currentTarget.dataset.index;
+			var datainfo = that.datalist[index];
+			uni.showActionSheet({
+        itemList: ['导航到商家', '导航到用户'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) {
+							var longitude = datainfo.longitude
+							var latitude = datainfo.latitude
+							var name = datainfo.binfo.name
+							var address = datainfo.binfo.address
+						}else{
+							var longitude = datainfo.longitude2
+							var latitude = datainfo.latitude2
+							var name = datainfo.orderinfo.address
+							var address = datainfo.orderinfo.address
+						}
+						uni.openLocation({
+							latitude:parseFloat(latitude),
+							longitude:parseFloat(longitude),
+							name:name,
+							address:address,
+							scale: 13,
+							success: function () {
+                console.log('success');
+							},
+							fail:function(res){
+								console.log(res);
+							}
+						})
+					}
+				}
+			});
+		},
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.getdata();
+    },
+    receiveMessage: function (data) {
+			var that = this;
+			if(data.type == 'peisong' || data.type == 'peisong_jiedan') {
+				that.getdata();
+			}
+			return false;
+		}
+  }
+};
+</script>
+<style>
+@import "./common.css";
+.container{ width:100%;display:flex;flex-direction:column}
+.search-container {width: 100%;height:100rpx;padding: 20rpx 23rpx 20rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#222;width: 100%;}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx; margin: 10rpx 0;}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{flex:1;padding:0 20rpx}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:28rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.order-box .op{display:flex;justify-content:flex-end;align-items:center;width:100%; padding:20rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op .btn1{width:100%;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);;height:88rpx;line-height:88rpx;color:#fff;border-radius:10rpx;text-align:center;font-size:32rpx}
+
+</style>
\ No newline at end of file
diff --git a/activity/peisong/moneylog.vue b/activity/peisong/moneylog.vue
new file mode 100644
index 0000000..4186f8d
--- /dev/null
+++ b/activity/peisong/moneylog.vue
@@ -0,0 +1,140 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['余额明细','提现记录']" :itemst="['0','2']" :st="st" :isfixed="true" @changetab="changetab" color1="#06A051"></dd-tab>
+		<view class="content">
+			<block v-if="st==0">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+						<text class="t3">变更后余额: {{item.after}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t2" v-else>{{item.money}}</text>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==2">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			canwithdraw:false,
+			textset:{},
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+			nodata:false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata(true);
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiPeisong/moneylog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.textset = app.globalData.textset;
+					that.canwithdraw = res.canwithdraw;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx;display:flex;flex-direction:column}
+.content{ width:94%;margin:0 3% 20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:20rpx 20rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/activity/peisong/my.vue b/activity/peisong/my.vue
new file mode 100644
index 0000000..905c254
--- /dev/null
+++ b/activity/peisong/my.vue
@@ -0,0 +1,217 @@
+<template>
+<view>
+	<block v-if="isload">
+	<view class="banner">
+			<image :src="psuser.headimg" background-size="cover"/>
+			<view class="info">
+				 <text class="nickname">{{psuser.realname}}</text>
+				 <text>{{psuser.tel}}</text>
+			</view>
+	</view>
+	<view class="contentdata">
+		<view class="custom_field">
+			<view class='item' data-url='orderlist?st=4' @tap='goto'>
+				<text class="t1">累计配送</text>
+				<text class='t2'>{{psuser.totalnum}}份</text>
+			</view>
+			<view class='item'>
+				<text class="t1">总收入</text>
+				<text class='t2'>{{psuser.totalmoney}}元</text>
+			</view>
+			<view class='item'>
+				<text class="t1">好评率</text>
+				<text class='t2'>{{psuser.comment_haopercent}}%</text>
+			</view>
+		</view>
+
+		<view class="listcontent">
+			<view class="list">
+				<view class="item" @tap="goto" data-url="withdraw">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-qianbao.png'"></image></view>
+					<view class="f2">我的钱包</view>
+					<text class="f3">余额：{{psuser.money}}</text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+			<view class="list">
+				<view class="item" @tap="goto" data-url="moneylog">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-zhangdan.png'"></image></view>
+					<view class="f2">账单明细</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+			<!-- <view class="list">
+				<view class="item" @tap="goto" data-url="moneylog">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-order.png'"></image></view>
+					<view class="f2">配送记录</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view> -->
+			<view class="list">
+				<view class="item">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-jiedan.png'"></image></view>
+					<view class="f2">接单状态</view>
+					<text class="f3"><switch value="1" :checked="psuser.status==1?true:false" @change="switchchange"></switch></text>
+				</view>
+			</view>
+			<view class="list">
+				<view class="item" @tap="goto" data-url="setinfo">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-shenfen.png'"></image></view>
+					<view class="f2">提现设置</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+			<view class="list">
+				<view class="item" @tap="goto" data-url="/pages/index/login">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-logout.png'"></image></view>
+					<view class="f2">退出登录</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<view class="tabbar">
+		<view class="tabbar-bot"></view>
+		<view class="tabbar-bar" style="background-color:#ffffff">
+			<view @tap="goto" data-url="dating" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/home.png'"></image>
+				</view>
+				<view class="tabbar-text">大厅</view>
+			</view>
+			<view @tap="goto" data-url="orderlist" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/order.png'"></image>
+				</view>
+				<view class="tabbar-text">订单</view>
+			</view>
+			<view @tap="goto" data-url="orderlist?st=4" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/orderwc.png'"></image>
+				</view>
+				<view class="tabbar-text">已完成</view>
+			</view>
+			<view @tap="goto" data-url="my" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/my2.png'"></image>
+				</view>
+				<view class="tabbar-text active">我的</view>
+			</view>
+		</view>
+	</view>
+	</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+		return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		set:{},
+		psuser:{},
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiPeisong/my', {}, function (res) {
+				that.loading = false;
+				//that.set = res.set;
+				that.psuser = res.psuser;
+				that.loaded();
+			});
+		},
+    switchchange: function (e) {
+      console.log(e);
+      var value = e.detail.value ? 1 : 0;
+      app.post('ApiPeisong/setpsst', {st: value}, function (data) {});
+    },
+    saoyisao: function (d) {
+      var that = this;
+			if(app.globalData.platform == 'h5'){
+				app.alert('请使用微信扫一扫功能扫码核销');return;
+			}else if(app.globalData.platform == 'mp'){
+				var jweixin = require('jweixin-module');
+				jweixin.ready(function () {   //需在用户可能点击分享按钮前就先调用
+					jweixin.scanQRCode({
+						needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+						scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+						success: function (res) {
+							var content = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+							var params = content.split('?')[1];
+							app.goto('/admin/hexiao/hexiao?'+params);
+							//if(content.length == 18 && (/^\d+$/.test(content))){ //是十八位数字 付款码
+							//	location.href = "{:url('shoukuan')}/aid/{$aid}/auth_code/"+content
+							//}else{
+							//	location.href = content;
+							//}
+						}
+					});
+				});
+			}else{
+				uni.scanCode({
+					success: function (res) {
+						console.log(res);
+						var content = res.result;
+						var params = content.split('?')[1];
+						app.goto('/admin/hexiao/hexiao?'+params);
+					}
+				});
+			}
+    }
+  }
+};
+</script>
+<style>
+@import "./common.css";
+.banner{ display:flex;width:100%;height:322rpx;padding:80rpx 32rpx 40rpx 32rpx;color:#fff;position:relative;
+background: linear-gradient(-45deg, #06A051 0%, #03B269 100%);}
+.banner image{ width:120rpx;height:120rpx;border-radius:50%;margin-right:20rpx}
+.banner .info{display:flex;flex:auto;flex-direction:column;padding-top:10rpx}
+.banner .info .nickname{font-size:32rpx;font-weight:bold;padding-bottom:12rpx}
+.banner .set{ width:70rpx;height:100rpx;line-height:100rpx;font-size:40rpx;text-align:center}
+.banner .set image{width:50rpx;height:50rpx;border-radius:0}
+
+.contentdata{display:flex;flex-direction:column;width:100%;padding:0 30rpx;margin-top:-100rpx;position:relative;margin-bottom:20rpx}
+
+.custom_field{display:flex;width:100%;align-items:center;padding:30rpx 8rpx;background:#fff;border-radius:16rpx}
+.custom_field .item{flex:1;display:flex;flex-direction:column;justify-content:center;align-items:center}
+.custom_field .item .t1{color:#666;font-size:26rpx;margin-top:10rpx}
+.custom_field .item .t2{color:#111;font-weight:bold;font-size:36rpx;margin-top:20rpx}
+
+.score{ display:flex;width:100%;align-items:center;padding:10rpx 20rpx;background:#fff;border-top:1px dotted #eee}
+.score .f1 .t2{color:#ff3300}
+
+.list{ width: 100%;background: #fff;margin-top:20rpx;padding:0 20rpx;font-size:30rpx;margin-bottom:20rpx;border-radius:16rpx}
+.list .item{ height:100rpx;display:flex;align-items:center;border-bottom:1px solid #eee}
+.list .item:last-child{border-bottom:0;margin-bottom:20rpx}
+.list .f1{width:50rpx;height:50rpx;line-height:50rpx;display:flex;align-items:center}
+.list .f1 image{ width:44rpx;height:44rpx;}
+.list .f1 span{ width:40rpx;height:40rpx;font-size:40rpx}
+.list .f2{color:#222;font-weight:bold;margin-left:10rpx}
+.list .f3{ color:#06A051;font-size:26rpx;text-align:right;flex:1}
+.list .f4{ width: 40rpx; height: 40rpx;}
+
+switch{transform:scale(.7);}
+</style>
\ No newline at end of file
diff --git a/activity/peisong/orderdetail.vue b/activity/peisong/orderdetail.vue
new file mode 100644
index 0000000..bbcb067
--- /dev/null
+++ b/activity/peisong/orderdetail.vue
@@ -0,0 +1,334 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+
+		<map v-if="psorder.status!=4" class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:psuser.latitude,
+			longitude:psuser.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_qishou.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+		<map v-else class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+
+		<view class="order-box">
+			<view class="head">
+				<view class="f1" v-if="psorder.status==4"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已送达</view>
+				<view class="f1" v-else-if="psorder.leftminute>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">{{psorder.leftminute}}分钟内</text> 送达</view>
+				<view class="f1" v-else><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已超时<text class="t1" style="margin-left:10rpx">{{-psorder.leftminute}}分钟</text></view>
+				<view class="flex1"></view>
+				<view class="f2"><text class="t1">{{psorder.ticheng}}</text>元</view>
+			</view>
+			<view class="content" style="border-bottom:0">
+				<view class="f1">
+					<view class="t1"><text class="x1">{{psorder.juli}}</text><text class="x2">{{psorder.juli_unit}}</text></view>
+					<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+					<view class="t3"><text class="x1">{{psorder.juli2}}</text><text class="x2">{{psorder.juli2_unit}}</text></view>
+				</view>
+				<view class="f2">
+					<view class="t1">{{binfo.name}}</view>
+					<view class="t2">{{binfo.address}}</view>
+					<view class="t3">{{orderinfo.address}}</view>
+						<view class="t2">{{orderinfo.area}}</view>
+				</view>
+				<view class="f3" @tap.stop="daohang"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">商品清单({{orderinfo.procount}})</view>
+			<view v-for="(item, idx) in prolist" :key="idx" class="item">
+				<text class="t1 flex1">{{item.name}} {{item.ggname}}</text>
+				<text class="t2 flex0">￥{{item.sell_price}} ×{{item.num}} </text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="psorder.status!=0">
+			<view class="box-title">配送信息</view>
+			<view class="item">
+				<text class="t1">接单时间</text>
+				<text class="t2">{{date(psorder.starttime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.daodiantime">
+				<text class="t1">到店时间</text>
+				<text class="t2">{{date(psorder.daodiantime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.quhuotime">
+				<text class="t1">取货时间</text>
+				<text class="t2">{{date(psorder.quhuotime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.endtime">
+				<text class="t1">送达时间</text>
+				<text class="t2">{{date(psorder.endtime)}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{date(orderinfo.createtime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{date(orderinfo.paytime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{orderinfo.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{orderinfo.product_price}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{orderinfo.totalprice}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{orderinfo.message ? orderinfo.message : '无'}}</text>
+			</view>
+		</view>
+		<view style="width:100%;height:180rpx"></view>
+		<view class="bottom notabbarbot" v-if="psorder.status!=4">
+			<view class="f1" v-if="psorder.status!=0" @tap="call" :data-tel="orderinfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel1.png'" class="img"/>联系顾客</view>
+			<view class="f2" v-if="psorder.status!=0" @tap="call" :data-tel="binfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel2.png'" class="img"/>联系商家</view>
+			<view class="btn1" @tap="qiangdan" :data-id="psorder.id" v-if="psorder.status==0">立即抢单</view>
+			<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="2" v-if="psorder.status==1">我已到店</view>
+			<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="3" v-if="psorder.status==2">我已取货</view>
+			<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="4" v-if="psorder.status==3">我已送达</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		orderinfo: {},
+		prolist: [],
+		psuser:{},
+		binfo: {},
+		psorder: {},
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiPeisong/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				if(res.status == 0) {
+					app.alert(res.msg);return;
+				}
+				that.orderinfo = res.orderinfo;
+				that.prolist = res.prolist;
+				that.binfo = res.binfo;
+				that.psorder = res.psorder;
+				that.psuser = res.psuser;
+				that.loaded();
+				that.updatemylocation(false);
+				setTimeout(function(){
+					that.updatemylocation(true);
+				},10000)
+			});
+		},
+		updatemylocation:function(needload){
+			var that = this;
+			app.getLocation(function(res){
+				var longitude = res.longitude;
+				var latitude = res.latitude;
+				app.post('ApiPeisong/updatemylocation',{longitude:longitude,latitude:latitude},function(){
+					if(needload) that.getdata();
+				});
+			});
+		},
+    qiangdan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要接单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiPeisong/qiangdan', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+			if(st == 2){
+				var tips = '确定改为已到店吗?';
+			}if(st == 3){
+				var tips = '确定改为已取货吗?';
+			}if(st == 4){
+				var tips = '确定改为已送达吗?';
+			}
+      app.confirm(tips, function () {
+				app.showLoading('提交中');
+        app.post('ApiPeisong/setst', {id: id,st:st}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		openLocation:function(e){
+			var latitude = parseFloat(e.currentTarget.dataset.latitude)
+			var longitude = parseFloat(e.currentTarget.dataset.longitude)
+			var address = e.currentTarget.dataset.address
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+		 })
+		},
+		daohang:function(e){
+			var that = this;
+			var datainfo = that.psorder;
+			var binfo = that.binfo
+			var orderinfo = that.orderinfo
+			uni.showActionSheet({
+        itemList: ['导航到商家', '导航到用户'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) {
+							var longitude = datainfo.longitude
+							var latitude = datainfo.latitude
+							var name = binfo.name
+							var address = binfo.address
+						}else{
+							var longitude = datainfo.longitude2
+							var latitude = datainfo.latitude2
+							var name = orderinfo.address
+							var address = orderinfo.address
+						}
+						console.log(longitude);
+						console.log(latitude);
+						console.log(address);
+						uni.openLocation({
+						 latitude:parseFloat(latitude),
+						 longitude:parseFloat(longitude),
+						 name:name,
+						 address:address,
+						 scale: 13
+						})
+					}
+				}
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		}
+  }
+}
+</script>
+<style>
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx; margin: 10rpx 0;}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx; margin: 10rpx 0;}
+.order-box .content .f2{padding:0 10rpx;}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:28rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+</style>
\ No newline at end of file
diff --git a/activity/peisong/orderlist.vue b/activity/peisong/orderlist.vue
new file mode 100644
index 0000000..317639a
--- /dev/null
+++ b/activity/peisong/orderlist.vue
@@ -0,0 +1,330 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view>
+			<view class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<input class="search-text" placeholder="搜索商家" placeholder-style="color:#aaa;font-size:24rpx" @confirm="searchConfirm"/>
+				</view>
+			</view>
+			<block v-for="(item, index) in datalist" :key="item.id">
+			<view class="order-box" @tap="goto" :data-url="'orderdetail?id=' + item.id">
+				<view class="head">
+					<view class="f1" v-if="item.status==4"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已送达</view>
+					<view class="f1" v-else-if="item.leftminute>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">{{item.leftminute}}分钟内</text> 送达</view>
+					<view class="f1" v-else><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img'"/>已超时<text class="t1" style="margin-left:10rpx">{{-item.leftminute}}分钟</text></view>
+					<view class="flex1"></view>
+					<view class="f2"><text class="t1">{{item.ticheng}}</text>元</view>
+				</view>
+				<view class="content">
+					<view class="f1">
+						<view class="t1"><text class="x1">{{item.juli}}</text><text class="x2">{{item.juli_unit}}</text></view>
+						<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+						<view class="t3"><text class="x1">{{item.juli2}}</text><text class="x2">{{item.juli2_unit}}</text></view>
+					</view>
+					<view class="f2">
+						<view class="t1">{{item.binfo.name}}</view>
+						<view class="t2">{{item.binfo.address}}</view>
+						<view class="t3">{{item.orderinfo.address}}</view>
+						<view class="t2">{{item.orderinfo.area}}</view>
+					</view>
+					<view class="f3" @tap.stop="daohang" :data-index="index"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+				</view>
+				<view class="op">
+					<view class="t1" v-if="item.status==1">已接单，正在赶往商家</view>
+					<view class="t1" v-if="item.status==2">已到店，等待取货</view>
+					<view class="t1" v-if="item.status==3">已取货，正在配送中</view>
+					<view class="t1" v-if="item.status==4">已送达，共用时{{item.useminute}}分钟，配送用时{{item.useminute2}}分钟</view>
+					<view class="flex1"></view>
+					<view class="btn1" @tap.stop="setst" :data-id="item.id" data-st="2" v-if="item.status==1">我已到店</view>
+					<view class="btn1" @tap.stop="setst" :data-id="item.id" data-st="3" v-if="item.status==2">我已取货</view>
+					<view class="btn1" @tap.stop="setst" :data-id="item.id" data-st="4" v-if="item.status==3">我已送达</view>
+				</view>
+			</view>
+			</block>
+		
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+		<!-- <view style="width:100%;height:120rpx"></view> -->
+		<!-- <view class="bottom">
+			<view class="my">
+				<image :src="event_rul +'/static/img/static/img/my.png'" class="img"/>
+				<text>我的</text>
+			</view>
+			<view class="btn1" @tap="setpsst" data-st="1" v-if="psuser.status==0">暂停接单中</view>
+			<view class="btn2" :style="{background:t('color1')}" @tap="setpsst" data-st="0" v-if="psuser.status==1">开启接单中</view>
+		</view> -->
+		
+		<view class="tabbar">
+			<view class="tabbar-bot"></view>
+			<view class="tabbar-bar" style="background-color:#ffffff">
+				<view @tap="goto" data-url="dating" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/home.png'"></image>
+					</view>
+					<view class="tabbar-text">大厅</view>
+				</view>
+				<view @tap="goto" data-url="orderlist" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul + '/static/img/static/peisong/order'+(st!=4?'2':'')+'.png'"></image>
+					</view>
+					<view class="tabbar-text" :class="st!=4?'active':''">订单</view>
+				</view>
+				<view @tap="goto" data-url="orderlist?st=4" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul + '/static/img/static/peisong/orderwc'+(st==4?'2':'')+'.png'"></image>
+					</view>
+					<view class="tabbar-text" :class="st==4?'active':''">已完成</view>
+				</view>
+				<view @tap="goto" data-url="my" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/my.png'"></image>
+					</view>
+					<view class="tabbar-text">我的</view>
+				</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<view style="display:none">{{timestamp}}</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: '11',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata: false,
+		keyword:'',
+		interval1:null,
+		timestamp:'',
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || '11';
+		this.getdata();
+  },
+	onUnload:function(){
+		clearInterval(this.interval1);
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiPeisong/orderlist', {st: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+				if(res.status==0){
+					app.alert(res.msg);
+					return;
+				}
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+					that.nowtime = res.nowtime
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+					that.updatemylocation();
+					clearInterval(that.interval1);
+					that.interval1 = setInterval(function(){
+						that.updatemylocation(true);
+						that.nowtime = that.nowtime + 10;
+					},10000)
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		updatemylocation:function(){
+			var that = this;
+			console.log('updatemylocation');
+			app.getLocation(function(res){
+				var longitude = res.longitude;
+				var latitude = res.latitude;
+				var datalist = that.datalist;
+				for(var i in datalist){
+					var thisdata = datalist[i];
+					var rs = that.getdistance(thisdata.longitude2,thisdata.latitude2,longitude,latitude,1);
+					thisdata.juli2 = rs.juli;
+					thisdata.juli2_unit = rs.unit;
+					thisdata.leftminute = parseInt((thisdata.yujitime - that.nowtime) / 60);
+					datalist[i] = thisdata;
+				}
+				that.datalist = datalist;
+				that.timestamp = parseInt((new Date().getTime())/1000);
+				app.get('ApiPeisong/updatemylocation',{longitude:longitude,latitude:latitude,t:that.timestamp},function(){
+				//	if(needload) that.getdata();
+				});
+			});
+		},
+		getdistance: function (lng1, lat1, lng2, lat2) {
+			if(!lat1 || !lng1 || !lat2 || !lng2) return '';
+			var rad1 = lat1 * Math.PI / 180.0;
+			var rad2 = lat2 * Math.PI / 180.0;
+			var a = rad1 - rad2;
+			var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+			var r = 6378137;
+			var juli = r * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(rad1) * Math.cos(rad2) * Math.pow(Math.sin(b / 2), 2)));
+			var unit = 'm';
+			if(juli> 1000){
+				juli = juli/1000;
+				unit = 'km';
+			}
+			juli = juli.toFixed(1);
+			return {juli:juli,unit:unit}
+		},
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+			if(st == 2){
+				var tips = '确定改为已到店吗?';
+			}if(st == 3){
+				var tips = '确定改为已取货吗?';
+			}if(st == 4){
+				var tips = '确定改为已送达吗?';
+			}
+      app.confirm(tips, function () {
+				app.showLoading('提交中');
+        app.post('ApiPeisong/setst', {id: id,st:st}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		daohang:function(e){
+			var that = this;
+			var index = e.currentTarget.dataset.index;
+			var datainfo = that.datalist[index];
+			uni.showActionSheet({
+        itemList: ['导航到商家', '导航到用户'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) {
+							var longitude = datainfo.longitude
+							var latitude = datainfo.latitude
+							var name = datainfo.binfo.name
+							var address = datainfo.binfo.address
+						}else{
+							var longitude = datainfo.longitude2
+							var latitude = datainfo.latitude2
+							var name = datainfo.orderinfo.address
+							var address = datainfo.orderinfo.address
+						}
+						uni.openLocation({
+							latitude:parseFloat(latitude),
+							longitude:parseFloat(longitude),
+							name:name,
+							address:address,
+							scale: 13,
+							success: function () {
+                console.log('success');
+							},
+							fail:function(res){
+								console.log(res);
+							}
+						})
+					}
+				}
+			});
+		},
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.getdata();
+    },
+  }
+};
+</script>
+<style>
+@import "./common.css";
+.container{ width:100%;display:flex;flex-direction:column}
+.search-container {width: 100%;height:100rpx;padding: 20rpx 23rpx 20rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#222;width: 100%;}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx; margin: 10rpx 0;}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{flex:1;padding:0 20rpx}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:28rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.order-box .op{display:flex;justify-content:flex-end;align-items:center;width:100%; padding:20rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op .t1{color:#06A051;font-weight:bold}
+.order-box .op .btn1{width:200rpx;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);;height:88rpx;line-height:88rpx;color:#fff;border-radius:10rpx;text-align:center;font-size:32rpx}
+
+</style>
\ No newline at end of file
diff --git a/activity/peisong/setaliaccount.vue b/activity/peisong/setaliaccount.vue
new file mode 100644
index 0000000..01ce7ce
--- /dev/null
+++ b/activity/peisong/setaliaccount.vue
@@ -0,0 +1,73 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入支付宝账号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="aliaccount" value=""></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+		//this.getdata();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var aliaccount = formdata.aliaccount
+      if (aliaccount == '') {
+        app.alert('请输入支付宝账号');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {aliaccount:aliaccount}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/activity/peisong/setinfo.vue b/activity/peisong/setinfo.vue
new file mode 100644
index 0000000..6076cfd
--- /dev/null
+++ b/activity/peisong/setinfo.vue
@@ -0,0 +1,159 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<text class="label">微信号</text>
+				<input type="text" class="input" placeholder="请输入微信号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="weixin" :value="userinfo.weixin"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">支付宝账号</text>
+				<input type="text" class="input" placeholder="请输入支付宝账号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="aliaccount" :value="userinfo.aliaccount"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+					<text class="label">开户行</text>
+					<picker class="picker" mode="selector" name="bankname" value="0" :range="banklist" @change="bindBanknameChange">
+						<view v-if="bankname">{{bankname}}</view>
+						<view v-else>请选择开户行</view>
+					</picker>
+			</view>
+			<view class="form-item">
+					<text class="label">持卡人姓名</text>
+					<input type="text" class="input" placeholder="请输入持卡人姓名" name="bankcarduser" :value="userinfo.bankcarduser" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+			<view class="form-item">
+					<text class="label">银行卡号</text>
+					<input type="text" class="input" placeholder="请输入银行卡号" name="bankcardnum" :value="userinfo.bankcardnum" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">短信验证码</text>
+				<input type="text" class="input" placeholder="请输入短信验证码" placeholder-style="color:#BBBBBB;font-size:28rpx" name="code" value=""/>
+				<view class="code" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			smsdjs:'',
+      banklist: ['工商银行', '农业银行', '中国银行', '建设银行', '招商银行', '邮储银行', '交通银行', '浦发银行', '民生银行', '兴业银行', '平安银行', '中信银行', '华夏银行', '广发银行', '光大银行', '北京银行', '宁波银行'],
+      bankname: '',
+			userinfo:{},
+			textset:{},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.isload = true
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiPeisong/set', {}, function (data) {
+				that.loading = false;
+				that.userinfo = data.userinfo;
+				that.bankname = data.userinfo.bankname;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var bankname = this.bankname
+			var bankcarduser = formdata.bankcarduser
+			var bankcardnum = formdata.bankcardnum
+			var weixin = formdata.weixin
+			var aliaccount = formdata.aliaccount
+			var code = formdata.code || ''
+      if (bankname == '') {
+        app.alert('请选择开户行');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiPeisong/set", {bankname:bankname,bankcarduser:bankcarduser,bankcardnum:bankcardnum,weixin:weixin,aliaccount:aliaccount,code:code}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    bindBanknameChange: function (e) {
+      this.bankname = this.banklist[e.detail.value];
+    },
+    smscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var tel = that.userinfo.tel;
+      if (tel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(tel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: tel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);
+        }
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 0;flex:1;color: #000;}
+.form-item .code{color:#06A051}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%)}
+</style>
\ No newline at end of file
diff --git a/activity/peisong/setweixin.vue b/activity/peisong/setweixin.vue
new file mode 100644
index 0000000..dac5c5a
--- /dev/null
+++ b/activity/peisong/setweixin.vue
@@ -0,0 +1,72 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入微信号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="weixin" value=""></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+		//this.getdata();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var weixin = formdata.weixin
+      if (weixin == '') {
+        app.alert('请输入微信号');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {weixin:weixin}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/activity/peisong/withdraw.vue b/activity/peisong/withdraw.vue
new file mode 100644
index 0000000..ddd956e
--- /dev/null
+++ b/activity/peisong/withdraw.vue
@@ -0,0 +1,192 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		<view class="mymoney" :style="{background:'#06A051'}">
+			<view class="f1">可提现余额</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.money}}</view>
+			<view class="f3" @tap="goto" data-url="moneylog?st=2"><text>提现记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">提现金额(元)</view></view>
+			<view class="item3"><view class="f1">￥</view><view class="f2"><input class="input" type="digit" name="money" value="" placeholder="请输入提现金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput"/></view></view>
+			<view class="item4" v-if="sysset.withdrawfee>0 || sysset.withdrawmin>0">
+				<text v-if="sysset.withdrawmin>0" style="margin-right:10rpx">最低提现金额{{sysset.withdrawmin}}元 </text>
+				<text v-if="sysset.withdrawfee>0">提现手续费{{sysset.withdrawfee}}% </text>
+			</view>
+		</view>
+		<view class="withdrawtype">
+			<view class="f1">选择提现方式：</view>
+			<view class="f2">
+				<view class="item" v-if="sysset.withdraw_weixin==1" @tap.stop="changeradio" data-paytype="微信钱包">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信钱包</view>
+					<view class="radio" :style="paytype=='微信钱包' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</view>
+				<label class="item" v-if="sysset.withdraw_aliaccount==1" @tap.stop="changeradio" data-paytype="支付宝">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝</view>
+					<view class="radio" :style="paytype=='支付宝' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+				<label class="item" v-if="sysset.withdraw_bankcard==1" @tap.stop="changeradio" data-paytype="银行卡">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-cash.png'"/>银行卡</view>
+					<view class="radio" :style="paytype=='银行卡' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:'#06A051'}">立即提现</button>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo: [],
+		sysset: false,
+		paytype: '微信钱包',
+		show: 0,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onShow: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiPeisong/withdraw', {}, function (res) {
+				that.loading = false;
+				that.userinfo = res.userinfo;
+				that.sysset = res.sysset;
+				var sysset = res.sysset;
+				var paytype = '微信钱包';
+				if (sysset.withdraw_weixin == 1) {
+					paytype = '微信钱包';
+				}
+				if (!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) {
+					paytype = '支付宝';
+				}
+				if ((!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) && (!sysset.withdraw_aliaccount || sysset.withdraw_aliaccount == 0)) {
+					paytype = '银行卡';
+				}
+				that.paytype = paytype;
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var usermoney = parseFloat(this.userinfo.money);
+      var money = parseFloat(e.detail.value);
+      if (money < 0) {
+        app.error('必须大于0');
+      } else if (money > usermoney) {
+        app.error('可提现' + this.t('余额') + '不足');
+      }
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function (e) {
+      var that = this;
+			console.log(e.detail.value)
+      var usermoney = parseFloat(this.userinfo.money);
+      var withdrawmin = parseFloat(this.sysset.withdrawmin); //var formdata = e.detail.value;
+      var money = parseFloat(e.detail.value.money);
+      var paytype = this.paytype;
+      if (isNaN(money) || money <= 0) {
+        app.error('提现金额必须大于0');
+        return;
+      }
+      if (withdrawmin > 0 && money < withdrawmin) {
+        app.error('提现金额必须大于¥' + withdrawmin);
+        return;
+      }
+      if (money > usermoney) {
+        app.error('余额不足');
+        return;
+      }
+      if (paytype == '支付宝' && !this.userinfo.aliaccount) {
+        app.alert('请先设置支付宝账号', function () {
+          app.goto('setinfo');
+        });
+        return;
+      }
+      if (paytype == '银行卡' && (!this.userinfo.bankname || !this.userinfo.bankcarduser || !this.userinfo.bankcardnum)) {
+        app.alert('请先设置完整银行卡信息', function () {
+          app.goto('setinfo');
+        });
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiPeisong/withdraw', {money: money,paytype: paytype}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        } else {
+          app.success(res.msg);
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goto('my');
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:60rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.withdrawtype{width:94%;margin:20rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.withdrawtype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+
+
+.withdrawtype .f2{padding:0 30rpx}
+.withdrawtype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.withdrawtype .f2 .item:last-child{border-bottom:0}
+.withdrawtype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#333}
+.withdrawtype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.withdrawtype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.withdrawtype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/buy.vue b/activity/scoreshop/buy.vue
new file mode 100644
index 0000000..df5953d
--- /dev/null
+++ b/activity/scoreshop/buy.vue
@@ -0,0 +1,593 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="topay">
+			<view v-if="needaddress==0" class="address-add">
+				<view class="linkitem">
+					<text class="f1">联 系 人：</text>
+					<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx"/>
+				</view>
+				<view class="linkitem">
+					<text class="f1">联系电话：</text>
+					<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx"/>
+				</view>
+			</view>
+			<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/address?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+				<view class="f1"><image class="img" :src="event_rul +'/static/img/static/img/address.png'"/></view>
+				<view class="f2 flex1" v-if="address.name">
+					<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+					<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+				</view>
+				<view v-else class="f2 flex1">请选择收货地址</view>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"/>
+			</view>
+			
+			<view class="buydata">
+				<view class="bcontent">
+					<view class="product">
+						<view class="item flex" v-for="(item,index) in prolist">
+							<view class="img"><image class="img" :src="item.pic"/></view>
+							<view class="info flex1">
+								<view class="f1">{{item.name}}</view>
+								<view class="f2">市场价: ￥{{item.sell_price}}</view>
+								<view class="f3" :style="{color:t('color1')}">{{item.score_price}}{{t('积分')}}<text v-if="item.money_price>0">+{{item.money_price}}元</text><text style="padding-left:10rpx"> × {{item.num}}</text></view>
+							</view>
+						</view>
+					</view>
+					<view class="freight">
+						<view class="f1">配送方式</view>
+						<view class="freight-ul">
+							<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+							 <block v-for="(item, idx2) in freightList" :key="idx2">
+							 <view class="freight-li" :style="freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-index="idx2">{{item.name}}</view>
+							 </block>
+							</view>
+						</view>
+						<view class="freighttips" v-if="freightList[freightkey].minpriceset==1 && freightList[freightkey].minprice > 0 && freightList[freightkey].minprice*1 > product_price*1">满{{freightList[freightkey].minprice}}元起送，还差{{freightList[freightkey].minprice - product_price}}元</view>
+						<view class="freighttips" v-if="freightList[freightkey].isoutjuli==1">超出配送范围</view>
+					</view>
+					<view class="price" v-if="freightList[freightkey].pstimeset==1">
+						<view class="f1">{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</view>
+						<view class="f2" @tap="choosePstime">{{pstimetext==''?'请选择时间':pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+					</view>
+					<view class="storeitem" v-if="freightList[freightkey].pstype==1">
+						<view class="panel">
+							<view class="f1">取货地点</view>
+							<view class="f2" @tap="openMendian" :data-freightkey="freightkey" :data-storekey="freightList[freightkey].storekey"><text class="iconfont icondingwei"></text>{{freightList[freightkey].storedata[freightList[freightkey].storekey].name}}</view>
+						</view>
+						<block v-for="(item, idx) in freightList[freightkey].storedata" :key="idx">
+							<view class="radio-item" @tap.stop="choosestore" :data-index="idx" v-if="idx<5 || storeshowall==true">
+								<view class="f1">{{item.name}} </view>
+								<text style="color:#f50;">{{item.juli}}</text>
+								<view class="radio" :style="freightList[freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+							</view>
+						</block>
+						<view v-if="storeshowall==false && (freightList[freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+					</view>
+					<view class="price" v-if="freight_price*1 > 0">
+						<text class="f1">运费</text>
+						<text class="f2">+¥{{freightList[freightkey].freight_price}}</text>
+					</view>
+					
+					<view style="display:none">{{test}}</view>
+					<view class="form-item" v-for="(item,idx) in freightList[freightkey].formdata" :key="item.id">
+						<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+						<block v-if="item.key=='input'">
+							<input type="text" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+						</block>
+						<block v-if="item.key=='textarea'">
+							<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+						</block>
+						<block v-if="item.key=='radio'">
+							<radio-group class="radio-group" :name="'form'+idx">
+								<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+									<radio class="radio" :value="item1"/>{{item1}}
+								</label>
+							</radio-group>
+						</block>
+						<block v-if="item.key=='checkbox'">
+							<checkbox-group :name="'form'+idx" class="checkbox-group">
+								<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+									<checkbox class="checkbox" :value="item1"/>{{item1}}
+								</label>
+							</checkbox-group>
+						</block>
+						<block v-if="item.key=='selector'">
+							<picker class="picker" mode="selector" :name="'form'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+								<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+								<view v-else>请选择</view>
+							</picker>
+							<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+						</block>
+						<block v-if="item.key=='time'">
+							<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+								<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+								<view v-else>请选择</view>
+							</picker>
+							<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+						</block>
+						<block v-if="item.key=='date'">
+							<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+								<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+								<view v-else>请选择</view>
+							</picker>
+							<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+						</block>
+						<block v-if="item.key=='upload'">
+							<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+							<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+								<view class="form-imgbox" v-if="editorFormdata[idx]">
+									<view class="form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix"/></view>
+								</view>
+								<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx"></view>
+							</view>
+						</block>
+					</view>
+
+				</view>
+			</view>
+			<view style="width:100%;height:110rpx;"></view>
+			<view class="footer flex notabbarbot">
+				<view class="f1 flex1">总计：
+					<text class="txt" :style="{color:t('color1')}" v-if="totalprice*1 > 0">￥{{totalprice}} + {{totalscore}}{{t('积分')}}</text>
+					<text class="txt" :style="{color:t('color1')}" v-else>{{totalscore}}{{t('积分')}}</text>
+				</view>
+				<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</button>
+			</view>
+		</form>
+
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in freightList[freightkey].pstimeArr" :key="index" @tap="pstimeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		test:'test',
+
+		prolist: [],
+		freightList: [],
+		address: [],
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		freightkey: 0,
+		freight_price: 0,
+		pstimetext: '',
+		freight_time: '',
+		totalmoney: 0,
+		totalscore: 0,
+		totalweight: 0,
+		totalnum: 1,
+		totalprice:'0.00',
+		storedata: [],
+		storename: '',
+		latitude: '',
+		longitude: '',
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		havetongcheng: "",
+		beizhu: "",
+		field1: "",
+		field2: "",
+		field3: "",
+		field4: "",
+		field5: "",
+		storeshowall:false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this; //获取产品信息
+			that.loading = true;
+			app.get('ApiScoreshop/buy', {prodata: that.opt.prodata}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg, function(){
+						app.goback()
+					});
+					return;
+				}
+				that.prolist = res.prolist;
+				that.freightList = res.freightList;
+				that.totalmoney = res.totalmoney;
+				that.totalscore = res.totalscore;
+				that.totalnum = res.totalnum;
+				that.totalweight = res.totalweight;
+				that.havetongcheng = res.havetongcheng;
+				that.address = res.address;
+				that.linkman = res.linkman;
+				that.tel = res.tel;
+				that.calculatePrice();
+				that.loaded();
+				if (res.needLocation == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						for (var j in res.freightList) {
+							if (freightList[j].pstype == 1) {
+								var storedata = freightList[j].storedata;
+
+								if (storedata) {
+									for (var x in storedata) {
+										if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+											var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+											storedata[x].juli = juli;
+										}
+									}
+
+									storedata.sort(function (a, b) {
+										return a["juli"] - b["juli"];
+									});
+
+									for (var x in storedata) {
+										if (storedata[x].juli) {
+											storedata[x].juli = storedata[x].juli + '千米';
+										}
+									}
+									freightList[j].storedata = storedata;
+								}
+							}
+						}
+						that.freightList = freightList;
+					});
+				}
+			});
+		},
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value;
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value;
+    },
+    inputBeizhu: function (e) {
+      this.beizhu = e.detail.value;
+    },
+    inputfield1: function (e) {
+      this.field1 = e.detail.value;
+    },
+    inputfield2: function (e) {
+      this.field2 = e.detail.value;
+    },
+    inputfield3: function (e) {
+      this.field3 = e.detail.value;
+    },
+    inputfield4: function (e) {
+      this.field4 = e.detail.value;
+    },
+    inputfield5: function (e) {
+      this.field5 = e.detail.value;
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //改变收货地址
+    changeAddress: function () {
+      var that = this;
+      that.onLoad();
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var totalnum = that.totalnum;
+      var totalmoney = that.totalmoney;
+      var totalweight = that.totalweight;
+      var address = that.address;
+
+      var freightdata = that.freightList[that.freightkey];
+      console.log(freightdata);
+
+      if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+        var needaddress = 1;
+      } else {
+        var needaddress = 0;
+      }
+      that.needaddress = needaddress
+      var freight_price = freightdata.freight_price;
+
+      that.freight_price = freight_price;
+			var totalprice = freight_price * 1 + totalmoney * 1
+			that.totalprice = totalprice.toFixed(2);
+    },
+    changeFreight: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			this.freightkey = index;
+			that.calculatePrice();
+    },
+    choosePstime: function () {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      if (itemlist.length > 6) {
+        that.pstimeDialogShow = true;
+        that.pstimeIndex = -1;
+      } else {
+        uni.showActionSheet({
+          itemList: itemlist,
+          success: function (res) {
+						if(res.tapIndex >= 0){
+							var choosepstime = pstimeArr[res.tapIndex];
+							that.pstimetext = choosepstime.title;
+							that.freight_time = choosepstime.value;
+						}
+          }
+        });
+      }
+    },
+    pstimeRadioChange: function (e) {
+      var pstimeIndex = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var choosepstime = pstimeArr[pstimeIndex];
+      this.pstimetext = choosepstime.title;
+			this.freight_time = choosepstime.value;
+      this.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false
+    },
+    choosestore: function (e) {
+      var storekey = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey
+			var freightList = this.freightList
+			freightList[freightkey].storekey = storekey
+      this.freightList = freightList;
+    },
+    //提交并支付
+    topay: function (e) {
+      var that = this;
+      var prodata = this.opt.prodata;
+      var buytype = this.buytype;
+      var freightkey = this.freightkey;
+      var freightid = this.freightList[freightkey].id;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+      if(this.freightList[freightkey].pstype==1){
+				var storekey = this.freightList[freightkey].storekey
+				var storeid = this.freightList[freightkey].storedata[storekey].id;
+			}else{
+				var storeid = 0;
+			}
+      var freight_time = that.freight_time; //console.log(yhqrecoid); return;
+
+      var needaddress = that.needaddress;
+      if (needaddress == 0) addressid = 0;
+
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+      if (this.freightList[freightkey].pstimeset == 1 && freight_time == '') {
+        app.error('请选择' + (this.freightList[freightkey].pstype == 0 ? '配送' : '提货') + '时间');
+        return;
+      }
+
+			var formdataSet = this.freightList[freightkey].formdata;
+      var formdata = e.detail.value;
+			var newformdata = {};
+			for (var i = 0; i < formdataSet.length;i++){
+				if (formdataSet[i].val3 == 1 && (formdata['form' + i] === '' || formdata['form' + i] === undefined || formdata['form' + i].length==0)){
+						app.alert(formdataSet[i].val1+' 必填');return;
+				}
+				if (formdataSet[i].key == 'selector') {
+						formdata['form' + i] = formdataSet[i].val2[formdata['form' + i]]
+				}
+				newformdata['form'+i] = formdata['form' + i];
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiScoreshop/createOrder', {prodata: prodata,freightid: freightid,freight_time: freight_time,storeid: storeid,addressid: addressid,linkman: linkman,tel: tel,formdata:newformdata}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        }
+        app.goto('/pages/pay/pay?id=' + res.payorderid);
+      });
+    },
+		openLocation:function(e){
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			var latitude = parseFloat(storeinfo.latitude);
+			var longitude = parseFloat(storeinfo.longitude);
+			var address = storeinfo.name;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		openMendian: function(e) {
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			app.chooseImage(function(data){
+				editorFormdata[idx] = data[0];
+				console.log(editorFormdata)
+				that.editorFormdata = editorFormdata
+				that.test = Math.random();
+			})
+		},
+		editorBindPickerChange:function(e){
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var val = e.detail.value;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			console.log(editorFormdata)
+			this.editorFormdata = editorFormdata
+			this.test = Math.random();
+		},
+		doStoreShowAll:function(){
+			this.storeshowall = true;
+		},
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product .img{ width:140rpx;height:140rpx}
+.collage_icon{ color:#fe7203;border:1px solid #feccaa;display:flex;align-items:center;font-size:20rpx;padding:0 6rpx;margin-left:6rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 96%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 2%;display: flex;align-items: center;z-index: 8;box-sizing:content-box}
+.footer .f1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .f1 .text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;font-size:30rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;font-size:30rpx;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+.storeviewmore{width:100%;text-align:center;color:#889;height:40rpx;line-height:40rpx;margin-top:10rpx}
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/cart.vue b/activity/scoreshop/cart.vue
new file mode 100644
index 0000000..4c26618
--- /dev/null
+++ b/activity/scoreshop/cart.vue
@@ -0,0 +1,274 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<block v-if="cartlist.length>0">
+			<view class="cartmain">
+				<block v-for="(item, index) in cartlist" :key="item.id">
+					<view class="item">
+						<view class="content flex-y-center">
+							<view @tap.stop="changeradio" :data-index="index" class="radio" :style="item.checked ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+							<image :src="item.product.pic" class="img" @tap="gotoFun" :data-url="'/pages/shop/product?id=' + item.product.id"/>
+							<view class="detail">
+								<view class="title"><text>{{item.product.name}}</text></view>
+								<view class="desc"><text>价值：￥{{item.product.sell_price}}</text></view>
+								<view class="buynum flex flex-y-center">
+									<view class="price flex1" :style="{color:t('color1')}"><text v-if="item.product.money_price>0">￥{{item.product.money_price}}+</text>{{item.product.score_price}}{{t('积分')}}</view>
+									<view class="f2 flex flex-y-center">
+										<view class="minus flex-x-center" @tap="gwcminus" :data-index="index" :data-cartid="item.id" :data-num="item.num">-</view>
+										<input class="flex-x-center" type="number" :value="item.num" @blur="gwcinput" :data-max="item.product.stock" :data-index="index" :data-cartid="item.id" :data-num="item.num"></input>
+										<view class="plus flex-x-center" @tap="gwcplus" :data-index="index" :data-max="item.product.stock" :data-num="item.num" :data-cartid="item.id">+</view>
+									</view>
+								</view>
+							</view>
+							<view class="prodel" @tap="cartdelete" :data-cartid="item.id"><image :src="event_rul +'/static/img/static/img/del.png'"/></view>
+						</view>
+					</view>
+				</block>
+			</view>
+			
+			<view style="height:auto;position:relative">
+				<view style="width:100%;height:110rpx"></view>
+				<view class="footer flex" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<view class="text1">合计：</view>
+					<view class="text2" :style="{color:t('color1')}"><text v-if="totalmoney>0">￥{{totalmoney}}+</text><text>{{totalscore}}{{t('积分')}}</text></view>
+					<view class="flex1"></view>
+					<view class="op" @tap="toOrder" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">去结算</view>
+				</view>
+			</view>
+
+		</block>
+		<block v-else>
+			<view class="data-empty">
+				<image :src="pre_url+'/static/img/cartnull.png'" class="data-empty-img" style="width:120rpx;height:120rpx"/>
+				<view class="data-empty-text" style="margin-top:20rpx;font-size:24rpx">购物车空空如也~</view>
+				<button style="width:400rpx;border:1px solid #ff6801;border-radius:6rpx;background:#ff6801;margin-top:20px;color:#fff" @tap="goto" data-url="index">去选购</button>
+			</view>
+		</block>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		initdata:{},
+		pre_url:app.globalData.pre_url,
+
+		cartlist:[],
+		totalscore:0,
+		totalmoney: '0.00',
+		selectedcount: 0,
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+  },
+	onShow:function(){
+		this.getdata();
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+    getdata: function (){
+      var that = this;
+			that.loading = true;
+      app.get('ApiScoreshop/cart', {}, function (res) {
+				that.loading = false;
+        that.cartlist = res.cartlist;
+        var cartlist = res.cartlist;
+        for (var i in cartlist) {
+					cartlist[i].checked = true;
+        }
+        that.calculate();
+				that.loaded();
+      });
+    },
+    changeradio: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			var cartlist = that.cartlist;
+      var checked = cartlist[index].checked;
+			if(checked){
+				cartlist[index].checked = false;
+			}else{
+				cartlist[index].checked = true;
+			}
+			that.cartlist = cartlist;
+      that.calculate();
+    },
+    calculate: function () {
+      var that = this;
+      var cartlist = that.cartlist;
+      var totalmoney = 0.00;
+      var totalscore = 0.00;
+      var selectedcount = 0;
+      for (var i in cartlist) {
+				if (cartlist[i].checked) {
+					var thiscart = cartlist[i];
+					totalmoney += thiscart.product.money_price * thiscart.num;
+					totalscore += thiscart.product.score_price * thiscart.num;
+					selectedcount += thiscart.num;
+				}
+      }
+      that.totalmoney = totalmoney.toFixed(2);
+      that.totalscore = totalscore;
+      that.selectedcount = selectedcount;
+    },
+    checkpro: function (e) {
+      var that = this;
+      var ids = e.detail.value;
+      that.ids = ids;
+      that.calculate();
+    },
+    cartdelete: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.cartid;
+      app.confirm('确定要从购物车移除吗?', function () {
+        app.post('ApiScoreshop/cartdelete', {id: id}, function (data) {
+          app.success('操作成功');
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    toOrder: function () {
+      var that = this;
+      var cartlist = that.cartlist;
+      var prodata = [];
+      for (var i in cartlist) {
+				if (cartlist[i].checked) {
+					prodata.push(cartlist[i].proid + ',' + cartlist[i].num);
+				}
+      }
+      if (prodata.length == 0) {
+        app.error('请先选择产品');
+        return;
+      }
+      app.goto('buy?prodata=' + prodata.join('-'));
+    },
+    //加
+    gwcplus: function (e) {
+      var index = parseInt(e.currentTarget.dataset.index);
+      var maxnum = parseInt(e.currentTarget.dataset.max);
+      var cartid = e.currentTarget.dataset.cartid;
+      var num = parseInt(e.currentTarget.dataset.num);
+      if (num >= maxnum) {
+        app.error('库存不足');
+        return;
+      }
+			var cartlist = this.cartlist;
+			cartlist[index].num++;
+			this.cartlist = cartlist
+			this.calculate();
+      var that = this;
+      app.post('ApiScoreshop/cartChangenum', {id: cartid,num: num + 1}, function (data) {
+        if (data.status == 1) {
+          //that.getdata();
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    //减
+    gwcminus: function (e) {
+      var index = parseInt(e.currentTarget.dataset.index);
+      var maxnum = parseInt(e.currentTarget.dataset.max);
+      var cartid = e.currentTarget.dataset.cartid;
+      var num = parseInt(e.currentTarget.dataset.num);
+      if (num == 1) return;
+			var cartlist = this.cartlist;
+			cartlist[index].num--;
+			this.cartlist = cartlist
+			this.calculate();
+      var that = this;
+      app.post('ApiScoreshop/cartChangenum', {id: cartid,num: num - 1}, function (data) {
+        if (data.status == 1) {
+          //that.getdata();
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    //输入
+    gwcinput: function (e) {
+      var index = parseInt(e.currentTarget.dataset.index);
+      var maxnum = parseInt(e.currentTarget.dataset.max);
+      var cartid = e.currentTarget.dataset.cartid;
+      var num = e.currentTarget.dataset.num;
+      var newnum = parseInt(e.detail.value);
+      console.log(num + '--' + newnum);
+      if (num == newnum) return;
+
+      if (newnum > maxnum) {
+        app.error('库存不足');
+        return;
+      }
+			var cartlist = this.cartlist;
+			cartlist[index].num = newnum;
+			this.cartlist = cartlist
+			this.calculate();
+
+      var that = this;
+      app.post('ApiScoreshop/cartChangenum', {id: cartid,num: newnum}, function (data) {
+        if (data.status == 1) {
+          //that.getdata();
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+		addcart:function(){
+			this.getdata();
+		}
+  }
+};
+</script>
+<style>
+.cartmain .item {width: 94%;margin:20rpx 3%;background: #fff;border-radius:20rpx;padding:30rpx 3%;}
+
+.cartmain .item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cartmain .item .radio .radio-img{width:100%;height:100%}
+
+.cartmain .item .content {width:100%;margin:0;position: relative;}
+.cartmain .item .content .check {width:70rpx;margin-top: 30rpx;}
+.cartmain .item .content .img {width: 140rpx;height: 140rpx;}
+.cartmain .item .content .detail {flex:1;margin-left:16rpx}
+.cartmain .item .content .detail .title {padding-right:40rpx;color: #222222;font-weight:bold;font-size:26rpx;line-height:34rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:68rpx}
+.cartmain .item .content .detail .desc {height: 46rpx;line-height: 46rpx;color: #666;overflow: hidden;font-size: 24rpx;}
+.cartmain .item .content .prodel{width:24rpx;height:24rpx;position:absolute;top:0;right:0}
+.cartmain .item .content .prodel image{width:100%;height:100%}
+
+.cartmain .item .buynum .price{height: 46rpx;display:flex;align-items:center;font-size:26rpx;font-weight:bold}
+.cartmain .item .buynum .f2{ border:1px solid #f1f1f1}
+.cartmain .item .buynum .f2 input{flex:1;width:70rpx;border-left:1px solid #f1f1f1;border-right:1px solid #f1f1f1;text-align:center;color:#333;font-size:26rpx}
+.cartmain .item .buynum .f2 .plus{width:50rpx;}
+.cartmain .item .buynum .f2 .minus{width:50rpx;}
+
+.cartmain .item .bottom{width: 94%;margin: 0 3%;border-top: 1px #e5e5e5 solid;padding: 10rpx 0px;overflow: hidden;color: #ccc;display:flex;align-items:center;justify-content:flex-end}
+.cartmain .item .bottom .f1{display:flex;align-items:center;color:#333}
+.cartmain .item .bottom .f1 image{width:40rpx;height:40rpx;border-radius:4px;margin-right:4px}
+.cartmain .item .bottom .op {border: 1px #ff4246 solid;border-radius: 10rpx;color: #ff4246;padding: 0 10rpx;height: 46rpx;line-height: 46rpx;margin-left: 10rpx;}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;z-index:8;display:flex;align-items:center;padding:0 20rpx;border-top:1px solid #EFEFEF}
+.footer .text0{color:#666666;font-size:24rpx;}
+.footer .text1 {height: 110rpx;line-height: 110rpx;color:#444;font-weight:bold;font-size:24rpx;margin-right:10rpx}
+.footer .text2 {color: #F64D00;font-size: 30rpx;font-weight:bold}
+.footer .op{width: 216rpx;height: 80rpx;line-height:80rpx;border-radius: 6rpx;font-weight:bold;color:#fff;font-size:28rpx;text-align:center;margin-left:30rpx}
+
+.data-empty {width: 100%; text-align: center; padding-top:100rpx;padding-bottom:100rpx}
+.data-empty-img{ width: 300rpx; height: 300rpx; display: inline-block; }
+.data-empty-text{ display: block; text-align: center; color: #999999; font-size:32rpx; width: 100%; margin-top: 30rpx; }
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/comment.vue b/activity/scoreshop/comment.vue
new file mode 100644
index 0000000..f5d03e1
--- /dev/null
+++ b/activity/scoreshop/comment.vue
@@ -0,0 +1,194 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.pic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.name}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul +'/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul +'/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-show="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var ogid = that.opt.ogid;
+			that.loading = true;
+			app.get('ApiOrder/comment', {ogid: ogid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var ogid = that.opt.ogid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiOrder/comment', {ogid: ogid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.setData({
+        score: setIndex
+      });
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 40px; line-height: 40px; color: #fff; background: #e94745; }
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/commentlist.vue b/activity/scoreshop/commentlist.vue
new file mode 100644
index 0000000..5177367
--- /dev/null
+++ b/activity/scoreshop/commentlist.vue
@@ -0,0 +1,125 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiScoreshop/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/index.vue b/activity/scoreshop/index.vue
new file mode 100644
index 0000000..fdbc9de
--- /dev/null
+++ b/activity/scoreshop/index.vue
@@ -0,0 +1,231 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topimg" :style="{background:t('color1')}">
+			<image class="img" :src="pre_url+'/static/img/scoreshop_top.png'"/>
+		</view>
+		<view class="topinfo">
+			<view class="flex">
+				<view class="myscore"><text class="t1" :style="{color:t('color1')}">{{score}}</text><text class="t2">我的{{t('积分')}}</text></view>
+				<view class="scorelog" @tap="goto" data-url="/pages/my/scorelog" :style="{color:t('color1'),background:'rgba('+t('color1rgb')+',0.2)'}">{{t('积分')}}明细<text class="iconfont iconjiantou"></text></view>
+				<view class="orderlog" @tap="goto" data-url="orderlist">兑换记录<text class="iconfont iconjiantou"></text></view>
+			</view>
+			<view class="search-container">
+				<view class="search-box">
+					<image class="img" :src="pre_url +'/static/img/static/img/search_ico.png'"/>
+					<input :value="keyword" placeholder="商品搜索..." placeholder-style="font-size:24rpx;color:#C2C2C2" type="text" confirm-type="search" @confirm="search"></input>
+				</view>
+			</view>
+		</view>
+		<block v-if="clist.length > 0">
+		<view class="navbox">
+			<block v-for="(item, index) in clist" :key="index">
+			<view style="cursor:pointer" @tap="goto" :data-url="item.url?item.url:'prolist?cid='+item.id" class="nav_li">
+				<image class="img" :src="item.pic"/>
+				<view class="txt">{{item.name}}</view>
+			</view>
+			</block>
+			<view class="nav_li" @tap="goto" data-url="prolist">
+				<image :src="pre_url + '/static/img/static/img/all.png'" class="img"/>
+				<view class="txt">全部</view>
+			</view>
+		</view>
+		</block>
+
+		<view id="datalist">
+			<block v-for="(item, index) in datalist" :key="index">
+			<view @tap="goto" :data-url="'product?id=' + item.id" class="product-item">
+				<view class="itemcontent">
+					<view class="product-pic">
+						<image :src="item.pic" class="img"/>
+					</view> 
+					<view class="product-info">
+						<view class="p1">{{item.name}}</view>
+						<view class="p2"><block v-if="item.sell_price>0">价值{{item.sell_price}}元</block></view>
+						<view class="p3">
+							<view class="t1 flex">
+								<view class="x1" :style="{color:t('color1')}">
+									<text style="font-size:13px">
+										<block v-if="item.score_price>0">{{item.score_price}}{{t('积分')}}</block>
+										<block v-if="item.money_price>0"><block v-if="item.score_price>0">+</block>{{item.money_price}}元</block>
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="itembottom">
+					<view class="f1">已兑换<text :style="{color:t('color1')}"> {{item.sales}} </text>件</view>
+					<button class="f2" :style="{background:t('color1')}">立即兑换</button>
+				</view>
+			</view>
+			</block>
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		score:0,
+		pics:[],
+		clist:[],
+		datalist: [],
+		pagenum: 1,
+		keyword: '',
+		nodata: false,
+		nomore: false,
+		sclist: ""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdatalist(true);
+    }
+  },
+  methods: {
+    getdata: function () {
+      var that = this;
+			that.loading = true;
+      app.post('ApiScoreshop/index', {}, function (res) {
+				uni.stopPullDownRefresh();
+				that.loading = false;
+				that.isload = true;
+				uni.setNavigationBarTitle({
+					title: that.t('积分') + '商城'
+				});
+        that.clist = res.clist;
+				that.pics = res.pics;
+				that.score = res.score;
+				that.loaded();
+      });
+			that.getdatalist();
+    },
+    getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiScoreshop/getprolist', {pagenum: pagenum,keyword: keyword}, function (res) {
+				uni.stopPullDownRefresh();
+				that.loading = false;
+				that.isload = true;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    search: function (e) {
+      var keyword = e.detail.value;
+      app.goto('prolist?keyword='+keyword);
+    }
+  }
+};
+</script>
+<style>
+.topimg{width:100%;height:300rpx;}
+.topimg .img{width:100%;height:100%}
+
+.topinfo{width:94%;margin:0 3%;background:#fff;border-radius:16rpx;overflow:hidden;padding:60rpx 20rpx 20rpx 20rpx;margin-top:-100rpx;position:relative;display:flex;flex-direction:column}
+.topinfo .myscore{margin-left:40rpx;display:flex;flex-direction:column}
+.topinfo .myscore .t1{font-size:48rpx;font-weight:bold}
+.topinfo .myscore .t2{color:#999999;font-size:24rpx;margin-top:10rpx}
+.topinfo .scorelog{margin-left:120rpx;margin-top:30rpx;height:56rpx;line-height:56rpx;width:172rpx;text-align:center;border-radius:28rpx;font-size:24rpx;font-weight:bold;display:flex;justify-content:center;align-items:center}
+.topinfo .orderlog{margin-left:40rpx;margin-top:30rpx;background:rgba(255, 160, 10, 0.2);height:56rpx;line-height:56rpx;width:172rpx;text-align:center;border-radius:28rpx;color:#FFA00A;font-size:24rpx;font-weight:bold;display:flex;justify-content:center;align-items:center}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;margin-top:20rpx}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.navbox{width:94%;margin:0 3%;margin-top:20rpx;background: #fff;height: auto;overflow: hidden;padding-bottom: 0.1rpx;margin-bottom:12rpx}
+.nav_li{width: 25%;text-align: center;box-sizing: border-box;padding:30rpx 0 10rpx;float: left;color:#333}
+.nav_li .img{width:80rpx;height: 80rpx;margin-bottom:10rpx;}
+
+
+
+.weui-loadmore_line .weui-loadmore__tips{background-color:#f6f6f6}
+.swiper-container {width: 100%;} 
+.swiper-container image {display: block;width: 100%;}
+.category{width: 100%;padding-top: 20rpx;padding-bottom: 20rpx;flex-direction:row;white-space: nowrap; display:flex;background:#fff;overflow-x:scroll;margin-bottom:20rpx}
+.category .item{width:150rpx;display: inline-block; text-align: center;}
+.category .item image{width:80rpx;height:80rpx;margin: 0 auto;border-radius: 50%;}
+.category .item .t1{display: block;color: #666;}
+.product-item{display:flex;flex-direction:column;background: #fff; padding:0 20rpx;margin:0 20rpx;margin-bottom:20rpx;border-radius:20rpx}
+.product-item .itemcontent{display:flex;height:220rpx;border-bottom:1px solid #E6E6E6;padding:20rpx 0}
+.product-item .product-pic {width: 180rpx;height: 180rpx; background: #ffffff;overflow:hidden}
+.product-item .product-pic .img{width: 100%;height:180rpx;}
+.product-item .product-info {padding:4rpx 10rpx;flex:1}
+.product-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.product-item .product-info .p2{height:50rpx;display:flex;align-items:center;color:#666;font-size:24rpx}
+.product-item .product-info .p3{font-size:32rpx;height:40rpx;line-height:40rpx;display:flex;align-items:center}
+.product-item .product-info .p3 .t1{flex:auto;font-size:28rpx;font-weight:bold}
+.product-item .product-info .p3 .t1 .x2{margin-left:10rpx;font-size:26rpx;color: #888;}
+.product-item .product-info .p3 .t2{padding:0 16rpx;font-size:22rpx;height:44rpx;line-height:44rpx;overflow: hidden;color:#fff;background:#4fee4f;border:0;border-radius:20rpx;}
+.product-item .product-info .p3 button:after{border:0}
+
+.product-item .itembottom{width:100%;padding:0 20rpx;display:flex;height:100rpx;align-items:center}
+.product-item .itembottom .f1{flex:1;color:#666;font-size:24rpx}
+.product-item .itembottom .f2{color:#fff;width:160rpx;height:56rpx;display:flex;align-items:center;justify-content:center;border-radius:8rpx}
+
+.navbox{background: #fff;height: auto;overflow: hidden;padding-bottom: 0.1rpx;margin-bottom:12rpx}
+.nav_li{width: 25%;text-align: center;box-sizing: border-box;padding:30rpx 0 10rpx;float: left;color:#333}
+.nav_li image{width:80rpx;height: 80rpx;margin-bottom:10rpx;}
+
+.plr20{width: 100%;box-sizing: border-box;padding: 0 10rpx;margin-bottom: 10rpx;}
+.tj_title{background: #fff;height: 70rpx;width: 100%;box-sizing: border-box;padding: 0 20rpx;line-height: 70rpx;display: flex;align-items: center;border-radius: 10rpx;}
+.icon1{width: 40rpx;margin-right: 14rpx}
+
+.weui-search-bar__box{ position: relative}
+.weui-icon-search{ position: absolute;width:32rpx; top:12rpx;left:40%}
+.weui-search-bar__input{ background: #fff;padding:0 10px; margin:10px; border-radius:5px; text-align: center;}
+
+.topsearch{width:100%;max-width:750px;padding:16rpx 20rpx;background:#f6f6f6}
+.topsearch .f1{height:70rpx;border-radius:8rpx;border:1px solid #eeeeee;background-color:#fff;flex:1}
+.topsearch .f1 image{width:34rpx;height:34rpx;margin-left:20rpx}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:24rpx;color:#333;border:0;background:#fff}
+.search-btn{color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+
+.covermy{position:absolute;z-index:99999;cursor:pointer;display:flex;flex-direction:column;align-items:center;justify-content:center;overflow:hidden;z-index:9999;top:260rpx;right:0;color:#fff;background-color:rgba(17,17,17,0.3);width:140rpx;height:60rpx;font-size:26rpx;border-radius:30rpx 0px 0px 30rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/orderdetail.vue b/activity/scoreshop/orderdetail.vue
new file mode 100644
index 0000000..0a85a16
--- /dev/null
+++ b/activity/scoreshop/orderdetail.vue
@@ -0,0 +1,372 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择'+codtxt : '已成功付款'}}</view>
+				<view class="t2" v-if="detail.freight_type!=1">我们会尽快为您发货</view>
+				<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<text class="t2" v-if="detail.freight_type!=3" user-select="true" selectable="true">发货信息：{{detail.express_com}} {{detail.express_no}}</text>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openMendian" :data-storeinfo="storeinfo" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="btitle flex-y-center" v-if="detail.bid>0">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid"></image>
+			<text class="flex1" decode="true" space="true" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid" style="padding-left:16rpx">{{detail.binfo.name}}</text>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">市场价￥{{item.sell_price}}</text>
+					<view class="t3"><text class="x1 flex1"><text v-if="item.money_price>0">￥{{item.money_price}}+</text>{{item.score_price}}{{t('积分')}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red" v-if="detail.totalmoney">¥{{detail.totalmoney}} + {{detail.totalscore}}{{t('积分')}}</text>
+				<text class="t2 red" v-else>{{detail.totalscore}}{{t('积分')}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}} + {{detail.totalscore}}{{t('积分')}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+			<block v-if="detail.status==1">
+				<block v-if="detail.paytype!='货到付款'">
+					<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice + '&score=' + detail.totalscore">申请退款</view>
+				</block>
+				<block v-else>
+					<view class="btn ref">{{codtxt}}</view>
+				</block>
+			</block>
+			
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">查看物流</view>
+			</block>
+
+			<block v-if="detail.status==2">
+				<block v-if="detail.paytype!='货到付款'">
+					<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice + '&score=' + detail.totalscore">申请退款</view>
+				</block>
+				<view class="btn1" :style="{background:t('color1')}" @tap="orderCollect" :data-id="detail.id" v-if="detail.paytype!='货到付款'">确认收货</view>
+				<block v-else>
+					<view class="btn2">{{codtxt}}</view>
+				</block>
+			</block>
+			<block v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3 || detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul + '/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		prodata: '',
+		djs: '',
+		detail: "",
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiScoreshop/orderdetail', {id: that.opt.id}, function (res) {
+				uni.stopPullDownRefresh();
+				that.loading = false;
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				that.isload = 1;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiScoreshop/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiScoreshop/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('收货中');
+        app.post('ApiScoreshop/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height: 80rpx;line-height: 40rpx;color: #000;overflow:hidden}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/orderlist.vue b/activity/scoreshop/orderlist.vue
new file mode 100644
index 0000000..36b3823
--- /dev/null
+++ b/activity/scoreshop/orderlist.vue
@@ -0,0 +1,231 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'orderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view @tap.stop="goto" :data-url="'product?id=' + item2.proid">
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">市场价￥{{item2.sell_price}}</text>
+								<view class="t3"><text class="x1 flex1"><text v-if="item2.money_price>0">￥{{item2.money_price}}+</text>{{item2.score_price}}{{t('积分')}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text>共计{{item.procount}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+						<block v-if="item.status==0">
+							<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+						</block>
+						<block v-if="item.status==1">
+							<block v-if="item.paytype!='货到付款'">
+								<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice + '&score=' + item.totalscore">申请退款</view>
+							</block>
+							<block v-else>
+								<view class="btn2">{{codtxt}}</view>
+							</block>
+						</block>
+						<block v-if="item.status==2">
+							<block v-if="item.paytype!='货到付款'">
+								<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice + '&score=' + item.totalscore">申请退款</view>
+							</block>
+							<block v-else>
+							<view class="btn2">{{codtxt}}</view>
+							</block>
+							<view class="btn2" @tap.stop="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">查看物流</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id" v-if="item.paytype!='货到付款'">确认收货</view>
+						</block>
+						<block v-if="item.status==3 || item.status==4">
+							<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+		codtxt: "",
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiScoreshop/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					uni.setNavigationBarTitle({
+						title: that.t('积分')+'兑换订单'
+					});
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiScoreshop/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiScoreshop/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+        app.post('ApiScoreshop/orderCollect', {orderid: orderid}, function (data) {
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+/*.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px; font-size: 14px; position: absolute; bottom: 10px; right: 10px; background: #fff; }*/
+.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px;}
+
+.zan-tex{clear:both; display: block; width: 100%; color: #565656; font-size: 12px; height: 30px; line-height: 30px; text-align: center;  }
+.ind-bot{ width: 100%; float: left; text-align: center; height: 50px; line-height: 50px; font-size: 13px; color: #ccc; background:#F2F2F2}
+
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/poster.vue b/activity/scoreshop/poster.vue
new file mode 100644
index 0000000..49c2519
--- /dev/null
+++ b/activity/scoreshop/poster.vue
@@ -0,0 +1,93 @@
+<template>
+	<view class="poster-detail">
+		<view class="nav-bar" :style="{'height': navHeight}">
+			<view class="" style="height: 30px;display: flex;margin-bottom: 4px;align-items: center;" @click="goBack">
+				<text class="iconfont icon-icon_arrow_left" style="font-size: 40rpx; margin-left: 20rpx;"></text>
+			</view>
+		</view>
+		<image class="img" :src="imgUrl" mode="widthFix"></image>
+		<view class="btn" @click="goBack">立即去兑换</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				imgUrl: '',
+				navHeight: 0,
+			}
+		},
+		onLoad(options) {
+			
+			let setText = JSON.parse(options.setText)
+			let title = ''
+			if (options.num == 0) {
+				this.imgUrl = setText.introduce
+				title = '活动介绍'
+			}else {
+				this.imgUrl = setText.gain
+				title = '知味豆获取'
+			}
+			uni.setNavigationBarTitle({
+			　　title: title
+			})
+			
+			let elemetn
+			// #ifdef MP-WEIXIN
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			uni.getSystemInfo({
+				success: res => {
+					elemetn = res.statusBarHeight
+				}
+			})
+			 // #endif
+			// #ifdef MP-WEIXIN
+			this.navHeight = ((menuButtonInfo.bottom + menuButtonInfo.top) - elemetn) + 'px'
+			// #endif
+			 // #ifndef MP 
+			this.navHeight = 60 + 'px'
+			 // #endif 
+		},
+		methods: {
+			goBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.poster-detail {
+		.nav-bar {
+			width: 100%;
+			display: flex;
+			align-items: flex-end;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 22;
+		}
+		.img {
+			width: 100%;
+			vertical-align: middle;
+		}
+
+		.btn {
+			width: 540rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			position: fixed;
+		    bottom: 60rpx;
+		    left: 50%;
+		    transform: translateX(-50%);
+			z-index: 333;
+			border-radius: 200rpx;
+			color: #fff;
+			text-align: center;
+			background-image: linear-gradient(to right , #00AE68 , #096742);
+		}
+	}
+</style>
diff --git a/activity/scoreshop/product.vue b/activity/scoreshop/product.vue
new file mode 100644
index 0000000..cb33222
--- /dev/null
+++ b/activity/scoreshop/product.vue
@@ -0,0 +1,1271 @@
+<template>
+	<view class="pages-product">
+		<block v-if="isload">
+			<view class="swiper-container">
+				<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+					<block v-for="(item, index) in product.pics" :key="index">
+						<swiper-item class="swiper-item">
+							<view class="swiper-item-view">
+								<image class="img" :src="item" mode="widthFix" />
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="imageCount">{{current+1}}/{{(product.pics).length}}</view>
+			</view>
+		<view class="product-detail__con">
+			<view class="product-detail__info">
+				<view class="info-hd flex al-item-center j-between">
+					<view class="price flex al-item-center">
+						<view class="current">{{product.score_price}}{{t('积分')}}<text
+								v-if="product.money_price*1>0">+{{product.money_price}}元</text></view>
+						<view class="original">￥{{product.sell_price}} </view>
+					</view>
+				</view>
+				<view class="info-bd">{{product.name}}</view>
+				<view class="info-ft flex j-between">
+					<view class="info-ft__left flex al-item-center">
+						<view class="txt">已兑换{{product.sales}}件</view>
+						<view class="txt">库存：{{product.stock}}</view>
+					</view>
+					<view class="info-ft__right flex al-item-center">
+						<view class="share al-item-center" @tap="shareClick">
+							<text class="iconfont icon-fenxiang"></text>
+							<text class="share-txt">分享</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="sales_stock">
+				<view class="commission" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"
+					v-if="shopset.showcommission==1 && (product.commission > 0 || product.commission_score > 0)">
+					分享好友购买预计可得{{t('佣金')}}：
+					<block v-if="product.commission > 0"><text
+							style="font-weight:bold;padding:0 2px">{{product.commission}}</text>{{product.commission_desc}}
+					</block>
+					<text v-if="product.commission > 0 && product.commission_score > 0">+</text>
+					<block v-if="product.commission_score > 0"><text
+							style="font-weight:bold;padding:0 2px">{{product.commission_score}}</text>{{product.commission_score_desc}}
+					</block>
+				</view>
+			</view>
+			<view class="shop-entry flex al-item-center" v-if="product.bid != 0">
+                <image class="shop-entry__hd" :src="business.logo"></image>
+				<view class="shop-entry__bd flex1">
+					<view class="shop-entry__title">{{business.name}}</view>
+					<view class="shop-entry__desc">{{business.desc}}</view>
+				</view>
+				<view class="shop-entry__ft"
+					@tap="goto" :data-url="'/pagesA/shop/index?id' + product.bid">进入店铺</view>
+			</view>
+			<view class="detail_title">
+				<image class="icon2" :src="event_rul +'/static/images/title-decorate.svg'" mode=""></image>
+				<view class="t0">商品描述</view>
+				<image class="icon2" :src="event_rul +'/static/images/title-decorate.svg'" mode=""></image>
+			</view>
+			<view class="detail">
+				<dp :pagecontent="pagecontent"></dp>
+			</view>
+			<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':''" v-if="product.status==1">
+				<view class="f1">
+					<view class="item" @tap="goto" :data-url="product.bid== 0 ? '/pages/index/index':'/pagesA/shop/index?id=' + product.bid">
+                        <text class="iconfont" :class="product.bid == 0 ? 'icon-shouye1' : 'icon-dianpu1'" style="font-size: 40rpx; margin-bottom: 3rpx;"></text>
+                        <view class="t1">{{product.bid == 0 ? '首页' : '店铺'}}</view>
+					</view>
+				<!-- 	<button class="item" v-else open-type="contact">
+						<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'" />
+						<text class="iconfont icon-dianpu1" style="font-size: 40rpx; margin-bottom: 3rpx;"></text>
+						<view class="t1">客服</view>
+					</button> -->
+				<!-- 	<view class="item flex1" @tap="goto" data-url="cart">
+						<image class="img" :src="event_rul +'/static/img/static/img/gwc.png'" />
+						<view class="t1">购物车</view>
+						<view class="cartnum" v-if="cartnum>0">{{cartnum}}</view>
+					</view> -->
+					<view class="item" @tap="addfavorite">
+						<!-- <image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'" /> -->
+						<text class="iconfont icon-shoucang" v-if="!isfavorite" style="font-size: 40rpx; margin-bottom: 3rpx;"></text>
+						 <text class="iconfont icon-Collection" v-else style="color:#0A5D3B; font-size: 40rpx; margin-bottom: 3rpx;"></text>
+						<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+					</view>
+				</view>
+				<view class="op">
+					<view class="tocart flex-x-center flex-y-center" @tap="addcart">
+						加入购物车</view>
+					<view class="tobuy flex-x-center flex-y-center" @tap="tobuy">立即兑换
+					</view>
+				</view>
+			</view>
+			<scrolltop :isshow="scrolltopshow"></scrolltop>
+			
+			<view v-if="sharetypevisible" class="popup__container">
+				<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+				<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+					<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+					<view class="popup__content">
+						<view class="sharetypecontent">
+							<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+								<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+								<text class="t1">分享给好友</text>
+							</view>
+							<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+								<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+								<text class="t1">分享给好友</text>
+							</view>
+							<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+								<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+								<text class="t1">分享给好友</text>
+							</view>
+							<button class="f1" open-type="share" v-else>
+								<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+								<text class="t1">分享给好友</text>
+							</button>
+							<view class="f2" @tap="showPoster">
+								<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'" />
+								<text class="t1">生成分享图片</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="posterDialog" v-if="showposter">
+				<view class="main">
+					<view class="close" @tap="posterDialogClose">
+						<image class="img" :src="event_rul +'/static/img/static/img/close.png'" />
+					</view>
+					<view class="content">
+						<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic">
+						</image>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		</block>
+		<view class="right_car" @tap="goto" data-url="/pages/shop/cart">
+			<text class="iconfont icon-gouwuche1" style="font-size: 42rpx; font-weight: bold; color: #0A5D3B;"></text>
+		</view>
+		
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+		<popmsg ref="popmsg"></popmsg>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+
+				isfavorite: false,
+				current: 0,
+				business: "",
+				product: [],
+				cartnum: "",
+				pagecontent: "",
+				shopset: "",
+				title: "",
+				sharepic: "",
+				sharetypevisible: false,
+				showposter: false,
+				posterpic: "",
+				scrolltopshow: false,
+				kfurl: '',
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		onShareAppMessage: function() {
+			return this._sharewx({
+				title: this.product.name,
+				pic: this.product.pic
+			});
+		},
+		onShareTimeline: function() {
+			var sharewxdata = this._sharewx({
+				title: this.product.name,
+				pic: this.product.pic
+			});
+			var query = (sharewxdata.path).split('?')[1];
+			return {
+				title: sharewxdata.title,
+				imageUrl: sharewxdata.imageUrl,
+				query: query
+			}
+		},
+		methods: {
+			getdata: function() {
+				var that = this;
+				var id = this.opt.id || 0;
+				that.loading = true;
+				app.post('ApiScoreshop/product', {
+					id: id
+				}, function(res) {
+					that.loading = false;
+					if (res.status == 0) {
+						app.alert(res.msg);
+						return;
+					}
+					var product = res.product;
+					var pagecontent = JSON.parse(product.detail);
+					that.business = product.business;
+					that.product = product;
+					that.cartnum = res.cartnum;
+					that.pagecontent = pagecontent;
+					that.shopset = res.shopset;
+					that.title = product.name;
+					that.isfavorite = res.isfavorite;
+					that.sharepic = product.pics[0];
+					uni.setNavigationBarTitle({
+						title: product.name
+					});
+					that.kfurl = '/pages/kefu/index';
+					if (app.globalData.initdata.kfurl != '') {
+						that.kfurl = app.globalData.initdata.kfurl;
+					}
+					that.loaded({
+						title: res.product.name,
+						pic: res.product.pic
+					});
+				});
+			},
+			swiperChange: function(e) {
+				var that = this;
+				that.current = e.detail.current
+			},
+			addcart: function() {
+				var that = this;
+				var proid = that.product.id;
+				that.loading = true;
+				app.post('ApiScoreshop/addcart', {
+					proid: proid,
+					num: 1
+				}, function(res) {
+					that.loading = false;
+					if (res.status == 1) {
+						app.success(res.msg);
+						that.cartnum++;
+					} else {
+						app.error(res.msg);
+					}
+				});
+			},
+			tobuy: function() {
+				var proid = this.product.id;
+				var prodata = proid + ',1';
+				app.goto('buy?prodata=' + prodata);
+			},
+			//收藏操作
+			addfavorite: function() {
+				var that = this;
+				var proid = that.product.id;
+				app.post('ApiScoreshop/addfavorite', {
+					proid: proid,
+					type: 'scoreshop'
+				}, function(data) {
+					if (data.status == 1) {
+						that.isfavorite = !that.isfavorite;
+					}
+					app.success(data.msg);
+				});
+			},
+			onPageScroll: function(e) {
+				var that = this;
+				var scrollY = e.scrollTop;
+				if (scrollY > 200) {
+					that.scrolltopshow = true;
+				}
+				if (scrollY < 150) {
+					that.scrolltopshow = false
+				}
+			},
+			shareClick: function() {
+				this.sharetypevisible = true;
+			},
+			handleClickMask: function() {
+				this.sharetypevisible = false
+			},
+			showPoster: function() {
+				var that = this;
+				that.showposter = true;
+				that.sharetypevisible = false;
+				app.showLoading('生成海报中');
+
+				app.post('ApiScoreshop/getposter', {
+					proid: that.product.id
+				}, function(data) {
+					app.showLoading(false);
+					if (data.status == 0) {
+						app.alert(data.msg);
+					} else {
+						that.posterpic = data.poster;
+					}
+				});
+			},
+			posterDialogClose: function() {
+				this.showposter = false;
+			},
+			showcuxiaodetail: function() {
+				this.showcuxiaodialog = true;
+			},
+			hidecuxiaodetail: function() {
+				this.showcuxiaodialog = false
+			},
+			getcoupon: function() {
+				this.showcuxiaodialog = false;
+				this.getdata();
+			},
+			onPageScroll: function(e) {
+				var that = this;
+				var scrollY = e.scrollTop;
+				if (scrollY > 200) {
+					that.scrolltopshow = true;
+				}
+				if (scrollY < 150) {
+					that.scrolltopshow = false
+				}
+			},
+			sharemp: function() {
+				app.error('点击右上角发送给好友或分享到朋友圈');
+				this.sharetypevisible = false
+			},
+			shareapp: function() {
+				var that = this;
+				that.sharetypevisible = false;
+				uni.showActionSheet({
+					itemList: ['发送给微信好友', '分享到微信朋友圈'],
+					success: function(res) {
+						if (res.tapIndex >= 0) {
+							var scene = 'WXSceneSession';
+							if (res.tapIndex == 1) {
+								scene = 'WXSenceTimeline';
+							}
+							var sharedata = {};
+							sharedata.provider = 'weixin';
+							sharedata.type = 0;
+							sharedata.scene = scene;
+							sharedata.title = that.product.name;
+							//sharedata.summary = app.globalData.initdata.desc;
+							sharedata.href = app.globalData.pre_url + '/h5/' + app.globalData.aid +
+								'.html#/activity/scoreshop/product?scene=id_' + that.product.id + '-pid_' +
+								app.globalData.mid;
+							sharedata.imageUrl = that.product.pic;
+							var sharelist = app.globalData.initdata.sharelist;
+							if (sharelist) {
+								for (var i = 0; i < sharelist.length; i++) {
+									if (sharelist[i]['indexurl'] == '/activity/scoreshop/product') {
+										sharedata.title = sharelist[i].title;
+										sharedata.summary = sharelist[i].desc;
+										sharedata.imageUrl = sharelist[i].pic;
+										if (sharelist[i].url) {
+											var sharelink = sharelist[i].url;
+											if (sharelink.indexOf('/') === 0) {
+												sharelink = app.globalData.pre_url + '/h5/' + app
+													.globalData.aid + '.html#' + sharelink;
+											}
+											if (app.globalData.mid > 0) {
+												sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') +
+													'pid=' + app.globalData.mid;
+											}
+											sharedata.href = sharelink;
+										}
+									}
+								}
+							}
+							uni.share(sharedata);
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+<style lang="scss">
+.pages-product {
+	min-height: 100vh;
+	box-sizing: border-box;
+	background: #F5F5F5;
+	padding-bottom: calc(124rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(124rpx + env(safe-area-inset-bottom));
+}
+	.icon2 {
+		height: 26rpx;
+		width: 50rpx;
+	}
+
+	.info_live {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 26rpx;
+		margin-top: 20rpx;
+		color: #999;
+
+		.left {
+			display: flex;
+
+			.icon {
+				padding: 0 10rpx;
+				border-radius: 6rpx;
+				color: #fff;
+				background-color: #f3bf72;
+				margin-right: 16rpx;
+			}
+		}
+
+		.right {
+			display: flex;
+
+			.iconfont {
+				margin-right: 16rpx;
+			}
+		}
+	}
+
+	.right_car {
+		position: fixed;
+		padding: 15rpx;
+		top: 4vh;
+		right: 30rpx;
+		width: 80rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 2;
+		background-color: #e2f7ef;
+		height: 80rpx;
+		border-radius: 80rpx;
+		box-shadow: 0 0 10rpx 0 #ccc;
+
+		image {
+			height: 100%;
+			width: 100%;
+		}
+	}
+
+	.follow_topbar {
+		height: 88rpx;
+		width: 100%;
+		max-width: 640px;
+		background: rgba(0, 0, 0, 0.8);
+		position: fixed;
+		top: 0;
+		z-index: 13;
+	}
+
+	.follow_topbar .headimg {
+		height: 64rpx;
+		width: 64rpx;
+		margin: 6px;
+		float: left;
+	}
+
+	.follow_topbar .headimg image {
+		height: 64rpx;
+		width: 64rpx;
+	}
+
+	.follow_topbar .info {
+		height: 56rpx;
+		padding: 16rpx 0;
+	}
+
+	.follow_topbar .info .i {
+		height: 28rpx;
+		line-height: 28rpx;
+		color: #ccc;
+		font-size: 24rpx;
+	}
+
+	.follow_topbar .info {
+		height: 80rpx;
+		float: left;
+	}
+
+	.follow_topbar .sub {
+		height: 48rpx;
+		width: auto;
+		background: #FC4343;
+		padding: 0 20rpx;
+		margin: 20rpx 16rpx 20rpx 0;
+		float: right;
+		font-size: 24rpx;
+		color: #fff;
+		line-height: 52rpx;
+		border-radius: 6rpx;
+	}
+
+	.qrcodebox {
+		background: #fff;
+		padding: 50rpx;
+		position: relative;
+		border-radius: 20rpx
+	}
+
+	.qrcodebox .img {
+		width: 400rpx;
+		height: 400rpx
+	}
+
+	.qrcodebox .txt {
+		color: #666;
+		margin-top: 20rpx;
+		font-size: 26rpx;
+		text-align: center
+	}
+
+	.qrcodebox .close {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		bottom: -100rpx;
+		left: 50%;
+		margin-left: -25rpx;
+		border: 1px solid rgba(255, 255, 255, 0.5);
+		border-radius: 50%;
+		padding: 8rpx
+	}
+
+	.swiper-container {
+		position: relative;
+		height: 750rpx;
+		overflow: hidden;
+	}
+
+	.swiper {
+		width: 100%;
+		height: 750rpx;
+		overflow: hidden;
+	}
+
+	.swiper-item-view {
+		width: 100%;
+		height: 750rpx;
+	}
+
+	.swiper .img {
+		width: 100%;
+		height: 750rpx;
+		overflow: hidden;
+	}
+
+	.imageCount {
+		width: 100rpx;
+		height: 50rpx;
+		background-color: rgba(0, 0, 0, 0.3);
+		border-radius: 40rpx;
+		line-height: 50rpx;
+		color: #fff;
+		text-align: center;
+		font-size: 26rpx;
+		position: absolute;
+		right: 13px;
+		bottom: 20rpx;
+	}
+	.product-detail__con {
+		padding: 24rpx;
+		.product-detail__info {
+			padding: 14rpx 24rpx 24rpx;
+			background: #fff;
+			border-radius: 12rpx;
+		}
+		.current {
+			font-size: 40rpx;
+			color: #ED5925;
+			line-height: 56rpx;
+			padding-right: 20rpx;
+			font-weight: bold;
+			&.small-current {
+				font-size: 40rpx;
+			}
+			.symbol {
+				font-size: 28rpx;
+			}
+		}
+		.original {
+			font-size: 24rpx;
+			color: #999999;
+			text-decoration: line-through;
+			margin-right: 20rpx;
+		}
+		.txt {
+			font-size: 26rpx;
+			color: #999999;
+			&:not(:last-child) {
+				margin-right: 20rpx;
+			}
+		}
+		.btn-txt {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 34rpx;
+		}
+		.icon-box {
+			width: 22rpx;
+			height: 26rpx;
+			border-radius: 50%;
+			background: #FFFFFF;
+		}
+		.icon-arrow-right {
+			font-size: 20rpx;
+		}
+		.info-bd {
+			color: #333333;
+			font-size: 32rpx;
+			line-height: 44rpx;
+			font-weight: bold;
+			margin-top: 20rpx;
+		}
+		.info-ft {
+			margin-top: 46rpx;
+			font-size: 26rpx;
+			color: #999999;
+			line-height: 36rpx;
+			.iconfont {
+				font-size: 30rpx;
+				margin-right: 12rpx;
+			}
+			.share {
+				margin-left: 54rpx;
+				float: right;
+			}
+		}
+	}
+	.header {
+		width: 100%;
+		padding: 20rpx 3%;
+		background: #fff;
+		border-radius: 20rpx;
+	}
+
+	.header .price_share {
+		width: 100%;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between
+	}
+
+	.header .price_share .price {
+		display: flex;
+		align-items: flex-end
+	}
+
+	.header .price_share .price .f1 {
+		font-size: 50rpx;
+		color: #51B539;
+		font-weight: bold
+	}
+
+	.header .price_share .price .f2 {
+		font-size: 26rpx;
+		color: #C2C2C2;
+		text-decoration: line-through;
+		margin-left: 30rpx;
+		padding-bottom: 5px
+	}
+
+	.header .price_share .share {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center
+	}
+
+	.header .price_share .share .img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-bottom: 2px
+	}
+
+	.header .price_share .share .txt {
+		color: #333333;
+		font-size: 20rpx
+	}
+
+	.header .title {
+		color: #000000;
+		font-size: 32rpx;
+		line-height: 42rpx;
+		font-weight: bold;
+	}
+
+	.header .sellpoint {
+		font-size: 28rpx;
+		color: #666;
+		padding-top: 20rpx;
+	}
+
+	.header .sales_stock {
+		display: flex;
+		justify-content: space-between;
+		height: 60rpx;
+		line-height: 60rpx;
+		margin-top: 30rpx;
+		font-size: 24rpx;
+		color: #777777
+	}
+
+	.header .commission {
+		display: inline-block;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		border-radius: 10rpx;
+		font-size: 20rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 0 20rpx
+	}
+
+	.header .upsavemoney {
+		display: flex;
+		align-items: center;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		border-radius: 10rpx;
+		font-size: 20rpx;
+		height: 70rpx;
+		padding: 0 20rpx
+	}
+
+	.choose {
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		background: #fff;
+		margin-top: 20rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		padding: 0 3%;
+		color: #333;
+	}
+
+	.choose .f0 {
+		color: #555;
+		font-weight: bold;
+		height: 32rpx;
+		font-size: 24rpx;
+		padding-right: 30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center
+	}
+
+	.choose .f2 {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.cuxiaodiv {
+		border-radius: 20rpx;
+		background: #fff;
+		margin-top: 20rpx;
+		padding: 0 3%;
+	}
+
+	.fuwupoint {
+		width: 100%;
+		font-size: 24rpx;
+		color: #333;
+		height: 88rpx;
+		line-height: 88rpx;
+		padding: 12rpx 0;
+		display: flex;
+		align-items: center
+	}
+
+	.fuwupoint .f0 {
+		color: #555;
+		font-weight: bold;
+		height: 32rpx;
+		font-size: 24rpx;
+		padding-right: 30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center
+	}
+
+	.fuwupoint .f1 {
+		margin-right: 20rpx;
+		flex: 1;
+		display: flex;
+		flex-wrap: nowrap;
+		overflow: hidden
+	}
+
+	.fuwupoint .f1 .t {
+		padding: 4rpx 20rpx 4rpx 0;
+		color: #777;
+		flex-shrink: 0
+	}
+
+	.fuwupoint .f1 .t:before {
+		content: "";
+		display: inline-block;
+		vertical-align: middle;
+		margin-top: -4rpx;
+		margin-right: 10rpx;
+		width: 24rpx;
+		height: 24rpx;
+		background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;
+		background-size: 24rpx auto;
+	}
+
+	.fuwupoint .f2 {
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.fuwupoint .f2 .img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.fuwudialog-content {
+		font-size: 24rpx
+	}
+
+	.fuwudialog-content .f1 {
+		color: #333;
+		height: 80rpx;
+		line-height: 80rpx;
+		font-weight: bold
+	}
+
+	.fuwudialog-content .f1:before {
+		content: "";
+		display: inline-block;
+		vertical-align: middle;
+		margin-top: -4rpx;
+		margin-right: 10rpx;
+		width: 24rpx;
+		height: 24rpx;
+		background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;
+		background-size: 24rpx auto;
+	}
+
+	.fuwudialog-content .f2 {
+		color: #777
+	}
+
+	.cuxiaopoint {
+		width: 100%;
+		font-size: 24rpx;
+		color: #333;
+		height: 88rpx;
+		line-height: 88rpx;
+		padding: 12rpx 0;
+		display: flex;
+		align-items: center
+	}
+
+	.cuxiaopoint .f0 {
+		color: #555;
+		font-weight: bold;
+		height: 32rpx;
+		font-size: 24rpx;
+		padding-right: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center
+	}
+
+	.cuxiaopoint .f1 {
+		margin-right: 20rpx;
+		flex: 1;
+		display: flex;
+		flex-wrap: nowrap;
+		overflow: hidden
+	}
+
+	.cuxiaopoint .f1 .t {
+		margin-left: 10rpx;
+		border-radius: 3px;
+		font-size: 24rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		padding-right: 10rpx;
+		flex-shrink: 0;
+		overflow: hidden
+	}
+
+	.cuxiaopoint .f1 .t0 {
+		display: inline-block;
+		padding: 0 5px;
+	}
+
+	.cuxiaopoint .f1 .t1 {
+		padding: 0 4px
+	}
+
+	.cuxiaopoint .f2 {
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.cuxiaopoint .f2 .img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.cuxiaodiv .cuxiaoitem {
+		border-bottom: 1px solid #E6E6E6;
+	}
+
+	.cuxiaodiv .cuxiaoitem:last-child {
+		border-bottom: 0
+	}
+
+	.popup__container {
+		border-radius: 20rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: auto;
+		z-index: 10;
+		background: #fff
+	}
+
+	.popup__overlay {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 11;
+		opacity: 0.3;
+		background: #000
+	}
+
+	.popup__modal {
+		width: 100%;
+		position: absolute;
+		bottom: 0;
+		color: #3d4145;
+		overflow-x: hidden;
+		overflow-y: hidden;
+		opacity: 1;
+		padding-bottom: 20rpx;
+		background: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+		z-index: 12;
+		min-height: 600rpx;
+		max-height: 1000rpx;
+	}
+
+	.popup__title {
+		text-align: center;
+		padding: 30rpx;
+		position: relative;
+		position: relative
+	}
+
+	.popup__title-text {
+		font-size: 32rpx
+	}
+
+	.popup__close {
+		position: absolute;
+		top: 34rpx;
+		right: 34rpx
+	}
+
+	.popup__content {
+		width: 100%;
+		max-height: 880rpx;
+		overflow-y: scroll;
+		padding: 20rpx 0;
+	}
+
+	.service-item {
+		display: flex;
+		padding: 0 40rpx 20rpx 40rpx;
+	}
+
+	.service-item .prefix {
+		padding-top: 2px;
+	}
+
+	.service-item .suffix {
+		padding-left: 10rpx;
+	}
+
+	.service-item .suffix .type-name {
+		font-size: 28rpx;
+		color: #49aa34;
+		margin-bottom: 10rpx;
+	}
+
+
+	.shop-entry {
+		border-radius: 12rpx;
+		display: flex;
+		align-items: center;
+		background: #fff;
+		margin-top: 24rpx;
+		padding: 20rpx;
+		&__hd {
+			width: 88rpx;
+			height: 88rpx;
+			border-radius: 6rpx;
+			flex-shrink: 0;
+			margin-right: 16rpx;
+		}
+		&__bd {
+			width: 180rpx;
+		}
+		&__title {
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #333333;
+			line-height: 40rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			/* autoprefixer: ignore next */
+			-webkit-box-orient: vertical;
+			text-align: justify;
+			white-space: pre-wrap;
+			word-break: break-all;
+		}
+		&__desc {
+			line-height: 30rpx;
+			color: #999;
+			font-size: 24rpx;
+			margin-top: 8rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		&__ft {
+			flex-shrink: 0;
+			margin-left: 24rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			background: linear-gradient(153deg, #00AE68 0%, #096742 100%);
+			border-radius: 30rpx;
+			font-size: 24rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			min-width: 148rpx;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			text-align: center;
+		}
+	}
+
+	.detail {
+		border-radius: 20rpx;
+		min-height: 200rpx;
+	}
+
+	.detail_title {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #0A5D3B;
+		line-height: 50rpx;
+		letter-spacing: 2rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 28rpx 0 24rpx;
+	}
+
+	.bottombar {
+		position: fixed;
+		bottom: 0px;
+		left: 0px;
+		right: 0;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		padding: 16rpx 24rpx 30rpx;
+		padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+	}
+
+	.bottombar .f1 {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		// margin-right: 30rpx
+		justify-content: space-around;
+	}
+
+	.bottombar .f1 .item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 80rpx;
+		position: relative
+	}
+
+	.bottombar .f1 .item .img {
+		width: 44rpx;
+		height: 44rpx
+	}
+
+	.bottombar .f1 .item .t1 {
+		font-size: 20rpx;
+		color: #666666;
+		line-height: 28rpx;
+	}
+
+	.bottombar .op {
+		width: 520rpx;
+		border-radius: 78rpx;
+		overflow: hidden;
+		display: flex;
+	}
+
+	.bottombar .tocart,.bottombar .tobuy {
+		flex: 1;
+		height: 78rpx;
+		line-height: 78rpx;
+		font-size: 28rpx;
+		font-weight: bold
+	}
+	.bottombar .tocart {
+		background: linear-gradient(to right,#e9faf4 0%,#c1f9e5 100%);
+		color: #0A5D3B;
+	}
+	.bottombar .tobuy {
+		background: linear-gradient(to right,#00ad68 0%,#096741 100%);
+		color: #fff;
+	}
+
+	.bottombar .cartnum {
+		position: absolute;
+		right: 4rpx;
+		top: -4rpx;
+		color: #fff;
+		border-radius: 50%;
+		width: 32rpx;
+		height: 32rpx;
+		line-height: 32rpx;
+		text-align: center;
+		font-size: 22rpx;
+	}
+
+	.sharetypecontent {
+		border-radius: 20rpx;
+		height: 250rpx;
+		width: 710rpx;
+		margin: 20rpx;
+		display: flex;
+		padding: 50rpx;
+		align-items: flex-end
+	}
+
+	.sharetypecontent .f1 {
+		color: #51c332;
+		width: 50%;
+		height: 150rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background: #fff;
+		font-size: 28rpx;
+		border: 0
+	}
+
+	.sharetypecontent button::after {
+		border: 0
+	}
+
+	.sharetypecontent .f1 .img {
+		width: 90rpx;
+		height: 90rpx
+	}
+
+	.sharetypecontent .f2 {
+		color: #51c332;
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.sharetypecontent .f2 .img {
+		width: 90rpx;
+		height: 90rpx
+	}
+
+	.sharetypecontent .t1 {
+		height: 60rpx;
+		line-height: 60rpx;
+		color: #666
+	}
+
+	.posterDialog {
+		border-radius: 20rpx;
+		position: fixed;
+		z-index: 9;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.8);
+		top: var(--window-top);
+		left: 0
+	}
+
+	.posterDialog .main {
+		width: 80%;
+		margin: 60rpx 10% 30rpx 10%;
+		background: #fff;
+		position: relative;
+		border-radius: 20rpx
+	}
+
+	.posterDialog .close {
+		position: absolute;
+		padding: 20rpx;
+		top: 0;
+		right: 0
+	}
+
+	.posterDialog .close .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.posterDialog .content {
+		width: 100%;
+		padding: 70rpx 20rpx 30rpx 20rpx;
+		color: #333;
+		font-size: 30rpx;
+		text-align: center
+	}
+
+	.posterDialog .content .img {
+		width: 540rpx;
+		height: 960rpx
+	}
+</style>
diff --git a/activity/scoreshop/prolist.vue b/activity/scoreshop/prolist.vue
new file mode 100644
index 0000000..210be9b
--- /dev/null
+++ b/activity/scoreshop/prolist.vue
@@ -0,0 +1,514 @@
+<template>
+<view class="container">
+		<view class="pages-hd" :style="[
+			{'height': history_show?'100%': 'auto'},
+			{'padding-top': menuButtonTop + 'px'},
+			{'background': 'url(' + event_rul + '/static/images/head-bg.png)'},
+			{'background-size': '100% 638rpx'},
+			{'background-repeat': 'no-repeat'}]">
+			<!-- <image class="pages-hd__bg" :src="event_rul + '/static/img/home/header-bg.png'" mode="widthFix"></image> -->
+			<view class="pages-hd__info" :style="'height: ' + menuButtonHeight +'px'">
+				<text class="iconfont icon-icon_arrow_left" @click="goBack"></text>
+				<view class="pages-hd__title">积分商城</view>
+			</view>
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<!-- <image :src=event_rul + '/static/img/static/img/search_ico.png'"></image> -->
+					<text class="iconfont icon-search"></text>
+					<input :value="keyword" placeholder="商品搜索..." placeholder-style="color: #FFF;" @confirm="searchConfirm" @input="searchChange"/>
+				</view>
+				
+				<view class="right">
+					<text @tap="goPoster(0)">活动介绍</text>
+					<text  @tap="goPoster(1)">知味豆获取</text>
+				</view>
+			</view>
+			<view class="search-history" v-show="history_show">
+				<view>
+					<text class="search-history-title">最近搜索</text>
+					<view class="delete-search-history" @tap="deleteSearchHistory">
+						<text class="fa fa-trash-o" style="font-size:36rpx"></text>
+					</view>
+				</view>
+				
+				<view class="search-history-list" >
+					<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+					</view>
+					<view v-if="!history_list || history_list.length==0"><text class="fa fa-exclamation-circle"></text> 暂无记录		</view>
+				</view>
+			</view>
+			<view class="search-navbar" v-show="!history_show">
+				
+				<view @tap.stop="sortClick" :class="'search-navbar-item ' + (!field?'active':'')" data-field="" data-order=""><text>综合</text></view>
+				<view @tap.stop="sortClick" :class="'search-navbar-item ' + (field=='sales'?'active':'')" data-field="sales" data-order="desc"><text>兑换</text></view>
+				<view @tap.stop="sortClick" :class="'search-navbar-item ' + (field=='createtime'?'active':'')" data-field="createtime" data-order="desc"><text>上新</text></view>
+				<view style="display: flex; color: #999;" @tap.stop="sortClick" :class="'search-navbar-item ' + (field=='score_price'?'active':'')" class="search-navbar-item" data-field="score_price" :data-order="order=='asc'?'desc':'asc'">
+					<text style="color: #333;">使用豆子
+					</text>
+					<view style="border: 0;font-weight: bold; font-size: 26rpx; "  :style="{color:field=='score_price'&&order=='asc'?'#0A5D3B':''}" class="iconfont icon-danbianjiantou1"></view>
+					<view style="border: 0; font-weight: bold; font-size: 26rpx; margin-left: -10rpx;" :style="{color:field=='score_price'&&order=='desc'?'#0A5D3B':''}" class="iconfont icon-danbianjiantou"></view>
+					
+					 
+					<!-- <view :class="'fa fa-caret-up ' + (field=='score_price'&&order=='asc'?'active':'')"></view> -->
+					<!-- <view :class="'fa fa-caret-down ' + (field=='score_price'&&order=='desc'?'active':'')"></view> -->
+				</view>
+				<!-- <view class="search-navbar-item flex-x-center flex-y-center" @tap.stop="filterClick">筛选 -->
+				<!-- <image :src=event_rul + '/static/img/static/img/filter.png'" style="width:40rpx;height:40rpx"></image> -->
+				<!-- </view> -->
+			</view>
+			<view class="search-filter" v-if="showfilter">
+				<view class="search-filter-content" :if="glist && glist.length >0">
+					<block v-for="(item, index) in glist" :key="index">
+						<button @tap.stop="groupClick" :data-gid="item.id">
+							<view class="icon"><icon type="success_no_circle" size="18" v-if="gid == item.id"></icon></view><view>{{item.name}}</view>
+						</button>
+					</block>
+				</view>
+				<view class="search-filter-content" :if="clist && clist.length >0" style="border-top:1px solid #f5f5f5">
+					<block v-for="(item, index) in clist" :key="index">
+						<button @tap.stop="cateClick" :data-cid="item.id">
+							<view class="icon"><icon type="success_no_circle" size="18" v-if="cid == item.id"></icon></view><view>{{item.name}}</view>
+						</button>
+					</block>
+				</view>
+				<view class="search-filter-content" style="border-top:1px solid #eee;text-align:right"><div class="close"><text @tap.stop="filterClick">关闭</text></div></view>
+			</view>
+		</view>
+		<view class="product-container" v-show="!history_show" :style="'padding-top:' + hdHeight + 'px;'">
+			<view class="product-list" v-if="datalist && datalist.length>0" >
+				<block style="display: flex; flex-wrap: wrap;" v-for="(item, index) in datalist" :key="index">
+					<view @tap="goto" :data-url="'product?id=' + item.id" class="product-item">
+							<view class="product-pic">
+								<image :src="item.pic" mode="aspectFill"></image>
+							</view> 
+							<view class="product-info">
+								<view class="product-info__name">{{item.name}}</view>
+								<view class="product-info__sales">已售{{item.sales}}</view>
+								<view class="product-info__shop" @click="goShopDetail(item.bid)">
+									<image class="shop-logo" :src="item.business.logo"></image>
+									<view class="shop-name">{{item.business.name}}</view>
+									<text class="iconfont icon-arrow-right" v-if="item.bid!=0"></text>
+								</view>
+								<view class="product-info__bottom">
+									<image class="price-icon" :src="event_rul + '/static/images/zhiweidou.svg'"></image>
+									<view class="price-num" v-if="item.score_price>0">{{item.score_price || 0}}</view>
+									<view class="price-num" v-if="item.money_price>0"><block v-if="item.score_price>0">+</block>{{item.money_price}}元</view>
+									<view class="product-buy">兑换</view>
+								</view>
+							</view>
+					</view>
+				</block>
+			</view>
+			<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+			<nomore text="没有更多商品了" v-if="nomore"></nomore>
+		</view>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		menuindex:-1,
+
+		textset:{},
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: false,
+		order: '',
+		field:'',
+		cid: "",
+		clist: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		socIndx:{},
+		menuButtonTop: 0,
+		menuButtonHeight: 50,
+		hdHeight: 0,
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.cid = this.opt.cid;
+		this.keyword = this.opt.keyword;
+
+		// #ifdef MP
+		// 获取右上角胶囊坐标信息
+		let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+		this.menuButtonTop = menuButtonInfo.top;  // 胶囊到顶部的距离
+		this.menuButtonHeight = menuButtonInfo.height;  // 胶囊的高度
+		// #endif
+		setTimeout(() => {
+			uni.createSelectorQuery().select('.pages-hd').boundingClientRect(data => {
+				this.hdHeight = data.height;
+			}).exec();
+		})
+
+		this.getdata();
+		this.getScoIndex()
+		
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getprolist();
+    }
+  },
+  methods: {
+	  goPoster(e){
+		uni.navigateTo({
+			url:'/activity/scoreshop/poster?num=' + e + '&setText=' + JSON.stringify(this.socIndx)
+		}) 
+	  },
+	  goShopDetail(bid){
+        if(bid!=0) {
+            uni.navigateTo({
+                url:'/pagesA/shop/index?id=' + bid
+            })
+        }
+      },
+	  // 获取活动介绍和知味豆获取
+	  getScoIndex() {
+		  app.get('ApiScoreshop/index', {}, res => {
+			  this.socIndx = res.set
+		  })
+	  },
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			that.loading = true;
+			app.get('ApiScoreshop/prolist', {cid: cid,gid: gid}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.textset = app.globalData.textset;
+				that.loaded();
+				that.getprolist();
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiScoreshop/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cpid:cpid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field === true?'':t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+      if (gid == this.gid) {
+        that.gid = '';
+      } else {
+        that.gid = gid
+      }
+      that.searchproduct();
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+      if (cid == this.cid) {
+        that.cid = '';
+      } else {
+        that.cid = cid;
+      }
+      that.searchproduct();
+    },
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    },
+	goBack() {
+		uni.navigateBack({
+			delta: 1,
+		})
+	}
+  }
+};
+</script>
+<style lang='scss'>
+.pages-hd {
+	position: fixed;width: 100%;background: #fff;z-index:3;top:var(--window-top);
+	&__bg {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		z-index: -1;
+	}
+	&__info {
+		display: flex;
+		align-items: center;
+		color: #FFF;
+		padding: 0 45rpx 0 20rpx;
+	}
+	&__title {
+		font-size: 36rpx;
+		font-weight: 500;
+		flex: 1;
+		text-align: center;
+	}
+	.icon-icon_arrow_left {
+		font-size: 50rpx;
+	}
+}
+.topsearch{width:100%;padding: 20rpx 24rpx 24rpx;
+.right{
+	flex-shrink: 0;
+	display: flex;
+	padding-left: 20rpx;
+	text{
+		font-size: 26rpx;
+		color: #FFF;
+	}
+	text + text {
+		margin-left: 24rpx;
+	}
+}
+}
+.topsearch .f1{height:72rpx;border-radius:72rpx;border:0;background-color:rgba($color: #FFFFFF, $alpha: 0.3);flex:1;}
+.topsearch .f1 image{width:30rpx;height:30rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#FFF;}
+.icon-search {color: #FFF; margin-left: 20rpx; font-size: 50rpx;}
+.search-btn{color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.search-navbar {display: flex;height: 92rpx;line-height: 92rpx;text-align: center;align-items:center;background: #F5F5F5;border-radius: 12rpx 12rpx 0 0;}
+.search-navbar-item {flex: 1;}
+.search-navbar .active{
+	text{
+		color: #0A5D3B;
+	}
+}
+
+.search-navbar-item .fa-caret-up {position: absolute;top: 12rpx;padding: 0 6rpx;font-size: 24rpx;color:#ddd;}
+.search-navbar-item .fa-caret-down {position: absolute;top: 24rpx;padding: 0 6rpx;font-size: 24rpx;color:#ddd;}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #FFF;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.search-filter {display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:6rpx;border-top:1px solid #ddd;border-bottom:1px solid #f5f5f0;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 0;}
+.search-filter-content button{margin:4rpx 10rpx;font-size: 24rpx;display:flex;}
+.search-filter-content .close{text-align: right;font-size:24rpx;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.product-list {display: flex; flex-wrap: wrap; justify-content: space-between; width: 100%;font-size:26rpx;padding:0 16rpx;background: #F5F5F5;position: relative;z-index: 2;}
+
+.product-item{width: 350rpx; box-shadow: 0 0 10rpx 0 #ccc; overflow: hidden; display:flex;flex-direction:column;background: #fff; margin:0;margin-bottom:20rpx;border-radius:12rpx}
+.product-item .product-pic { background: #ffffff;overflow:hidden}
+.product-item .product-pic image{width: 100%;height: 300rpx;}
+.product-item .product-info {
+	padding: 10rpx 20rpx 20rpx;
+	position: relative;
+	&::before,&::after {
+		content: "";
+		position: absolute;
+		width: 28rpx;
+		height: 28rpx;
+		border-radius: 50%;
+		background: #F4F4F4;
+		bottom: 78rpx;
+	}
+	&::before {
+		left: -14rpx;
+	}
+	&::after {
+		right: -14rpx;
+	}
+	&__name {
+		height: 72rpx;
+		font-weight: 500;
+		color: #333333;
+		line-height: 36rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		/* autoprefixer: ignore next */
+		-webkit-box-orient: vertical;
+		text-align: justify;
+		white-space: pre-wrap;
+		word-break: break-all;
+	}
+	&__sales {
+		margin-top: 10rpx;
+		height: 24rpx;
+		font-size: 18rpx;
+		color: #999999;
+		line-height: 22rpx;
+	}
+	&__shop {
+		margin-top: 24rpx;
+		display: flex;
+		align-items: center;
+		.shop-logo {
+			width: 50rpx;
+			height: 50rpx;
+			border-radius: 50%;
+			margin-right: 8rpx;
+			flex-shrink: 0;
+		}
+		.shop-name {
+			flex: 1;
+			font-size: 22rpx;
+			color: #666666;
+			line-height: 36rpx;
+		}
+	}
+	&__bottom {
+		padding-top: 50rpx;
+		display: flex;
+		align-items: center;
+		position: relative;
+		&::before {
+			content: "";
+			position: absolute;
+			top: 25rpx;
+			left: 10rpx;
+			right: 10rpx;
+			border-top: 1rpx solid #F4F4F4;
+			transform: scaleY(0.5);
+		}
+		.price-icon {
+			width: 28rpx;
+			height: 28rpx;
+		}
+		.price-num {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #1BB149;
+			line-height: 44rpx;
+			flex: 1;
+			margin: 0 10rpx 0 6rpx;
+		}
+		.product-buy {
+			width: 84rpx;
+			background: linear-gradient(153deg, #00AE68 0%, #096742 100%);
+			height: 46rpx;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 46rpx;
+			border-radius: 23rpx;
+			text-align: center;
+			float: right;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/activity/scoreshop/refund.vue b/activity/scoreshop/refund.vue
new file mode 100644
index 0000000..b13b06b
--- /dev/null
+++ b/activity/scoreshop/refund.vue
@@ -0,0 +1,96 @@
+<template>
+<view class="container">
+	<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-item">
+			<text class="label">退款原因</text>
+			<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+		</view>
+		<view class="form-item">
+			<text class="label">退款金额(元)</text>
+			<view class="flex"><input name="money" type="digit" disabled="true" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+		</view>
+    <view class="form-item">
+      <text class="label">退回{{t('积分')}}</text>
+      <view class="flex"><input name="score" type="number" disabled="true" :value="totalscore" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+    </view>
+		<button class="ref-btn" form-type="submit">确定</button>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: '',
+      totalprice: 0,
+      totalscore: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.orderid = this.opt.orderid;
+		this.totalprice = this.opt.price;
+    this.totalscore = this.opt.score;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiOrder/refundinit', {}, function (res) {
+				that.loading = false;
+				that.tmplids = res.tmplids;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+      var score = parseInt(e.detail.value.score);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiScoreshop/refund', {orderid: orderid,reason: reason,money: money,score:score}, function (res) {
+        app.showLoading(false);
+        app.alert(res.msg);
+        if (res.status == 1) {
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goback(true);
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-item{ width:100%;background: #fff; padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx; background-color: #EEEEEE;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.ref-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; text-align: center; color: #fff; font-size: 16px; border-radius: 8px;border: none; background: #ff8758; }
+</style>
\ No newline at end of file
diff --git a/activity/seckill/buy.vue b/activity/seckill/buy.vue
new file mode 100644
index 0000000..f435bde
--- /dev/null
+++ b/activity/seckill/buy.vue
@@ -0,0 +1,733 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="topay">
+		<view v-if="needaddress==0" class="address-add">
+			<view class="linkitem">
+				<text class="f1">联 系 人：</text>
+				<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+			<view class="linkitem">
+				<text class="f1">联系电话：</text>
+				<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+		</view>
+		<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/address?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+			<view class="f1"><image class="img" :src="event_rul +'/static/img/static/img/address.png'"/></view>
+			<view class="f2 flex1" v-if="address.name">
+				<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+				<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+			</view>
+			<view v-else class="f2 flex1">请选择收货地址</view>
+			<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"/>
+		</view>
+		<view class="buydata">
+			<view class="btitle"><image class="img" :src="event_rul +'/static/img/static/img/ico-shop.png'"/>{{business.name}}</view>
+			<view class="bcontent">
+				<view class="product">
+					<view class="item flex">
+						<view class="img">
+							<image class="img" v-if="guige.pic" :src="guige.pic"></image>
+							<image class="img" v-else :src="product.pic"></image>
+						</view>
+						<view class="info flex1">
+							<view class="f1">{{product.name}}</view>
+							<view class="f2">规格：{{guige.name}}</view>
+							<view class="f3">￥{{guige.sell_price}}<text v-if="buytype!=1" class="collage_icon">秒杀价</text> × {{num}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="freight">
+					<view class="f1">配送方式</view>
+					<view class="freight-ul">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <block v-for="(item, idx2) in freightList" :key="idx2">
+						 <view class="freight-li" :style="freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<view class="freighttips" v-if="freightList[freightkey].minpriceset==1 && freightList[freightkey].minprice > 0 && freightList[freightkey].minprice*1 > product_price*1">满{{freightList[freightkey].minprice}}元起送，还差{{freightList[freightkey].minprice - product_price}}元</view>
+					<view class="freighttips" v-if="freightList[freightkey].isoutjuli==1">超出配送范围</view>
+				</view>
+				<view class="price" v-if="freightList[freightkey].pstimeset==1">
+					<view class="f1">{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</view>
+					<view class="f2" @tap="choosePstime">{{pstimetext==''?'请选择时间':pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+				<view class="storeitem" v-if="freightList[freightkey].pstype==1">
+					<view class="panel">
+						<view class="f1">取货地点</view>
+						<view class="f2" @tap="openMendian" :data-freightkey="freightkey" :data-storekey="freightList[freightkey].storekey"><text class="iconfont icondingwei"></text>{{freightList[freightkey].storedata[freightList[freightkey].storekey].name}}</view>
+					</view>
+					<block v-for="(item, idx) in freightList[freightkey].storedata" :key="idx">
+						<view class="radio-item" @tap.stop="choosestore" :data-index="idx" v-if="idx<5 || storeshowall==true">
+							<view class="f1">{{item.name}} </view>
+							<text style="color:#f50;">{{item.juli}}</text>
+							<view class="radio" :style="freightList[freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+					<view v-if="storeshowall==false && (freightList[freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+				</view>
+				<view class="price">
+					<text class="f1">商品金额</text>
+					<text class="f2">¥{{product_price}}</text>
+				</view>
+				<view class="price" v-if="leveldk_money*1>0">
+					<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+					<text class="f2">-¥{{leveldk_money}}</text>
+				</view>
+				<view class="price">
+					<text class="f1">运费</text>
+					<text class="f2">+¥{{freight_price}}</text>
+				</view>
+				
+				<view class="price">
+					<view class="f1">{{t('优惠券')}}</view>
+					<view v-if="couponList.length>0" class="f2" @tap="showCouponList"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{couponrid!=0?couponList[couponkey].couponname:couponList.length+'张可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+					<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+				</view>
+
+				<view style="display:none">{{test}}</view>
+				<view class="form-item" v-for="(item,idx) in freightList[freightkey].formdata" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="radio-group" :name="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="checkbox-group">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector" :name="'form'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata[idx]">
+								<view class="form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix"/></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx"></view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<view class="scoredk flex" v-if="userinfo.score2money > 0">
+			<checkbox-group @change="scoredk" class="flex" style="width:100%">
+				<view class="f1">
+					<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+					<view style="font-size:22rpx;color:#999" v-if="userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+				</view>
+				<view class="f2">使用{{t('积分')}}抵扣
+					<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+				</view>
+			</checkbox-group>
+		</view>
+		<view style="width: 100%;height:110rpx"></view>
+		<view class="footer flex notabbarbot">
+			<view class="text1 flex1">总计：
+				<text style="font-weight:bold;font-size:36rpx">￥{{totalprice}}</text>
+			</view>
+			<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</button>
+		</view>
+		</form>
+
+		<view v-if="couponvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<couponlist :couponlist="couponList" :choosecoupon="true" :selectedrid="couponrid" :bid="product.bid" @chooseCoupon="chooseCoupon"></couponlist>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in freightList[freightkey].pstimeArr" :key="index" @tap="pstimeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		test:'test',
+
+		business:{},
+		productList: [],
+		freightList: [],
+		couponList: [],
+		couponrid: 0,
+		coupontype: 1,
+		address: [],
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		freightkey: 0,
+		freight_price: 0,
+		pstimetext: '',
+		freight_time: '',
+		usescore: 0,
+		totalprice: '0.00',
+		product_price: 0,
+		leveldk_money: 0,
+		scoredk_money: 0,
+		coupon_money: 0,
+		storedata: [],
+		storeid: '',
+		storename: '',
+		latitude: '',
+		longitude: '',
+		isload: 0,
+		leadermoney: 0,
+		couponvisible: false,
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		product: "",
+		guige: "",
+		userinfo: "",
+		buytype: "",
+		scorebdkyf: "",
+		num: "",
+		havetongcheng: "",
+		weight: "",
+		goodsnum: "",
+		beizhu: "",
+		couponkey: 0,
+		storeshowall:false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this; //获取产品信息
+			that.loading = true;
+			app.get('ApiSeckill/buy', {prodata:that.opt.prodata}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg,function(){
+						app.goback();
+					});return;
+				}
+				var product = res.product;
+				var guige = res.guige;
+				var freightList = res.freightList;
+				var userinfo = res.userinfo;
+				var couponList = res.couponList;
+				that.business = res.business;
+				that.product = product;
+				that.guige = guige;
+				that.freightList = freightList;
+				that.userinfo = userinfo;
+				that.couponList = couponList;
+				that.buytype = res.buytype;
+				that.address = res.address;
+				that.scorebdkyf = res.scorebdkyf;
+				that.num = res.num;
+				that.havetongcheng = res.havetongcheng;
+				that.linkman = res.linkman;
+				that.tel = res.tel;
+				var leadermoney = 0; //商品总价 重量
+
+				var product_price = guige.sell_price * res.num;
+				var weight = guige.weight;
+				var goodsnum = 0;
+
+				if (res.buytype == 2 && product.leadermoney * 1 > 0) {
+					leadermoney = product.leadermoney * 1;
+				}
+				leadermoney = leadermoney.toFixed(2); //会员折扣
+				var leveldk_money = 0;
+				if (userinfo.discount > 0 && userinfo.discount < 10) {
+					leveldk_money = (product_price - leadermoney) * (1 - userinfo.discount * 0.1);
+					leveldk_money = leveldk_money.toFixed(2);
+				}
+				product_price = product_price.toFixed(2);
+				that.product_price = parseFloat(product_price);
+				that.leadermoney = leadermoney;
+				that.leveldk_money = leveldk_money;
+				that.weight = weight;
+				that.scoredk_money = userinfo.scoredk_money;
+				that.goodsnum = goodsnum;
+				that.isload = 1;
+				that.calculatePrice();
+				that.loaded();
+
+				if (res.needLocation == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+
+						for (var j in freightList) {
+							if (freightList[j].pstype == 1) {
+								var storedata = freightList[j].storedata;
+
+								if (storedata) {
+									for (var x in storedata) {
+										if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+											var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+											storedata[x].juli = juli;
+										}
+									}
+									storedata.sort(function (a, b) {
+										return a["juli"] - b["juli"];
+									});
+									for (var x in storedata) {
+										if (storedata[x].juli) {
+											storedata[x].juli = storedata[x].juli + '千米';
+										}
+									}
+									freightList[j].storedata = storedata;
+								}
+							}
+						}
+						that.freightList = freightList;
+					});
+				}
+			});
+		},
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var product_price = parseFloat(that.product_price); //+商品总价
+      var leadermoney = parseFloat(that.leadermoney); //-团长优惠
+      var leveldk_money = parseFloat(that.leveldk_money); //-会员折扣
+      var coupon_money = parseFloat(that.coupon_money); //-优惠券抵扣 
+      var address = that.address; //算运费
+      var freightdata = that.freightList[that.freightkey];
+      if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+        var needaddress = 1;
+      } else {
+        var needaddress = 0;
+      }
+      that.needaddress = needaddress;
+      var freight_price = freightdata.freight_price;
+
+      if (that.coupontype == 4) {
+        freight_price = 0;
+        coupon_money = 0;
+      }
+      var totalprice = product_price - leadermoney - leveldk_money - coupon_money;
+      if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+      var oldtotalprice = totalprice;
+      if (that.usescore) {
+        var scoredk_money = parseFloat(that.scoredk_money); //-积分抵扣
+      } else {
+        var scoredk_money = 0;
+      }
+      totalprice = totalprice + freight_price - scoredk_money;
+      if (that.scorebdkyf == '1' && scoredk_money > 0 && totalprice < freight_price) {
+        //积分不抵扣运费
+        totalprice = freight_price;
+        scoredk_money = oldtotalprice - freight_price;
+      }
+      var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+
+      if (scoredk_money > 0 && scoredkmaxpercent > 0 && scoredkmaxpercent < 100 && scoredk_money > oldtotalprice * scoredkmaxpercent * 0.01) {
+        scoredk_money = oldtotalprice * scoredkmaxpercent * 0.01;
+        totalprice = oldtotalprice - scoredk_money;
+      }
+      if (totalprice < 0) totalprice = 0;
+      freight_price = freight_price.toFixed(2);
+      totalprice = totalprice.toFixed(2);
+      that.totalprice = totalprice
+			that.freight_price = freight_price;
+    },
+    changeFreight: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			this.freightkey = index;
+			that.calculatePrice();
+    },
+    chooseCoupon: function (e) {
+			var couponrid = e.rid;
+      var couponkey = e.key;
+
+      if (couponrid == this.couponrid) {
+        this.couponkey = 0;
+        this.couponrid = 0;
+        this.coupontype = 1;
+        this.coupon_money = 0;
+        this.couponvisible = false;
+      } else {
+        var couponList = this.couponList;
+        var coupon_money = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        if (coupontype == 4) {
+          coupon_money = this.freightprice;
+        }
+        this.couponkey = couponkey;
+        this.couponrid = couponrid;
+        this.coupontype = coupontype;
+        this.coupon_money = coupon_money;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+    },
+    choosePstime: function () {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      if (itemlist.length > 6) {
+        that.pstimeDialogShow = true;
+        that.pstimeIndex = -1;
+      } else {
+        uni.showActionSheet({
+          itemList: itemlist,
+          success: function (res) {
+						if(res.tapIndex >= 0){
+							var choosepstime = pstimeArr[res.tapIndex];
+							that.pstimetext = choosepstime.title;
+							that.freight_time = choosepstime.value;
+						}
+          }
+        });
+      }
+    },
+    pstimeRadioChange: function (e) {
+      var pstimeIndex = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var choosepstime = pstimeArr[pstimeIndex];
+      this.pstimetext = choosepstime.title;
+			this.freight_time = choosepstime.value;
+      this.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false
+    },
+    choosestore: function (e) {
+      var storekey = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey
+			var freightList = this.freightList
+			freightList[freightkey].storekey = storekey
+      this.freightList = freightList;
+    },
+    //提交并支付
+    topay: function (e) {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightid = this.freightList[freightkey].id;
+      var prodata = this.opt.prodata;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+      var usescore = this.usescore;
+      var couponkey = this.couponkey;
+      var couponrid = this.couponrid;
+      var freight_time = that.freight_time; //console.log(yhqrecoid); return;
+
+      if(this.freightList[freightkey].pstype==1){
+				var storekey = this.freightList[freightkey].storekey
+				var storeid = this.freightList[freightkey].storedata[storekey].id;
+			}else{
+				var storeid = 0;
+			}
+      var needaddress = that.needaddress;
+      if (needaddress == 0) addressid = 0;
+
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+
+      if (this.freightList[freightkey].pstimeset == 1 && freight_time == '') {
+        app.error('请选择' + (this.freightList[freightkey].pstype == 0 ? '配送' : '提货') + '时间');
+        return;
+      }
+
+			var formdataSet = this.freightList[freightkey].formdata;
+      var formdata = e.detail.value;
+			var newformdata = {};
+			for (var i = 0; i < formdataSet.length;i++){
+				if (formdataSet[i].val3 == 1 && (formdata['form' + i] === '' || formdata['form' + i] === undefined || formdata['form' + i].length==0)){
+						app.alert(formdataSet[i].val1+' 必填');return;
+				}
+				if (formdataSet[i].key == 'selector') {
+						formdata['form' + i] = formdataSet[i].val2[formdata['form' + i]]
+				}
+				newformdata['form'+i] = formdata['form' + i];
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiSeckill/createOrder', {
+        proid: that.product.id,
+        ggid: that.guige.id,
+        num: that.num,
+        storeid: storeid,
+        couponrid: couponrid,
+        freightid: freightid,
+        freight_time: freight_time,
+        addressid: addressid,
+        usescore: usescore,
+        linkman: linkman,
+        tel: tel,
+				formdata: newformdata
+      }, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.error(data.msg);
+          return;
+        }
+        app.goto('/pages/pay/pay?id=' + data.payorderid);
+      });
+    },
+    showCouponList: function () {
+      this.couponvisible = true;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+    },
+		openLocation:function(e){
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			var latitude = parseFloat(storeinfo.latitude);
+			var longitude = parseFloat(storeinfo.longitude);
+			var address = storeinfo.name;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		openMendian: function(e) {
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			app.chooseImage(function(data){
+				editorFormdata[idx] = data[0];
+				console.log(editorFormdata)
+				that.editorFormdata = editorFormdata
+				that.test = Math.random();
+			})
+		},
+		editorBindPickerChange:function(e){
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var val = e.detail.value;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			console.log(editorFormdata)
+			this.editorFormdata = editorFormdata
+			this.test = Math.random();
+		},
+		doStoreShowAll:function(){
+			this.storeshowall = true;
+		},
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product .img{ width:140rpx;height:140rpx}
+.collage_icon{ color:#fe7203;border:1px solid #feccaa;display:flex;align-items:center;font-size:20rpx;padding:0 6rpx;margin-left:6rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 96%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 2%;display: flex;align-items: center;z-index: 8;box-sizing:content-box}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.storeviewmore{width:100%;text-align:center;color:#889;height:40rpx;line-height:40rpx;margin-top:10rpx}
+</style>
\ No newline at end of file
diff --git a/activity/seckill/comment.vue b/activity/seckill/comment.vue
new file mode 100644
index 0000000..e85d9a1
--- /dev/null
+++ b/activity/seckill/comment.vue
@@ -0,0 +1,192 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.propic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.proname}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul +'/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul +'/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiSeckill/comment', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiSeckill/comment', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 40px; line-height: 40px; color: #fff; background: #e94745; }
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/seckill/commentlist.vue b/activity/seckill/commentlist.vue
new file mode 100644
index 0000000..211c7a7
--- /dev/null
+++ b/activity/seckill/commentlist.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiSeckill/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/activity/seckill/index.vue b/activity/seckill/index.vue
new file mode 100644
index 0000000..cca6e64
--- /dev/null
+++ b/activity/seckill/index.vue
@@ -0,0 +1,183 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="navbg"></view>
+		<view class="nav">
+			<scroll-view scroll-x="true" :scroll-left="top_bar_scroll">
+				<view class="f1">
+					<block v-for="(item, index) in navlist" :key="index">
+					<view :class="'item ' + (selected==index?'active':'')" @tap="changetab" :data-index="index">
+							<view class="t3">{{item.seckill_date_m}}</view>
+							<view class="t1">{{item.showtime}}</view>
+							<view class="t2" v-if="item.active==-1">已结束</view>
+							<view class="t2" v-if="item.active==0">已开抢</view>
+							<view class="t2" v-if="item.active==1">抢购中</view>
+							<view class="t2" v-if="item.active==2">即将开始</view>
+					</view>
+					</block>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<image class="f1" mode="widthFix" :src="item.pic" @tap="goto" :data-url="'product?id=' + item.id"></image>
+				<view class="f2">
+					<text class="t1">{{item.name}}</text>
+					<view class="t2" :style="{color:t('color1')}">
+						<progress :percent="item.salepercent" backgroundColor="#FFD1C9" activeColor="#FF3143" border-radius="3" class="progress"></progress>
+						<text class="x2">{{item.salepercent}}%</text>
+					</view>
+					<view class="t3">
+						<text class="x1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="x2">￥{{item.market_price}}</text>
+						<button @tap="goto" :data-url="'product?id=' + item.id" class="x3" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" v-if="item.starttime <nowtime && seckill_duration*3600+item.starttime*1 > nowtime">立即抢购</button>
+						<button @tap="goto" :data-url="'product?id=' + item.id" class="x3 xx1" v-else-if="item.starttime*1+seckill_duration*3600 < nowtime">去看看</button>
+						<button @tap="goto" :data-url="'product?id=' + item.id" class="x3" v-else :style="{background:t('color2')}">抢先看看</button>
+					</view>
+				</view>
+			</view>
+			<view class="item" style="display:block" v-if="nodata"><nodata></nodata></view>
+			<nomore v-if="nomore"></nomore>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			bid:'',
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      navlist: "",
+      activetime: "",
+      activeindex: "",
+      selected: "",
+      top_bar_scroll: "",
+      seckill_duration: "",
+      nowtime: "",
+      nomore: false,
+			nodata:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st;
+		this.bid = this.opt.bid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getDataList(true);
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiSeckill/index', {}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+				} else {
+					that.navlist = res.navlist;
+					that.activetime = res.activetime;
+					that.activeindex = res.selected;
+					that.selected = res.selected;
+					that.top_bar_scroll = (res.selected - 2) * uni.getSystemInfoSync().windowWidth / 750 * 150;
+					that.seckill_duration = res.seckill_duration;
+					that.nowtime = res.nowtime;
+					that.getDataList();
+				}
+				that.loaded();
+			});
+		},
+    changetab: function (e) {
+      var index = e.currentTarget.dataset.index;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.selected = index;
+      this.getDataList();
+    },
+    getDataList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var selected = that.selected;
+      var navlist = that.navlist;
+      var pagenum = that.pagenum;
+			that.nomore = false;
+			that.nodata = false;
+      app.post('ApiSeckill/getprolist', {bid:that.bid,seckill_date: navlist[selected].seckill_date,seckill_time: navlist[selected].seckill_time,pagenum: pagenum}, function (res) {
+        uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{width:100%;overflow:hidden}
+.navbg{width: 100%;position:relative}
+.navbg:after {background: linear-gradient(90deg,rgba(253, 74, 70, 1) 0%,rgba(253, 74, 70, 0.8) 100%);content: '';width: 160%;height:300rpx;position: absolute;left: -30%;top:0;border-radius: 0 0 50% 50%;z-index:1}
+.nav {width: 100%;position:relative;z-index:2}
+.nav>scroll-view {overflow: visible !important;padding-top:20rpx;padding-bottom:20rpx}
+.nav .f1 {flex-grow: 0;flex-shrink: 0;display:flex;align-items:center;color:#fff;position:relative;z-index:2}
+.nav .f1 .item{flex-grow: 0;flex-shrink: 0;width:150rpx;text-align:center;padding:16rpx 0;opacity: 0.6;}
+.nav .f1 .item .t1 {font-size:34rpx;font-weight:bold}
+.nav .f1 .item .t2 {font-size:24rpx}
+.nav .f1 .item .t3 {font-size:30rpx}
+.nav .f1 .item.active {position: relative;color:#fff;opacity:1}
+
+.content{width:94%;margin-left:3%;position:relative;z-index:3}
+.data-empty{background:#fff;border-radius:16rpx}
+.content .item{width:100%;display:flex;padding: 20rpx;background:#fff;border-radius:16rpx;margin-bottom:20rpx}
+.item .f1{width:200rpx;height:200rpx;margin-right:20rpx;}
+.item .f2{position: relative; padding-right: 20rpx;flex:1;display:flex;flex-direction:column}
+.item .f2 .t1{font-size:28rpx;font-weight:bold;color: #222;margin-top: 2px;height:80rpx;overflow:hidden}
+.item .f2 .t2{width:100%;margin-top:12rpx;display:flex;align-items:center}
+.item .f2 .t2 .x2{padding-left:16rpx;font-size:24rpx;font-weight:bold}
+.item .f2 .t3{width:100%;margin-top:20rpx;display:flex;align-items:flex-end}
+.item .f2 .t3 .x1{font-size:32rpx;font-weight:bold}
+.item .f2 .t3 .x2{color:#999999;font-size:24rpx;text-decoration:line-through;padding-left:8rpx}
+.item .f2 .t3 .x3{position:absolute;bottom:0;right:0;border: 0;color: #fff;font-size:28rpx;padding:0 28rpx;height:54rpx;line-height:50rpx;border-radius:54rpx;margin:0}
+.item .f2 .t3 .x3.xx1{background:#888}
+
+.progress{width:240rpx;font-size:24rpx}
+.nomore-footer-tips{background:#fff!important}
+</style>
\ No newline at end of file
diff --git a/activity/seckill/orderdetail.vue b/activity/seckill/orderdetail.vue
new file mode 100644
index 0000000..fbec3e2
--- /dev/null
+++ b/activity/seckill/orderdetail.vue
@@ -0,0 +1,330 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择货到付款' : '已成功付款'}}</view>
+				<view class="t2" v-if="detail.freight_type!=1">我们会尽快为您发货</view>
+				<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<text class="t2" user-select="true" selectable="true">发货信息：{{detail.express_com}} {{detail.express_no}}</text>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul +'/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openMendian" :data-storeinfo="storeinfo" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		
+		<view class="btitle flex-y-center" v-if="detail.bid>0">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid"></image>
+			<text class="flex1" decode="true" space="true" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid" style="padding-left:16rpx">{{detail.binfo.name}}</text>
+		</view>
+		
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==0 && seckillset.comment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.leveldk_money > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.coupon_money > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk_money > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text v-if="detail.status==1 && detail.freight_type!=1" class="t2">待发货</text>
+				<text v-if="detail.status==1 && detail.freight_type==1" class="t2">待提货</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot" v-if="detail.status!=3">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+			<block v-if="detail.status==1">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+			</block>
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">查看物流</view>
+			</block>
+
+			<block v-if="detail.status==2">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="orderCollect" :data-id="detail.id">确认收货</view>
+			</block>
+			<block v-if="([1,2,3]).includes(detail.status) && invoice">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=seckill&orderid=' + detail.id">发票</view>
+			</block>
+			<block v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3">
+				<view class="btn2">已完成</view>
+			</block>
+			<block v-if="detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		detail:{},
+		team:{},
+		storeinfo:{},
+		seckillset:{},
+		invoice:0,
+		event_rul: app.globalData.event_url,
+    }
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function (option) {
+			var that = this;
+			that.loading = true;
+			app.get('ApiSeckill/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.seckillset = res.seckillset;
+				that.invoice = res.invoice;
+				that.loaded();
+			});
+		},
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiSeckill/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiSeckill/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiSeckill/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+</style>
\ No newline at end of file
diff --git a/activity/seckill/orderlist.vue b/activity/seckill/orderlist.vue
new file mode 100644
index 0000000..57895f0
--- /dev/null
+++ b/activity/seckill/orderlist.vue
@@ -0,0 +1,214 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+			<view class="order-box" @tap="goto" :data-url="'orderdetail?id=' + item.id">
+				<view class="head">
+					<view class="f1" v-if="item.bid!=0" @tap.stop="goto" :data-url="'/pages/business/index?id=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+					<view v-else>订单号：{{item.ordernum}}</view>
+					<view class="flex1"></view>
+					<text v-if="item.status==0" class="st0">待付款</text>
+					<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+					<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+					<text v-if="item.status==2" class="st2">待收货</text>
+					<text v-if="item.status==3" class="st3">已完成</text>
+					<text v-if="item.status==4" class="st4">已关闭</text>
+				</view>
+
+				<view class="content" style="border-bottom:none">
+					<view @tap.stop="goto" :data-url="'product?id=' + item.proid">
+						<image :src="item.propic"></image>
+					</view>
+					<view class="detail">
+						<text class="t1">{{item.proname}}</text>
+						<text class="t2">{{item.ggname}}</text>
+						<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+					</view>
+				</view>
+				<view class="bottom">
+					<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+					<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+				</view>
+				<view class="op">
+					<block v-if="([1,2,3]).includes(item.status) && item.invoice">
+						<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=seckill&orderid=' + item.id">发票</view>
+					</block>
+					<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+					<block v-if="item.status==0">
+						<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+					</block>
+					<block v-if="item.status==1">
+						<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+					</block>
+					<block v-if="item.status==2">
+						<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+						<view class="btn2" @tap.stop="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">查看物流</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id">确认收货</view>
+					</block>
+					<block v-if="item.status==4">
+						<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+					</block>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+			this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiSeckill/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiSeckill/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiSeckill/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiSeckill/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;flex-wrap: wrap;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/activity/seckill/product.vue b/activity/seckill/product.vue
new file mode 100644
index 0000000..11ba160
--- /dev/null
+++ b/activity/seckill/product.vue
@@ -0,0 +1,689 @@
+<template>
+<view>
+	<block v-if="isload">
+		<block v-if="sysset.showgzts">
+			<view style="width:100%;height:88rpx"> </view>
+			<view class="follow_topbar">
+				<view class="headimg"><image :src="sysset.logo"/></view>
+				<view class="info">
+					<view class="i">欢迎进入 <text :style="{color:t('color1')}">{{sysset.name}}</text></view>
+					<view class="i">关注公众号享更多专属服务</view>
+				</view>
+				<view class="sub" @tap="showsubqrcode" :style="{'background-color':t('color1')}">立即关注</view>
+			</view>
+			<uni-popup id="qrcodeDialog" ref="qrcodeDialog" type="dialog">
+				<view class="qrcodebox">
+					<image :src="sysset.qrcode" @tap="previewImage" :data-url="sysset.qrcode" class="img"/>
+					<view class="txt">长按识别二维码关注</view>
+					<view class="close" @tap="closesubqrcode">
+						<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+					</view>
+				</view>
+			</uni-popup>
+		</block>
+		<view style="position:fixed;top:15vh;left:20rpx;z-index:9;background:rgba(0,0,0,0.6);border-radius:20rpx;color:#fff;padding:0 10rpx" v-if="bboglist.length>0">
+			<swiper style="position:relative;height:54rpx;width:350rpx;" :autoplay="true" :interval="5000" :vertical="true">
+				<swiper-item v-for="(item, index) in bboglist" :key="index" @tap="goto" :data-url="'product?id=' + item.proid" class="flex-y-center">
+					<image :src="item.headimg" style="width:40rpx;height:40rpx;border:1px solid rgba(255,255,255,0.7);border-radius:50%;margin-right:4px"/>
+					<div style="width:300rpx;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;font-size:22rpx">{{item.nickname}} {{item.showtime}}购买了该商品</div>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="swiper-container" v-if="isplay==0">
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+				<block v-for="(item, index) in product.pics" :key="index">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+					</swiper-item>
+				</block>
+			</swiper>
+			<view class="imageCount">{{current+1}}/{{(product.pics).length}}</view>
+			<view v-if="product.video" class="provideo" @tap="payvideo"><image :src="event_rul +'/static/img/static/img/video.png'"/><view class="txt">{{product.video_duration}}</view></view>
+		</view>
+		<view class="videobox" v-if="isplay==1">
+			<video autoplay="true" class="video" id="video" :src="product.video"></video>
+			<view class="parsevideo" @tap="parsevideo">退出播放</view>
+		</view>
+
+		<view class="seckill_title">
+			<image :src="pre_url+'/static/img/tjms.png'" class="f0"/>
+			<view class="f1">
+				<view class="t1"><text style="font-size:24rpx">￥</text>{{product.sell_price}}<text class="x2">￥{{product.market_price}}</text></view>
+				<view class="t2" v-if="seckill_status==0">秒杀未开始</view>
+				<view class="t2" v-if="seckill_status==1">火爆抢购中</view>
+				<view class="t2" v-if="seckill_status==2">秒杀已结束</view>
+			</view>
+			<view class="f3" v-if="seckill_status==0 || seckill_status==1">
+				<view class="t1">距秒杀{{seckill_status==0?'开始':'结束'}}还剩</view>
+				<view class="t2" id="djstime"><text class="djsspan">{{djshour}}</text> : <text class="djsspan">{{djsmin}}</text> : <text class="djsspan">{{djssec}}</text></view>
+			</view>
+		</view>
+
+		<view class="header"> 
+			<view class="price_share">
+				<view class="price">
+					<view class="f1" :style="{color:t('color1')}"><text style="font-size:36rpx">￥</text>{{product.sell_price}}</view>
+					<view class="f2" v-if="product.market_price*1 > product.sell_price*1">￥{{product.market_price}}</view>
+				</view>
+				<view class="share" @tap="shareClick"><image class="img" :src="event_rul +'/static/img/static/img/share.png'"/><text class="txt">分享</text></view>
+			</view>
+			<view class="title">{{product.name}}</view>
+			<view class="sales_stock">
+				<view class="f1">销量：{{product.sales}} </view>
+				<view class="f2">库存：{{product.stock}}</view>
+			</view>
+			<view class="commission" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="seckillset.showcommission==1 && product.commission > 0">分享好友购买预计可得{{t('佣金')}}：<text style="font-weight:bold;padding:0 2px">{{product.commission}}</text>元</view>
+		</view>
+		<view class="choose" @tap="buydialogChange" data-btntype="2">
+			<view class="f1 flex1">请选择商品规格及数量</view>
+			<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+		</view>
+		
+		<view class="cuxiaodiv" v-if="product.givescore > 0">
+			<view class="cuxiaopoint">
+				<view class="f0">送{{t('积分')}}</view>
+				<view class="f1" style="font-size:26rpx">购买可得{{t('积分')}}{{product.givescore}}个</view>
+			</view>
+		</view>
+
+		<view class="cuxiaodiv" v-if="cuxiaolist.length>0 || couponlist.length>0 || product.discount_tips!=''">
+			<view class="cuxiaopoint" v-if="cuxiaolist.length>0">
+				<view class="f0">促销</view>
+				<view class="f1">
+					<view v-for="(item, index) in cuxiaolist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0">{{item.tip}}</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			<view class="cuxiaopoint" v-if="product.discount_tips!=''">
+				<view class="f0">折扣</view>
+				<view class="f1" style="padding-left:10rpx">{{product.discount_tips}}</view>
+				<view class="f2" @tap="goto" data-url="/pages/my/levelinfo">
+					<image :src="event_rul +'/static/img/static/img/arrow-point.png'" mode="widthFix"/>
+				</view>
+			</view>
+			<view class="cuxiaopoint" v-if="couponlist.length>0">
+				<view class="f0">优惠</view>
+				<view class="f1">
+					<view v-for="(item, index) in couponlist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0" style="padding:0 6px">券</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrow-point.png'"/>
+				</view>
+			</view>
+		</view>
+		<view v-if="showcuxiaodialog" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidecuxiaodetail"></view>
+			<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">优惠促销</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidecuxiaodetail"/>
+					</view>
+					<view class="popup__content">
+						<view v-for="(item, index) in cuxiaolist" :key="index" class="service-item">
+							<view class="suffix">
+								<view class="type-name"><text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text> <text style="color:#333;margin-left:20rpx">{{item.name}}</text></view>
+							</view>
+						</view>
+						<couponlist :couponlist="couponlist" @getcoupon="getcoupon"></couponlist>
+					</view>
+			</view>
+		</view>
+		<view class="commentbox" v-if="seckillset.comment==1 && commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评度 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul +'/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"/></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		<view class="shop" v-if="seckillset.showjd==1">
+			<image :src="business.logo" class="p1"/>
+			<view class="p2 flex1">
+				<view class="t1">{{business.name}}</view>
+				<view class="t2">{{business.desc}}</view>
+			</view>
+			<button class="p4" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="goto" :data-url="product.bid==0?'/pages/index/index':'/pages/business/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+		</view>
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+
+		<view style="width:100%;height:140rpx;"></view>
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':'notabbarbot'" v-if="product.status==1">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+				<view class="item flex1" @tap="shareClick">
+					<image class="img" :src="event_rul +'/static/img/static/img/share2.png'"/>
+					<view class="t1">分享</view> 
+				</view>
+				<view class="item" @tap="addfavorite">
+					<image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'"/>
+					<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+				</view>
+			</view>
+			<view class="op">
+				<view class="tobuy flex-x-center flex-y-center" :style="{background:t('color1')}" @tap="buydialogChange" data-btntype="2" v-if="seckill_status==1">立即抢购</view>
+				<view class="tobuy flex-x-center flex-y-center" style="background:#ccc" v-else>立即抢购</view>
+			</view>
+		</view>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+
+		<buydialog v-if="buydialogShow" :proid="product.id" :btntype="btntype" @buydialogChange="buydialogChange" :menuindex="menuindex" controller="ApiSeckill"></buydialog>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  
+	data() {
+		return {
+ 
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+			initdata:{},
+			pre_url:app.globalData.pre_url,
+
+			seckill_status:1,
+			nowtime:0,
+			seckill_duration:0,
+			seckill_starttime:0,
+			djshour:'00',
+			djsmin:'00',
+			djssec:'00',
+			buydialogShow: false,
+			btntype:1,
+			isfavorite: false,
+			current: 0,
+			isplay: 0,
+			showcuxiaodialog: false,
+			business: "",
+			product: [],
+			cartnum: "",
+			commentlist: "",
+			commentcount: "",
+			cuxiaolist: "",
+			couponlist: "",
+			pagecontent: "",
+			guigelist: "",
+			guigedata: "",
+			sysset:{},
+			seckillset: "",
+			title: "",
+			bboglist: "",
+			sharepic: "",
+			sharetypevisible: false,
+			showposter: false,
+			posterpic: "",
+			scrolltopshow: false,
+			kfurl:'',
+			event_rul: app.globalData.event_url,
+		};
+
+	},
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+
+	onUnload: function () {
+		clearInterval(interval);
+	},
+
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.loading = true;
+			app.post('ApiSeckill/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var product = res.product;
+				var sysset = res.sysset;
+				var pagecontent = JSON.parse(product.detail);
+				that.business = res.business;
+				that.product = product;
+				that.cartnum = res.cartnum;
+				that.commentlist = res.commentlist;
+				that.commentcount = res.commentcount;
+				that.cuxiaolist = res.cuxiaolist;
+				that.couponlist = res.couponlist;
+				that.pagecontent = pagecontent;
+				that.sysset = sysset;
+				that.seckillset = res.seckillset;
+				that.title = product.name;
+				that.isfavorite = res.isfavorite;
+				that.oglist = res.oglist;
+				that.sharepic = product.pics[0];
+				that.nowtime = res.nowtime;
+				that.seckill_duration = res.seckill_duration,
+				that.seckill_starttime = res.product.starttime,
+				
+				that.getdjs();
+				clearInterval(interval);
+				interval = setInterval(function(){
+					that.nowtime = that.nowtime+1;
+					that.getdjs();
+				},1000)
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+				that.kfurl = '/pages/kefu/index?bid='+res.product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:res.product.name,pic:res.product.pic});
+			});
+		},
+		getdjs:function(){
+			var that = this
+			var nowtime = that.nowtime*1;
+			var seckill_duration = that.seckill_duration*1;
+			var seckill_starttime = that.seckill_starttime*1;
+			var seckill_endtime = that.seckill_starttime + seckill_duration * 3600;
+			if(seckill_endtime < nowtime){ //已结束
+				that.seckill_status = 2
+				that.djshour = '00';
+				that.djsmin = '00';
+				that.djssec = '00';
+			}else{
+				if(seckill_starttime > nowtime){ //未开始
+					that.seckill_status = 0
+					var totalsec = seckill_starttime - nowtime;
+				}else{ //进行中
+					that.seckill_status = 1
+					var totalsec = seckill_endtime - nowtime;
+				}
+				var houer = Math.floor(totalsec/3600);
+				var min = Math.floor((totalsec - houer *3600)/60);
+				var sec = totalsec - houer*3600 - min*60
+				var djs = (houer<10?'0':'')+houer+'时'+(min<10?'0':'')+min+'分'+(sec<10?'0':'')+sec+'秒';
+				var djshour = (houer<10?'0':'')+houer
+				var djsmin = (min<10?'0':'')+min
+				var djssec = (sec<10?'0':'')+sec
+				that.djshour = djshour;
+				that.djsmin = djsmin;
+				that.djssec = djssec;
+			}
+		},
+
+		swiperChange: function (e) {
+			var that = this;
+			that.current = e.detail.current
+		},
+
+		payvideo: function () {
+			this.isplay = 1;
+			uni.createVideoContext('video').play();
+		},
+
+		parsevideo: function () {
+			this.isplay = 0;
+			uni.createVideoContext('video').stop();
+		},
+
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.btntype = e.currentTarget.dataset.btntype
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+
+		//收藏操作
+
+		addfavorite: function () {
+			var that = this;
+			var proid = that.product.id;
+			app.post('ApiSeckill/addfavorite', {proid: proid,type: 'seckill'}, function (data) {
+				if (data.status == 1) {
+					that.isfavorite = !that.isfavorite;
+				}
+				app.success(data.msg);
+			});
+		},
+
+		shareClick: function () {
+			this.sharetypevisible = true;
+		},
+
+		handleClickMask: function () {
+			this.sharetypevisible = false
+		},
+		showPoster: function () {
+			var that = this;
+			that.showposter = true;
+			that.sharetypevisible = false;
+			app.showLoading('生成海报中');
+			app.post('ApiSeckill/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+				if (data.status == 0) {
+					app.alert(data.msg);
+				} else {
+					that.posterpic = data.poster;
+				}
+			});
+		},
+
+		posterDialogClose: function () {
+			this.showposter = false;
+		},
+
+		showcuxiaodetail: function () {
+			this.showcuxiaodialog = true;
+		},
+
+		hidecuxiaodetail: function () {
+			this.showcuxiaodialog = false
+		},
+		getcoupon:function(){
+			this.showcuxiaodialog = false;
+			this.getdata();
+		},
+
+		onPageScroll: function (e) {
+			var that = this;
+			var scrollY = e.scrollTop;     
+			if (scrollY > 200) {
+				that.scrolltopshow = true;
+			}
+			if(scrollY < 150) {
+				that.scrolltopshow = false
+			}
+		},
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/seckill/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/seckill/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		},
+		showsubqrcode:function(){
+			this.$refs.qrcodeDialog.open();
+		},
+		closesubqrcode:function(){
+			this.$refs.qrcodeDialog.close();
+		},
+
+	}
+
+};
+</script>
+<style>
+.follow_topbar {height:88rpx; width:100%;max-width:640px; background:rgba(0,0,0,0.8); position:fixed; top:0; z-index:13;}
+.follow_topbar .headimg {height:64rpx; width:64rpx; margin:6px; float:left;}
+.follow_topbar .headimg image {height:64rpx; width:64rpx;}
+.follow_topbar .info {height:56rpx; padding:16rpx 0;}
+.follow_topbar .info .i {height:28rpx; line-height:28rpx; color:#ccc; font-size:24rpx;}
+.follow_topbar .info {height:80rpx; float:left;}
+.follow_topbar .sub {height:48rpx; width:auto; background:#FC4343; padding:0 20rpx; margin:20rpx 16rpx 20rpx 0; float:right; font-size:24rpx; color:#fff; line-height:52rpx; border-radius:6rpx;}
+.qrcodebox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.qrcodebox .img{width:400rpx;height:400rpx}
+.qrcodebox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.qrcodebox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+
+.provideo{background:rgba(255,255,255,0.7);width:160rpx;height:54rpx;padding:0 20rpx 0 4rpx;border-radius:27rpx;position:absolute;bottom:30rpx;left:50%;margin-left:-80rpx;display:flex;align-items:center;justify-content:space-between}
+.provideo image{width:50rpx;height:50rpx;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+
+.videobox{width:100%;height:750rpx;text-align:center;background:#000}
+.videobox .video{width:100%;height:650rpx;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx}
+
+.seckill_title{ width:100%;height:110rpx;background: linear-gradient(90deg, #FF3143 0%, #FD6647 100%);display:flex;align-items:center;}
+.seckill_title .f0{width:88rpx;height:88rpx;margin-left:20rpx}
+.seckill_title .f1{flex:1;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.seckill_title .f1 .t1{font-size:40rpx;color:#fff;line-height:50rpx}
+.seckill_title .f1 .t1 .x2{padding-left:8rpx;font-size:26rpx;color:#fff;text-decoration:line-through}
+.seckill_title .f1 .t2{color:#fff;font-size:22rpx}
+.seckill_title .f3{width:250rpx;height:110rpx;background:#FFDBDF;color:#333;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.seckill_title .f3 .t2{color:#FF3143}
+.seckill_title .djsspan{font-size:22rpx;border-radius:8rpx;background:#FF3143;color:#fff;text-align:center;padding:4rpx 8rpx;margin:0 4rpx}
+
+.header {width: 100%;padding: 20rpx 3%;background: #fff;}
+.header .price_share{width:100%;height:100rpx;display:flex;align-items:center;justify-content:space-between}
+.header .price_share .price{display:flex;align-items:flex-end}
+.header .price_share .price .f1{font-size:50rpx;color:#51B539;font-weight:bold}
+.header .price_share .price .f2{font-size:26rpx;color:#C2C2C2;text-decoration:line-through;margin-left:30rpx;padding-bottom:5px}
+.header .price_share .share{display:flex;flex-direction:column;align-items:center;justify-content:center}
+.header .price_share .share .img{width:32rpx;height:32rpx;margin-bottom:2px}
+.header .price_share .share .txt{color:#333333;font-size:20rpx}
+.header .title {color:#000000;font-size:32rpx;line-height:42rpx;font-weight:bold;}
+.header .sales_stock{display:flex;justify-content:space-between;height:60rpx;line-height:60rpx;margin-top:30rpx;font-size:24rpx;color:#777777}
+.header .commission{display:inline-block;margin-top:20rpx;margin-bottom:10rpx;border-radius:10rpx;font-size:20rpx;height:44rpx;line-height:44rpx;padding:0 20rpx}
+
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; }
+.choose .f2{ width: 32rpx; height: 32rpx;}
+
+.cuxiaodiv{background:#fff;margin-top:20rpx;padding: 0 3%;}
+.cuxiaopoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.cuxiaopoint .f0{color:#777777;height:32rpx;font-size:24rpx;padding-right:20rpx;display:flex;justify-content:center;align-items:center}
+.cuxiaopoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.cuxiaopoint .f1 .t{margin-left:10rpx;border-radius:3px;font-size:24rpx;height:40rpx;line-height:40rpx;padding-right:10rpx;flex-shrink:0;overflow:hidden}
+.cuxiaopoint .f1 .t0{display:inline-block;padding:0 5px;}
+.cuxiaopoint .f1 .t1{padding:0 4px}
+.cuxiaopoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.cuxiaopoint .f2 .img{width:32rpx;height:32rpx;}
+.cuxiaodiv .cuxiaopoint{border-bottom:1px solid #E6E6E6;}
+.cuxiaodiv .cuxiaopoint:last-child{border-bottom:0}
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+.service-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.service-item .prefix{padding-top: 2px;}
+.service-item .suffix{padding-left: 10rpx;}
+.service-item .suffix .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:100%;background:#fff;padding:0 3%;margin-top:20rpx}
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{ width: 94%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:100rpx;padding:0 4% 0 2%;align-items:center;box-sizing:content-box}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:80rpx;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+</style>
\ No newline at end of file
diff --git a/activity/seckill/refund.vue b/activity/seckill/refund.vue
new file mode 100644
index 0000000..edf0cb3
--- /dev/null
+++ b/activity/seckill/refund.vue
@@ -0,0 +1,91 @@
+<template>
+<view class="container">
+	<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-item">
+			<text class="label">退款原因</text>
+			<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+		</view>
+		<view class="form-item">
+			<text class="label">退款金额(元)</text>
+			<view class="flex"><input name="money" type="digit" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+		</view>
+		<button class="ref-btn" form-type="submit">确定</button>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		orderid: '',
+		totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.orderid = this.opt.orderid
+		this.totalprice = this.opt.price
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			this.loaded();
+		},
+    formSubmit: function (e) {
+      //console.log(e);return;
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+
+      if (money <= 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiSeckill/refund', {orderid: orderid,reason: reason,money: money}, function (data) {
+				app.showLoading(false);
+        app.alert(data.msg);
+        var pages = getCurrentPages();
+
+        if (pages.length > 1) {
+          var prePage = pages[pages.length - 2];
+          prePage.getdata();
+        }
+        setTimeout(function () {
+          app.goback();
+        }, 1000);
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-item{ width:100%;background: #fff; padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.ref-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; text-align: center; color: #fff; font-size: 16px; border-radius: 8px;border: none; background: #ff8758; }
+</style>
\ No newline at end of file
diff --git a/activity/shortvideo/detail.nvue b/activity/shortvideo/detail.nvue
new file mode 100644
index 0000000..02bec32
--- /dev/null
+++ b/activity/shortvideo/detail.nvue
@@ -0,0 +1,1896 @@
+<template>
+	<view class="page" v-if="isload">
+
+		<view class="video-info" >
+			<view class="video-info__top">
+				<view class="video-info__title">{{videoDataList[_videoDataIndex].name}}</view>
+				<view class="video-info__txt">{{videoDataList[_videoDataIndex].description}}
+				</view>
+				<view class="video-info__topic flex al-item-center">
+					<view class="topic-item flex al-item-center" v-for="(items,indexs) in videoDataList[_videoDataIndex].topiclist" :key='indexs'>
+						<view class="topic-item__icon flex al-item-center j-center">
+							<text>#</text>
+						</view>
+						<view class="topic-item__name" @click="goto" :data-url="'/diary/topic/topic?id='+items.id">{{items.topic_name}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="video-info__bot flex al-item-center j-between">
+				<view class="video-info__user flex al-item-center"  @tap="gotourl" :data-url="videoDataList[_videoDataIndex].mid==0?'/pages/index/index':'/diary/info/info?id='+videoDataList[_videoDataIndex].mid">
+					<image class="user-header"  :src="videoDataList[_videoDataIndex].binfo.logo" mode=""></image>
+					<view class="user-name">{{videoDataList[_videoDataIndex].binfo.name}}</view>
+				</view>
+				<view class="video-info__detail flex al-item-center">
+					<view class="product-info position-r">
+						<view class="product-info__entry flex al-item-center j-center" style="align-items: center;" v-if="videoDataList[_videoDataIndex].pronum > 0" @tap="proboxClick">
+							<text class="iconfont icon-shangpin"></text>
+						</view>
+						<view class="product-info__card position-a" style="position: absolute;" :style="menuindex > -1 ? 'bottom:230rpx':''"
+							v-if="!videoDataList[_videoDataIndex].linkurl && prodialogshow && videoDataList[_videoDataIndex].proid > 0"
+							@tap="gotourl" :data-url="'/pages/shop/product?id='+videoDataList[_videoDataIndex].proid">
+							<image class="card-bgimg position-a" style="position: absolute;" :src="event_rul +'/static/img/static/img/shortvideo_probg.png'"></image>
+							<view class="card-con flex">
+								<image class="card-hd" :src="videoDataList[_videoDataIndex].propic"></image>
+								<view class="card-bd">
+									<text class="card-bd__name">{{videoDataList[_videoDataIndex].proname}}</text>
+									<text class="card-bd__sales">{{videoDataList[_videoDataIndex].prosales}}人购买</text>
+									<text class="card-bd__price">￥{{videoDataList[_videoDataIndex].prosell_price}}</text>
+								</view>
+							</view>
+							<image class="card-close position-a" style="position: absolute;" :src="event_rul +'/static/img/static/img/close.png'" @tap.stop="prodialogClose" />
+						</view>
+					</view>
+					<view class="info-item flex al-item-center" @tap="shareClick">
+						<text class="iconfont icon-zhuanfa"></text>
+						<text class="info-item__txt">{{videoDataList[_videoDataIndex].share_num >= 10000 ? (videoDataList[_videoDataIndex].share_num / 10000).toFixed(1)+'万': videoDataList[_videoDataIndex].share_num}}</text>
+					</view>
+					<view class="info-item flex al-item-center"  @tap="dozan">
+						<text v-if="!videoDataList[_videoDataIndex].iszan" class="iconfont icon-aixin"></text>
+						<text v-else style="color: #EC2828;"  class="iconfont icon-aixin_shixin"></text>
+						<text class="info-item__txt">{{videoDataList[_videoDataIndex].zan_num >= 10000 ? (videoDataList[_videoDataIndex].zan_num / 10000).toFixed(1)+'万': videoDataList[_videoDataIndex].zan_num}}</text>
+					</view>
+					<view class="info-item flex al-item-center" @tap="favFn">
+						<text v-if="!videoDataList[_videoDataIndex].isfavorite" class="iconfont icon-shoucang"></text>
+						<text v-else style="color: #EC2828;" class="iconfont icon-Collection"></text>
+						<text class="info-item__txt">{{videoDataList[_videoDataIndex].favoriteCount >= 10000 ? (videoDataList[_videoDataIndex].favoriteCount / 10000).toFixed(1)+'万': videoDataList[_videoDataIndex].favoriteCount}}</text>
+					</view>
+					<view class="info-item flex al-item-center" @tap="commentClick" v-if="videoDataList[_videoDataIndex].comment==1">
+						<text class="iconfont icon-xiaoxi" style="font-size: 44rpx;"></text>
+						<text class="info-item__txt">{{videoDataList[_videoDataIndex].comment_count >= 10000 ? (videoDataList[_videoDataIndex].comment_count / 10000).toFixed(1)+'万': videoDataList[_videoDataIndex].comment_count}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<swiper class="swiper" :circular="circular" :vertical="true" @change="onSwiperChange">
+			<swiper-item v-for="item in videoList" :key="item.id">
+				<video class="video" :id="item.id" :ref="item.id" :src="item.src"  :controls="false" :loop="true"
+					:show-center-play-btn="false" @timeupdate="cece2" @tap="playpause" @pause='isStop = true' @play="onplay"></video>
+			</swiper-item>
+		</swiper>
+		<view class="goback"  :style="{top:gobacktopHeight+'px'}" style="flex-direction: initial;">
+			<!-- <image class="goback-img" :src="event_rul +'/static/img/static/img/goback.png'" /> -->
+			<text class="iconfont icon-icon_arrow_left" style="color: #fff; font-size: 40rpx;" @tap="goback"></text>
+			<button type="default" v-if="videoDataList[_videoDataIndex].isMy" class="right-d flex flex-colum al-item-center j-around" @tap="edSle(videoDataList[_videoDataIndex].id)" :style="{'background-color':'transparent'}">
+				<text class="d1 border-rius-r"></text>
+				<text class="d1 border-rius-r"></text>
+				<text class="d1 border-rius-r"></text>
+			</button>
+		</view>
+
+
+	<!-- <view class="title" :style="menuindex > -1 ? 'bottom:270rpx':''"><text class="title-txt">{{videoDataList[_videoDataIndex].name}}</text></view> -->
+	<!-- <view class="description" :style="menuindex > -1 ? 'bottom:170rpx':''"><text class="description-txt">{{videoDataList[_videoDataIndex].description}}</text></view> -->
+
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+
+	<view class="popupshare__content" v-if="sharetypevisible" :style="menuindex > -1 ? 'bottom:110rpx':''">
+		<image :src="event_rul +'/static/img/static/img/close.png'" class="popupshare__close2" @tap.stop="handleClickMask" />
+		<view class="sharetypecontent">
+			<view class="sharetypecontent-f1" @tap="shareapp" v-if="platform == 'app'">
+				<image class="sharetypecontent-f1-img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+				<text class="sharetypecontent-f1-t1">分享给好友</text>
+			</view>
+			<view class="sharetypecontent-f1" @tap="sharemp" v-else-if="platform == 'mp'">
+				<image class="sharetypecontent-f1-img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+				<text class="sharetypecontent-f1-t1">分享给好友</text>
+			</view>
+			<view class="sharetypecontent-f1" @tap="sharemp" v-else-if="platform == 'h5'">
+				<image class="sharetypecontent-f1-img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+				<text class="sharetypecontent-f1-t1">分享给好友</text>
+			</view>
+			<button class="sharetypecontent-f1" open-type="share" v-else @click="sharMust">
+				<image class="sharetypecontent-f1-img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+				<text class="sharetypecontent-f1-t1">分享给好友</text>
+			</button>
+			<view class="sharetypecontent-f2" @tap="showPoster">
+				<image class="sharetypecontent-f2-img" :src="event_rul +'/static/img/static/img/sharepic.png'" />
+				<text class="sharetypecontent-f2-t1">生成分享图片</text>
+			</view>
+		</view>
+	</view>
+	<view class="posterDialog" v-if="showposter">
+		<view class="posterDialog-main">
+			<view class="posterDialog-close" @tap="posterDialogClose">
+				<image class="posterDialog-img" :src="event_rul +'/static/img/static/img/close.png'" />
+			</view>
+			<view class="posterDialog-content">
+				<image class="posterDialog-content-img" :src="posterpic" mode="widthFix" @tap="previewImage"
+					:data-url="posterpic"></image>
+			</view>
+		</view>
+	</view>
+
+	<!--评论-->
+	<view class="plbox" v-if="showcomment" :style="menuindex > -1 ? 'bottom:110rpx':''">
+		<view class="plbox_title"><text class="plbox_title-t1">评论</text><text
+				class="plbox_title-t2">({{videoDataList[_videoDataIndex].comment_count}})</text></view>
+		<image :src="event_rul +'/static/img/static/img/close.png'" class="plbox-close" @tap.stop="commentClick" />
+		<scroll-view class="plbox_content" scroll-y="true" @scrolltolower="getmorecomment">
+			<block v-for="(item, idx) in commentlist" :key="idx">
+				<view class="plbox_content-item">
+					<view class="plbox_content-item-f1 flex0">
+						<image :src="item.headimg" class="plbox_content-item-f1-img"></image>
+					</view>
+					<view class="plbox_content-item-f2 flex-col">
+						<text class="plbox_content-item-f2-t1">{{item.nickname}}</text>
+						<view class="plbox_content-item-f2-t2 plbox_content-plcontent flex j-between">
+							<view class="plbox_content-item-f2__con" v-for="con in item.content" :key='con'>
+								<text v-if="con.type=='text'"
+									class="plbox_content-plcontent-text">{{con.content}}</text>
+								<image v-if="con.type=='image'" :src="con.content"
+									class="plbox_content-plcontent-image"></image>
+							</view>
+							<view class="plbox_content-item-f2-pzan" @tap="pzan" :data-id="item.id" :data-index="idx">
+									<text  v-if="item.iszan ==1"  style="color: red; margin-right: 10rpx; " class="iconfont icon-aixin_shixin"></text>
+									<text v-else style="margin-right: 10rpx; " class="iconfont icon-aixin"></text>
+									<text class="plbox_content-item-f2-pzan-txt">{{item.zan}}</text>
+							</view>											
+						</view>
+						<block v-if="item.replylist.length>0">
+							<view class="plbox_content-relist">
+								<block v-for="(hfitem, index) in item.replylist" :key="index">
+									<view class="plbox_content-relist-item2">
+										<view class="flex-row">
+											<image :src="hfitem.headimg" class="plbox_content-relist-headimg" />
+											<text class="plbox_content-relist-nickname">{{hfitem.nickname}}</text>
+										</view>
+										<view class="plbox_content-relist-f2 plbox_content-plcontent">
+											<block v-for="con in hfitem.content" :key='con'>
+												<text v-if="con.type=='text'"
+													class="plbox_content-plcontent-text">{{con.content}}</text>
+												<image v-if="con.type=='image'" :src="con.content"
+													class="plbox_content-plcontent-image"></image>
+											</block>
+										</view>
+									</view>
+								</block>
+							</view>
+						</block>
+						<view class="plbox_content-item-f2-t3">
+							<text class="plbox_content-item-f2-t3-x1">{{item.createtime}}</text>
+							<view class="plbox_content-item-f2-t3-x2" @click="indexFn(item.mid)"><text
+									class="plbox_content-item-f2-phuifu" @tap="replyClick" :data-id="item.id"
+									:data-nickname="item.nickname">回复</text></view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view v-if="nomore"><text class="comment-nomore">没有更多数据了</text></view>
+			<view v-if="nodata"><text class="comment-nodata">暂无评论!</text></view>
+		</scroll-view>
+		<loading v-if="loading"></loading>
+		<view class="plbox-replyshadow" v-if="hfid!=0" @tap.stop="replyshadowClick"></view>
+		<view class="pinglun">
+			<view class="pinglun-bd flex al-item-center">
+				<text @tap="toggleFaceBox" class="iconfont icon-qianbi"></text>
+				<input @confirm="sendMessage" @focus="onInputFocus" @input="messageChange" class="pinglun-input"
+					confirmHold="true" confirmType="send" cursorSpacing="20" type="text" :value="message"
+					:placeholder="messageholder" />
+			</view>
+			<view class="pinglun-buybtn" @tap="sendcomment(item)"><text class="pinglun-buybtn-txt">发表</text></view>
+		</view>
+		<wxface v-if="faceshow" @selectface="selectface"></wxface>
+	</view>
+
+	<!--商品-->
+	<view class="probox" v-if="showproduct" :style="menuindex > -1 ? 'bottom:110rpx':''">
+		<view class="probox_title"><text class="probox_title-t1">全部商品</text><text
+				class="plbox_title-t2">({{videoDataList[_videoDataIndex].pronum}})</text></view>
+		<image :src="event_rul +'/static/img/static/img/close.png'" class="plbox-close" @tap.stop="proboxClick" />
+		<scroll-view class="probox_content" scroll-y="true">
+			<block v-for="(item, idx) in prolist" :key="item.id">
+				<view class="probox_content-item" @tap="gotourl" :data-url="'/pages/shop/product?id='+item.id" :data-sign="item.sign" :data-item="item">
+					<image :src="item.pic" class="probox_content-item-img" />
+					<view class="probox_content-item-info">
+						<text class="probox_content-item-name">{{item.name}}</text>
+						<text class="probox_content-item-sales">{{item.sales}}人购买</text>
+						<text class="probox_content-item-price" :style="{'color': t('color1')} || '#EFBD6F'">￥{{item.sell_price}}</text>
+					</view>
+					<view class="probox_content-item-btn"><text class="probox_content-item-btn-txt">立即抢购</text></view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+	
+	<view @click="playClick" class="stop_box2"  v-if="isStop">
+		<text  style="font-size: 140rpx;" class="iconfont icon-bofang"></text>
+	</view>
+	<view class="stop_box"  v-if="isStop">
+	{{formatSeconds(Math.ceil(minKey))}}	<slider block-size='12' backgroundColor='rgba(255,255,255,0.5)' block-color='#fff' activeColor='#fff' style="flex:1;" :value="minKey" @change="cece" min="0" :max="maxKey" />{{formatSeconds(Math.ceil(maxKey))}}
+	</view>
+	
+	<view class="hitn-n position-f" v-show="hintShow">
+		<view class="hint-bx position-a">
+			<image class="hint-img" :src="event_rul + '/static/images/hint-n.png'" mode="widthFix"></image>
+			<view class="content position-a  flex flex-colum al-item-center">
+				<text class="h-title font-w">温馨提示</text>
+				<text class="text">该视频已删除！</text>
+			</view>
+		</view>
+	</view>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+	</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				isStop:false,
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+				minKey:0,
+				maxKey:0,
+				nomore: false,
+				nodata: false,
+				platform: app.globalData.platform,
+				gobacktopHeight: 40,
+				userId: '',
+				playst: true,
+				circular: true,
+				videoList: [{
+					id: "video0",
+					src: "",
+					img: ""
+				}, {
+					id: "video1",
+					src: "",
+					img: ""
+				}, {
+					id: "video2",
+					src: "",
+					img: ""
+				}],
+				_videoDataIndex: 0,
+				videoDataList: [],
+				prodialogshow: true,
+				sharetypevisible: false,
+				showposter: false,
+				posterpic: "",
+				showcomment: false,
+				commentlist: [],
+				pagenum: 1,
+				message: "",
+				trimMessage: "",
+				faceshow: false,
+				hfid: 0,
+				messageholder: '发表评论',
+				showproduct: false,
+				prolist: [],
+				isplay: false,
+				isplayst: true,
+				
+				event_rul: app.globalData.event_url,
+				
+				hintShow:false,
+				hintTime: null,
+			}
+		},
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+		},
+		onUnload() {
+			clearTimeout(this.hintTime)
+		},
+		onReady() {
+			this.init();
+			this.getdata();
+			var sysinfo = uni.getSystemInfoSync();
+			console.log(sysinfo);
+			if (sysinfo && sysinfo.statusBarHeight) {
+				this.gobacktopHeight = sysinfo.statusBarHeight + 4;
+			}
+			// #ifdef H5
+			this.gobacktopHeight = 20;
+			// #endif
+		},
+		onShareAppMessage: function() {
+			return this._sharewx({
+				title: this.videoDataList[this._videoDataIndex].name,
+				pic: this.videoDataList[this._videoDataIndex].coverimg
+			});
+		},
+		onShareTimeline: function() {
+			var sharewxdata = this._sharewx({
+				title: this.videoDataList[this._videoDataIndex].name,
+				pic: this.videoDataList[this._videoDataIndex].coverimg
+			});
+			var query = (sharewxdata.path).split('?')[1];
+			return {
+				title: sharewxdata.title,
+				imageUrl: sharewxdata.imageUrl,
+				query: query
+			}
+		},
+		methods: {
+			// 编辑、删除
+			edSle(id) {
+				uni.showActionSheet({
+					itemList: ['编辑视频', '删除视频'],
+					success: res => {
+						if(res.tapIndex == 0) {
+							this.editData(id)
+						}else {
+							this.delDrafts(id)
+						}
+						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮', id);
+					},
+					fail: function (res) {
+						// console.log(res.errMsg);
+					}
+				});
+			},
+			// 编辑视频
+			editData(id) {
+				let url = 'ApiShortvideo/newDetail'
+				let dataurl = '/diary/issue/issue?type=video'
+					
+				app.post(url, {
+					id: id,
+					// isdraft: 1
+				}, res => {
+					if(res.status == 1) {
+						uni.navigateTo({
+							url:dataurl+'&editId='+ id + '&detail='+JSON.stringify(res.video)  + '&recordlist=' + JSON.stringify(res.proList)
+						})
+					}else {
+						app.error(res.msg)
+					}
+			
+				})
+			},
+			// 删除笔记
+			delDrafts(id) {
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该视频吗?',
+					confirmColor: this.t('color1'),
+					success:  (res) => {
+						if (res.confirm) {
+							app.get('ApiShortvideo/delvideo',{id:id},(res)=>{
+								if(res.status == 1) {
+									app.error(res.msg)
+									this.timeouts = setTimeout(() => {
+										uni.navigateBack()
+									}, 1200)
+									
+								}else {
+									app.error(res.msg)
+								}
+							})
+						} else if (res.cancel) {
+							
+						}
+					}
+				});
+			
+			
+			},
+			// 分享必调的接口
+			sharMust() {
+				app.post('ApiShortvideo/shareNum', {
+					type: this.opt.type,
+					id: this.videoDataList[this._videoDataIndex].id
+				}, res => {
+				})
+			},
+			formatSeconds(time){
+			let newTime,hour,minite,seconds;
+			if(time >= 3600){
+			hour = parseInt(time/3600) < 10 ? '0' + parseInt(time/3600) : parseInt(time/3600) ;
+			minite = parseInt(time%60/60) < 10 ? '0' + parseInt(time%60/60):parseInt(time%60/60);
+			seconds = time%3600 < 10 ? '0' + time%3600 : time%3600;
+			newTime = hour + ':' + minite + ':' + seconds;
+			}else if(time >= 60 && time < 3600){
+			minite = parseInt(time/60) < 10 ? '0' + parseInt(time/60) : parseInt(time/60);
+			seconds = time%60 < 10 ? '0' + time%60 : time%60;
+			newTime = minite + ':' + seconds;
+			}else if(time < 60 ){
+			seconds = time < 10 ? '0' + time : time;
+			newTime = '00:'+ seconds;
+			}
+			return newTime;
+			}
+			,
+			formatSeconds1(value) {
+			    let result = parseInt(value)
+			    let h = Math.floor(result / 3600) < 10 ? '0' + Math.floor(result / 3600) : Math.floor(result / 3600);
+			    let m = Math.floor((result / 60 % 60)) < 10 ? '0' + Math.floor((result / 60 % 60)) : Math.floor((result / 60 % 60));
+			    let s = Math.floor((result % 60)) < 10 ? '0' + Math.floor((result % 60)) : Math.floor((result % 60));
+			
+			    let res = '';
+			    if(h !== '00') res += `${h}h`;
+			    if(m !== '00') res += `${m}min`;
+			    res += `${s}s`;
+			    return res
+				},
+			cece2(e){
+				// console.log(Math.ceil(e.detail.currentTime))
+				this.minKey = e.detail.currentTime
+				this.maxKey = e.detail.duration
+			},
+			cece(e){
+				console.log(e.detail.value)
+				this._videoContextList[this._videoIndex].seek(e.detail.value);
+			}
+			,
+			favFn(){
+				// that.videoDataList[that._videoDataIndex]
+				let that = this
+				app.post('ApiShop/addfavorite',{proid:that.videoDataList[that._videoDataIndex].id,type:'video'},res=>{
+					console.log(res)
+					if(res.msg == '已收藏'){
+						that.videoDataList[that._videoDataIndex].isfavorite = true;
+						that.videoDataList[that._videoDataIndex].favoriteCount++
+					}else{
+						that.videoDataList[that._videoDataIndex].isfavorite = false;
+						that.videoDataList[that._videoDataIndex].favoriteCount--
+					}
+				})
+			},
+			indexFn(e) {
+				this.userId = e;
+			},
+			init() {
+				this._videoIndex = 0;
+				this._videoContextList = [];
+				for (var i = 0; i < this.videoList.length; i++) {
+					this._videoContextList.push(uni.createVideoContext('video' + i, this));
+				}
+				this._videoDataIndex = 0;
+			},
+			getdata(e) {
+				var that = this;
+				that.nomore = false;
+				that.loading = true;
+				uni.showLoading({
+					title: '加载中...'
+				});
+				app.post('ApiShortvideo/detail', {
+					id: that.opt.id,
+					cid: that.opt.cid
+				}, function(res) {
+					uni.hideLoading()
+					that.loading = false;
+					that.isload = true;
+					
+					if(res.status == 1 && res.videoList[0].id == that.opt.id && res.videoList[0].is_del == 1 ) {
+						that.hintShow = true
+						that.hintTime = setTimeout(() => {
+							that.hintShow = false
+							uni.navigateBack()
+						}, 2000)
+						return
+					}
+					
+					
+					that.videoDataList = res.videoList;
+					
+					// #ifndef APP-PLUS
+					that.loaded({
+						title: that.videoDataList[that._videoDataIndex].name,
+						desc: that.videoDataList[that._videoDataIndex].description,
+						pic: that.videoDataList[that._videoDataIndex].coverimg
+					});
+					// #endif
+					setTimeout(() => {
+						that.updateVideo(true);
+					}, 200)
+				});
+			},
+			onSwiperChange(e) {
+				let currentIndex = e.detail.current;
+				if (currentIndex === this._videoIndex) {
+					return;
+				}
+				let isNext = false;
+				if (currentIndex === 0 && this._videoIndex === this.videoList.length - 1) {
+					isNext = true;
+				} else if (currentIndex === this.videoList.length - 1 && this._videoIndex === 0) {
+					isNext = false;
+				} else if (currentIndex > this._videoIndex) {
+					isNext = true;
+				}
+
+				if (isNext) {
+					this._videoDataIndex++;
+				} else {
+					this._videoDataIndex--;
+				}
+
+				if (this._videoDataIndex < 0) {
+					this._videoDataIndex = this.videoDataList.length - 1;
+				} else if (this._videoDataIndex >= this.videoDataList.length) {
+					this._videoDataIndex = 0;
+				}
+
+				this.circular = (this._videoDataIndex != 0);
+
+				if (this._videoIndex >= 0) {
+					this._videoContextList[this._videoIndex].pause();
+					this._videoContextList[this._videoIndex].seek(0);
+				}
+
+				this._videoIndex = currentIndex;
+				setTimeout(() => {
+					this.updateVideo(isNext);
+				}, 200);
+
+				this.showcomment = false;
+				this.prodialogshow = true;
+				app.post('ApiShortvideo/updateviewnum', {
+					id: this.videoDataList[this._videoDataIndex].id
+				}, function() {});
+			},
+			getNextIndex(isNext) {
+				let index = this._videoIndex + (isNext ? 1 : -1);
+				if (index < 0) {
+					return this.videoList.length - 1;
+				} else if (index >= this.videoList.length) {
+					return 0;
+				}
+				return index;
+			},
+			getNextDataIndex(isNext) {
+				let index = this._videoDataIndex + (isNext ? 1 : -1);
+				if (index < 0) {
+					return this.videoDataList.length - 1;
+				} else if (index >= this.videoDataList.length) {
+					return 0;
+				}
+				return index;
+			},
+			onplay: function() {
+				this.isplay = true;
+				this.isplayst = true;
+				this.isStop = false;
+			},
+			playClick: function() {
+				this._videoContextList[this._videoIndex].play();
+			},
+			playpause: function() {
+				if (this.playst) {
+					this._videoContextList[this._videoIndex].pause();
+				} else {
+					this._videoContextList[this._videoIndex].play();
+				}
+				this.playst = !this.playst;
+			},
+			updateVideo(isNext) {
+				this.$set(this.videoList[this._videoIndex], 'src', this.videoDataList[this._videoDataIndex].src);
+				this.$set(this.videoList[this.getNextIndex(isNext)], 'src', this.videoDataList[this.getNextDataIndex(
+					isNext)].src);
+
+				this.isplay = false;
+				this.isplayst = true;
+				setTimeout(() => {
+					this._videoContextList[this._videoIndex].play();
+				}, 200);
+				setTimeout(() => {
+					if (this.isplay == false) this.isplayst = false;
+				}, 400)
+				console.log("v:" + this._videoIndex + " d:" + this._videoDataIndex + "; next v:" + this.getNextIndex(
+					isNext) + " next d:" + this.getNextDataIndex(isNext));
+			},
+			prodialogClose: function() {
+				this.prodialogshow = false
+			},
+			dozan: function() {
+				var that = this
+				app.post('ApiShortvideo/zan', {
+					id: this.videoDataList[this._videoDataIndex].id
+				}, function(res) {
+					that.videoDataList[that._videoDataIndex].iszan = res.iszan;
+					that.videoDataList[that._videoDataIndex].zan_num = res.zan_num;
+				});
+			},
+			proboxClick: function() {
+				var that = this;
+				this.showproduct = !this.showproduct;
+				if (this.showproduct) {
+					this.getprolist();
+				}
+			},
+			getprolist: function(loadmore) {
+				var that = this;
+				if (!loadmore) {
+					this.pagenum = 1;
+					this.prolist = [];
+				}
+				that.nodata = false;
+				that.nomore = false;
+				app.post('ApiShortvideo/getprolist', {
+					id: this.videoDataList[this._videoDataIndex].id,
+					pagenum: this.pagenum
+				}, function(res) {
+					var data = res.data;
+					if (that.pagenum == 1) {
+						that.prolist = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+					} else {
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var prolist = that.prolist;
+							var newdata = prolist.concat(data);
+							that.prolist = newdata;
+						}
+					}
+				});
+			},
+			gotourl: function(e) {
+				if(e.currentTarget.dataset.sign &&  e.currentTarget.dataset.sign == 1) {
+					uni.navigateToMiniProgram({
+					  appId: e.currentTarget.dataset.item.appid,
+					  path: e.currentTarget.dataset.item.path + '?id=' + e.currentTarget.dataset.item.id,
+					  success: res => {
+					    // 打开成功
+					  }
+					})
+				}else {
+					getApp().goto(e.currentTarget.dataset.url, e.currentTarget.dataset.opentype)
+				}
+				
+			},
+			getmoreprolist: function() {
+				this.pagenum = this.pagenum + 1;
+				if (!this.nomore && !this.nodata) {
+					this.getprolist(true);
+				}
+			},
+			commentClick: function() {
+				var that = this;
+				this.showcomment = !this.showcomment;
+				if (this.showcomment) {
+					this.getcommentlist();
+				}
+			},
+			getcommentlist: function(loadmore) {
+				var that = this;
+				if (!loadmore) {
+					this.pagenum = 1;
+					this.commentlist = [];
+				}
+				that.nodata = false;
+				that.nomore = false;
+				app.post('ApiShortvideo/getcommentlist', {
+					id: this.videoDataList[this._videoDataIndex].id,
+					pagenum: this.pagenum
+				}, function(res) {
+					var data = res.data;
+					if (that.pagenum == 1) {
+						that.commentlist = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+					} else {
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var commentlist = that.commentlist;
+							var newdata = commentlist.concat(data);
+							that.commentlist = newdata;
+						}
+					}
+				});
+			},
+			getmorecomment: function() {
+				this.pagenum = this.pagenum + 1;
+				if (!this.nomore && !this.nodata) {
+					this.getcommentlist(true);
+				}
+			},
+			replyClick: function(e) {
+				var id = e.currentTarget.dataset.id
+				this.message = '';
+				this.hfid = e.currentTarget.dataset.id;
+				this.messageholder = '回复 ' + e.currentTarget.dataset.nickname + '：';
+			},
+			replyshadowClick: function() {
+				this.hfid = 0;
+				this.message = '';
+				this.messageholder = '发表评论';
+			},
+			sendcomment: function() {
+				console.log('gaga', this.videoDataList[this._videoDataIndex])
+				var that = this;
+				var message = this.message;
+				var hfid = this.hfid;
+				app.showLoading('提交中');
+				app.post('ApiShortvideo/subpinglun', {
+					userId: hfid ? this.userId : '',
+					id: this.videoDataList[this._videoDataIndex].id,
+					hfid: hfid,
+					content: message
+				}, function(res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+						app.error(res.msg);
+					} else {
+						that.videoDataList[that._videoDataIndex].comment_count++
+						app.error(res.msg);
+						that.videoDataList[that._videoDataIndex].commentnum = res.commentnum;
+						that.getcommentlist();
+						that.message = '';
+						that.hfid = 0;
+						that.messageholder = '发表评论';
+						that.faceshow = false;
+					}
+				});
+
+			},
+			pzan: function(e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id;
+				var index = e.currentTarget.dataset.index;
+				var commentlist = that.commentlist;
+				app.post("ApiShortvideo/pzan", {
+					id: id
+				}, function(res) {
+					if (res.type == 0) {
+						//取消点赞
+						var iszan = 0;
+					} else {
+						var iszan = 1;
+					}
+					commentlist[index].iszan = iszan;
+					commentlist[index].zan = res.zancount;
+					that.commentlist = commentlist;
+				});
+			},
+			shareClick: function() {
+				this.sharetypevisible = !this.sharetypevisible;
+			},
+			handleClickMask: function() {
+				this.sharetypevisible = false
+			},
+			showPoster: function() {
+				var that = this;
+				that.showposter = true;
+				that.sharetypevisible = false;
+				app.showLoading('生成海报中');
+				app.post('ApiShortvideo/getposter', {
+					id: this.videoDataList[this._videoDataIndex].id
+				}, function(data) {
+					app.showLoading(false);
+					if (data.status == 0) {
+						app.alert(data.msg);
+					} else {
+						that.posterpic = data.poster;
+					}
+				});
+			},
+			posterDialogClose: function() {
+				this.showposter = false;
+				console.log('11')
+			},
+			toggleFaceBox: function() {
+				this.faceshow = !this.faceshow
+			},
+			onInputFocus: function(e) {
+				this.faceshow = false
+			},
+			messageChange: function(e) {
+				this.message = e.detail.value;
+				this.trimMessage = e.detail.value.trim();
+			},
+			transformMsgHtml: function(msgtype, content) {
+				if (msgtype == 'miniprogrampage') {
+					var contentdata = JSON.parse(content);
+					content = '<div style="font-size:16px;font-weight:bold;height:25px;line-height:25px">' +
+						contentdata.Title + '</div><img src="' + contentdata.ThumbUrl + '" width="200"/>';
+				}
+				if (msgtype == 'image') {
+					content = '<img src="' + content + '" width="200"/>';
+				}
+				return content;
+			},
+			selectface: function(face) {
+				this.message = "" + this.message + face;
+				this.trimMessage = this.message.trim();
+			},
+			goback: function() {
+				getApp().goback();
+			},
+			sharemp: function() {
+				app.error('点击右上角发送给好友或分享到朋友圈');
+				this.sharetypevisible = false
+			},
+			shareapp: function() {
+				var that = this;
+				var videoinfo = that.videoDataList[that._videoDataIndex]
+				uni.showActionSheet({
+					itemList: ['发送给微信好友', '分享到微信朋友圈'],
+					success: function(res) {
+						if (res.tapIndex >= 0) {
+							var scene = 'WXSceneSession';
+							if (res.tapIndex == 1) {
+								scene = 'WXSenceTimeline';
+							}
+							var sharedata = {};
+							sharedata.provider = 'weixin';
+							sharedata.type = 0;
+							sharedata.scene = scene;
+							sharedata.title = videoinfo.name;
+							sharedata.summary = videoinfo.description;
+							sharedata.href = app.globalData.pre_url + '/h5/' + app.globalData.aid +
+								'.html#/activity/shortvideo/detail?scene=id_' + videoinfo.id + '-pid_' +
+								app.globalData.mid;
+							sharedata.imageUrl = videoinfo.coverimg;
+							var sharelist = app.globalData.initdata.sharelist;
+							if (sharelist) {
+								for (var i = 0; i < sharelist.length; i++) {
+									if (sharelist[i]['indexurl'] == '/activity/shortvideo/detail') {
+										sharedata.title = sharelist[i].title;
+										sharedata.summary = sharelist[i].desc;
+										sharedata.imageUrl = sharelist[i].pic;
+										if (sharelist[i].url) {
+											var sharelink = sharelist[i].url;
+											if (sharelink.indexOf('/') === 0) {
+												sharelink = app.globalData.pre_url + '/h5/' + app
+													.globalData.aid + '.html#' + sharelink;
+											}
+											if (app.globalData.mid > 0) {
+												sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') +
+													'pid=' + app.globalData.mid;
+											}
+											sharedata.href = sharelink;
+										}
+									}
+								}
+							}
+							uni.share(sharedata);
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.stop_box2{
+		z-index:9;
+		position: fixed;
+		top: 40%;
+		opacity: 0.5;
+		padding:  0 20rpx;
+		color: #fff;
+		// background-color: #fff;
+		left: 0;
+		right: 0;
+		font-size: 170rpx;
+		justify-content: center;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		
+	}
+	
+	.stop_box{
+		z-index:9;
+		position: fixed;
+		bottom: 310rpx;
+		opacity: .8;
+		padding:  0 20rpx;
+		color: #fff;
+		// background-color: #fff;
+		left: 0;
+		right: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		
+	}
+
+	/* #ifndef APP-PLUS */
+	page {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		overflow: hidden;
+		position: relative
+	}
+
+	/* #endif */
+	.page {
+		flex: 1;
+		/* width: 750rpx; */
+	}
+
+	.swiper {
+		flex: 1;
+	}
+
+	.swiper-item {
+		flex: 1;
+	}
+
+	.video {
+		flex: 1;
+		/* #ifndef APP-PLUS */
+		width: 100%;
+		/* #endif */
+	}
+
+	.flex-row {
+		display: flex;
+		flex-direction: row
+	}
+
+	.goback {
+		position: absolute;
+		z-index: 4;
+		top: 40px;
+		left: 15px;
+		// width: 30px;
+		height: 30px;
+		display: flex;
+		// flex-direction: column;
+		align-items: center
+	}
+	.right-d {
+		width: 36rpx;
+		height: 30rpx;
+		margin: 0;
+		margin-left: 24rpx;
+		
+		.d1 {
+			width: 100%;
+			height: 2rpx;
+			background-color: #fff;
+		}
+	}
+	.goback-img {
+		width: 30px;
+		height: 30px
+	}
+
+	.playbox {
+		position: absolute;
+		width: 750rpx;
+		height: 100%;
+		flex: 1;
+		background: rgba(0, 0, 0, 0.5);
+		z-index: 3
+	}
+
+	.playbox-img {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		width: 60rpx;
+		height: 60rpx;
+		margin-left: -30rpx;
+		margin-top: -30rpx
+	}
+
+	.logo {
+		position: absolute;
+		z-index: 4;
+		top: 260rpx;
+		right: 18rpx;
+		width: 90rpx;
+		height: 90rpx;
+		z-index: 4;
+		border-radius: 50%;
+		overflow: hidden;
+		border: 4rpx solid #FFFFFF;
+		background: linear-gradient(180deg, #FF2775 0%, #FF2F4B 100%);
+	}
+
+	.logo-img {
+		width: 86rpx;
+		height: 86rpx;
+		border-radius: 50%;
+	}
+
+	.viewnum {
+		position: absolute;
+		z-index: 4;
+		top: 400rpx;
+		right: 26rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.viewnum-img {
+		width: 72rpx;
+		height: 72rpx
+	}
+
+	.viewnum-txt {
+		font-size: 24rpx;
+		color: #fff;
+		text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);
+	}
+
+	.likenum {
+		position: absolute;
+		z-index: 4;
+		top: 530rpx;
+		right: 26rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.likenum-img {
+		width: 72rpx;
+		height: 72rpx
+	}
+
+	.likenum-txt {
+		font-size: 24rpx;
+		color: #fff;
+		text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);
+	}
+
+	.commentnum {
+		position: absolute;
+		z-index: 4;
+		top: 660rpx;
+		right: 26rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.commentnum-img {
+		width: 72rpx;
+		height: 72rpx
+	}
+
+	.commentnum-txt {
+		font-size: 24rpx;
+		color: #fff;
+		text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);
+	}
+
+	.sharenum {
+		position: absolute;
+		z-index: 4;
+		top: 790rpx;
+		right: 26rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.sharenum-img {
+		width: 72rpx;
+		height: 72rpx
+	}
+
+	.sharenum-txt {
+		font-size: 24rpx;
+		color: #fff;
+		text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);
+	}
+
+	.linkurl {
+		position: absolute;
+		z-index: 4;
+		bottom: 160rpx;
+		right: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		background: rgba(100, 100, 100, 0.5);
+		padding: 10rpx 0 10rpx 20rpx;
+		border-radius: 30rpx 0 0 30rpx
+	}
+
+	.linkurl-img {
+		width: 36rpx;
+		height: 36rpx
+	}
+
+	.linkurl-txt {
+		font-size: 26rpx;
+		color: #fff;
+	}
+
+	.bottomshadow {
+		position: absolute;
+		z-index: 4;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 400rpx;
+		background: linear-gradient(0deg, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0) 100%);
+		border-radius: 10px;
+	}
+
+	.cart {
+		position: absolute;
+		z-index: 5;
+		bottom: 40rpx;
+		right: 50rpx;
+		width: 88rpx;
+		height: 88rpx;
+		display: relative
+	}
+
+	.cart-img {
+		width: 88rpx;
+		height: 88rpx
+	}
+
+	.cart-txt {
+		position: absolute;
+		z-index: 5;
+		bottom: 6rpx;
+		color: #fff;
+		width: 88rpx;
+		text-align: center;
+		font-size: 28rpx;
+		font-weight: bold
+	}
+
+	.title {
+		position: absolute;
+		z-index: 3;
+		bottom: 160rpx;
+		left: 30rpx;
+		width: 500rpx;
+		overflow: hidden;
+	}
+
+	.title-txt {
+		font-size: 36rpx;
+		color: #fff;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		overflow: hidden;
+	}
+
+	.description {
+		position: absolute;
+		z-index: 3;
+		bottom: 60rpx;
+		left: 30rpx;
+		width: 500rpx;
+		overflow: hidden;
+	}
+
+	.description-txt {
+		font-size: 28rpx;
+		height: 88rpx;
+		line-height: 44rpx;
+		color: #fff;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+	}
+
+	.probox {
+		width: 750rpx;
+		height: 700rpx;
+		padding: 20rpx 20rpx;
+		background: #fff;
+		z-index: 16;
+		position: relative
+	}
+
+	.probox-replyshadow {
+		position: absolute;
+		z-index: 20;
+		background: rgba(0, 0, 0, 0.4);
+		width: 750rpx;
+		flex: 1;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.probox-close {
+		position: absolute;
+		top: 10rpx;
+		right: 10rpx;
+		z-index: 7;
+		width: 50rpx;
+		height: 50rpx;
+		padding: 10rpx;
+	}
+
+	.probox_title {
+		height: 60rpx;
+		line-height: 60rpx;
+		margin-bottom: 20rpx;
+		display: flex;
+		flex-direction: row
+	}
+
+	.probox_title-t1 {
+		font-size: 28rpx;
+		color: #000;
+		font-weight: bold
+	}
+
+	.probox_title-t2 {
+		font-size: 28rpx;
+		color: #000;
+		font-weight: bold
+	}
+
+	.probox_content {
+		height: 580rpx;
+		overflow: scroll;
+		display: flex;
+	}
+
+	.probox_content-item {
+		display: flex;
+		flex-direction: row;
+		flex: 1;
+		padding: 20rpx;
+		position: relative
+	}
+
+	.probox_content-item-img {
+		width: 188rpx;
+		height: 188rpx;
+		border-radius: 10rpx;
+		flex-shrink: 0
+	}
+
+	.probox_content-item-info {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		padding-left: 20rpx
+	}
+
+	.probox_content-item-name {
+		color: #212121;
+		font-size: 28rpx;
+		height: 80rpx;
+		line-height: 40rpx;
+		font-weight: bold;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+	}
+
+	.probox_content-item-sales {
+		color: #999999;
+		font-size: 24rpx;
+		height: 50rpx;
+		line-height: 50rpx
+	}
+
+	.probox_content-item-price {
+		color: #EFBD6F;
+		font-size: 36rpx;
+		font-weight: bold;
+		height: 50rpx;
+		line-height: 50rpx
+	}
+
+	.probox_content-item-btn {
+		position: absolute;
+		top: 140rpx;
+		right: 20rpx;
+		background: linear-gradient(-90deg, #EFBD6F 0%, rgba(239, 189, 111, 0.76) 100%);
+		border-radius: 26px;
+		width: 150rpx;
+		height: 54rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center
+	}
+
+	.probox_content-item-btn-txt {
+		color: #FFFFFF;
+		font-size: 24rpx;
+		font-weight: bold;
+		text-align: center
+	}
+
+	.popupshare__content {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		width: 750rpx;
+		height: 280rpx;
+		padding: 20rpx 0;
+		background: #fff;
+		display: flex;
+	}
+
+	.popupshare__close2 {
+		position: absolute;
+		top: 10rpx;
+		right: 10rpx;
+		z-index: 1000;
+		width: 50rpx;
+		height: 50rpx;
+		padding: 10rpx;
+	}
+
+	.sharetypecontent {
+		flex: 1;
+		width: 710rpx;
+		height: 250rpx;
+		margin: 0 20rpx;
+		display: flex;
+		flex-direction: row;
+		padding: 50rpx;
+	}
+
+	.sharetypecontent-f1 {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background: #fff;
+		font-size: 24rpx;
+		border: 0
+	}
+
+	.sharetypecontent button::after {
+		border: 0
+	}
+
+	.sharetypecontent-f1-img {
+		width: 90rpx;
+		height: 90rpx;
+		padding: 0;
+		margin: 0
+	}
+
+	.sharetypecontent-f1-t1 {
+		font-size: 24rpx;
+		color: #111111;
+		height: 60rpx;
+		line-height: 60rpx
+	}
+
+	.sharetypecontent-f2 {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.sharetypecontent-f2-img {
+		width: 90rpx;
+		height: 90rpx;
+	}
+
+	.sharetypecontent-f2-t1 {
+		font-size: 24rpx;
+		color: #111111;
+		height: 60rpx;
+		line-height: 60rpx
+	}
+
+	.posterDialog {
+		position: absolute;
+		z-index: 99;
+		width: 750rpx;
+		height: 1200rpx;
+		top: 100rpx;
+		left: 0
+	}
+
+	.posterDialog-main {
+		width: 670rpx;
+		height: 1100rpx;
+		margin: 60rpx 40rpx 30rpx 40rpx;
+		background: #fff;
+		position: relative;
+		border-radius: 20rpx;
+		display: flex
+	}
+
+	.posterDialog-close {
+		position: absolute;
+		padding: 20rpx;
+		top: 0;
+		right: 0;
+		z-index: 10;
+	}
+
+	.posterDialog-img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.posterDialog-content {
+		flex: 1;
+		padding: 70rpx 20rpx 30rpx 20rpx;
+		color: #333;
+		font-size: 30rpx;
+		text-align: center;
+		display: flex
+	}
+
+	.posterDialog-content-img {
+		flex: 1;
+	}
+
+	.prodialog-close {
+		width: 36rpx;
+		height: 36rpx;
+		padding: 10rpx;
+		position: absolute;
+		top: 6rpx;
+		right: 14rpx;
+		z-index: 9
+	}
+
+
+	.pinglun {
+		padding: 10rpx 24rpx 30rpx;
+		margin: 0 auto;
+		flex-direction: row;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: #fff;
+		z-index: 8;
+		border-top: 1px solid #f7f7f7;		
+		padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		&-bd {
+			flex: 1;
+			flex-direction: row;
+			background: #F6F6F6;
+			border-radius: 34rpx;
+			padding: 0 26rpx;
+			margin-right: 24rpx;
+		}
+		.icon-qianbi {
+			font-size: 40rpx;
+			margin-right: 12rpx;
+			flex-shrink: 0;
+		}
+		&-input {
+			flex: 1;
+			font-size: 28rpx;
+			color: #666666;
+			line-height: 38rpx;
+			height: 68rpx;
+		}
+		&-buybtn {
+			background: linear-gradient(to right,#00AE68 0%,#096742 100%);
+			width: 156rpx;
+			text-align: center;
+			height: 68rpx;
+			line-height: 68rpx;
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			border-radius: 34rpx;
+		}
+
+	}
+
+	.plbox {
+		width: 750rpx;
+		padding: 36rpx 24rpx 110rpx;
+		background: #fff;
+		z-index: 20;
+		position: relative;
+		padding-bottom: calc(110rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(110rpx + env(safe-area-inset-bottom));
+		&_title {
+			font-size: 28rpx;
+			color: #666666;
+			line-height: 40rpx;
+			flex-direction: row;
+			margin-bottom: 24rpx;
+		}
+		&-close {
+			position: absolute;
+			top: 24rpx;
+			right: 24rpx;
+			z-index: 7;
+			width: 30rpx;
+			height: 30rpx;
+		}
+		&_content {
+			flex: 1;
+			max-height: 60vh;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			&-item {
+				flex: 1;
+				margin-bottom: 24rpx;
+				display: flex;
+				flex-direction: row;
+				&-f1 {
+					width: 68rpx;
+					height: 68rpx;
+					margin-right: 22rpx;
+					&-img {
+						width: 100%;
+						height: 100%;
+						border-radius: 50%;
+					}
+				}
+				&-f2 {
+					flex: 1;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					&__con {
+						flex: 1;
+						margin-right: 20rpx;
+					}
+					&-t1 {
+						color: #999999;
+					}
+					&-t2 {
+						color: #333333;
+						margin-top: 4rpx;
+						flex-direction: row;
+						&.plbox_content-plcontent {
+							.plbox_content-plcontent-image {
+									width: 44rpx;
+									height: 44rpx;
+									vertical-align: inherit;
+							}
+						}
+					}
+					&-t3 {
+						display: flex;
+						flex-direction: row;
+						font-size: 24rpx;
+						color: #999999;
+						line-height: 34rpx;
+						margin-top: 20rpx;
+						&-x2 {
+							flex: 1;
+							font-size: 24rpx;
+							font-weight: bold;
+							color: #0A5D3B;
+							line-height: 34rpx;
+							margin-left: 22rpx;
+						}
+					}
+				}
+			}
+			&-relist {
+				margin-top: 10rpx;
+				&-item2 {
+					font-size: 28rpx;
+					line-height: 40rpx;
+					&:not(:last-child) {
+						margin-bottom: 16rpx;
+					}
+				}
+				&-f2 {
+					color: #333333;
+				}
+				.plbox_content-relist-headimg {
+					width: 48rpx;
+					flex-shrink: 0;
+					height: 48rpx;
+					border-radius: 24rpx;
+					margin-right: 16rpx
+				}
+				.plbox_content-relist-nickname {
+					color: #999999;
+				}
+			}
+		}
+	}
+
+	.plbox-replyshadow {
+		position: absolute;
+		z-index: 7;
+		background: rgba(0, 0, 0, 0.4);
+		width: 750rpx;
+		flex: 1;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.plbox_content-item-f2-pzan {
+		display: flex;
+		flex-direction: row
+	}
+
+	.plbox_content-item-f2-pzan-img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 10rpx
+	}
+
+	.plbox_content-item-f2-pzan-txt {
+		font-size: 28rpx;
+		color: #666
+	}
+
+	.plbox_content-relist-headimg {
+		width: 30rpx;
+		height: 30rpx;
+		border-radius: 15rpx;
+		margin-right: 8rpx
+	}
+
+	.plbox_content-relist-nickname {
+		color: #333;
+		font-size: 24rpx
+	}
+
+	.plbox_content-relist-f2 {
+		margin-top: 10rpx
+	}
+
+	.comment-nodata {
+		color: #666;
+		font-size: 26rpx
+	}
+
+	.comment-nomore {
+		flex: 1;
+		color: #999;
+		height: 60rpx;
+		line-height: 60rpx;
+		font-size: 26rpx;
+		text-align: center
+	}
+
+	@supports(bottom: env(safe-area-inset-bottom)) {
+		.dp-tabbar-bot {
+			padding-bottom: 0 !important;
+		}
+
+		.dp-tabbar-bar {
+			padding-bottom: 0 !important;
+		}
+	}
+	
+	.video-info {
+		position: absolute;
+		z-index: 4;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		color: #fff;
+		&__top{
+			padding: 88rpx 28rpx 20rpx;
+			background: linear-gradient(to bottom,rgba(0,0,0,0) 0%,rgba(0,0,0,.3) 100%);
+		}
+		&__title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 44rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		&__txt {
+			margin-top: 8rpx;
+			font-size: 28rpx;
+			color: #FFFFFF;
+			line-height: 40rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			/* autoprefixer: ignore next */
+			-webkit-box-orient: vertical;
+			text-align: justify;
+			white-space: pre-wrap;
+			word-break: break-all;
+		}
+		&__topic {
+			margin-top: 16rpx;
+			flex-wrap: wrap;
+			flex-direction: row;
+			margin-bottom: -12rpx;
+			.topic-item {
+				flex-direction: row;
+				flex-shrink: 0;
+				margin: 0 12rpx 12rpx 0;
+				background: #F6F6F6;
+				border-radius: 4rpx;
+				padding: 6rpx;
+				&__icon {
+					flex-shrink: 0;
+					background: radial-gradient(#dcf5eb,#e9fdf6);
+					border-radius: 50%;
+					width: 40rpx;
+					height: 40rpx;
+					margin-right: 8rpx;
+				}
+				&__name {
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #666666;
+					line-height: 34rpx;
+				}
+			}
+		}
+		&__bot {
+			padding: 20rpx;
+			background-color: #000000;
+			width: 100% ;
+			flex-direction: row;
+			padding-bottom: 48rpx;
+		}
+		&__user {
+			flex-direction: row;
+			flex: 1;			
+			.user-header {
+				margin-right: 20rpx;
+				width: 60rpx;
+				height: 60rpx;
+				border-radius: 60rpx;
+				background: #fff;
+				flex-shrink: 0;
+			}
+			.user-name {
+				display: block;
+				max-width: 185rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #FFFFFF;
+				line-height: 44rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			}
+		}
+		&__detail{
+			flex-shrink: 0;
+			flex-direction: row;
+			.product-info {
+				margin-right: 44rpx;
+				&__entry {
+					border-radius: 50%;
+					background: #e2f7ef;
+					width: 68rpx;
+					height: 68rpx;
+					.iconfont {
+						color: #0a5d3b;
+						font-size: 40rpx;
+					}
+				}
+				&__card {
+					top: -175rpx;
+					left: calc(50% + 22rpx);
+					width: 420rpx;
+					height: 172rpx;
+					transform: translateX(-50%);
+					border-radius: 12rpx;
+					.card-bgimg {
+						width: 100%;
+						height: 100%;
+					}
+					.card-con {
+						flex-direction: row;
+						padding: 12rpx;
+					}
+					.card-hd {
+						height: 134rpx;
+						width: 134rpx;
+						margin-right: 20rpx;
+						flex-shrink: 0;
+					}
+					.card-bd {
+						flex: 1;
+						font-size: 22rpx;
+						font-weight: bold;
+						line-height: 32rpx;
+						&__name {
+							width: 220rpx;
+							font-size: 26rpx;
+							color: #333333;
+							line-height: 36rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+
+						}
+						&__sales {
+							color: #999999;
+							font-weight: normal;
+							margin-top: 4rpx;
+						}
+						&__price {
+							color: #333333;
+							margin-top: 12rpx;
+							font-size: 24rpx;
+						}
+					}
+					.card-close {
+						width: 16rpx;
+						height: 16rpx;
+						top: 12rpx;
+						right: 12rpx;
+					}
+				}
+			}
+			.info-item {
+				margin-left: 34rpx;
+				.iconfont{
+					font-size: 40rpx;
+				}
+				&__txt{
+					margin-top: 8rpx;
+					font-size: 24rpx;
+					text-align: center;
+				}
+			}
+		}
+		
+	}
+	
+	// 提示弹框
+	.hitn-n {
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		background-color: #7F7F7F;
+		z-index: 996;
+		.hint-bx {
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			z-index: 6;
+			.hint-img {
+				width: 600rpx;
+			}
+			
+			.content {
+				width: 100%;
+				top: 180rpx;
+				left: 0;
+				.h-title {
+					font-size: 36rpx;
+				}
+				
+				.text {
+					margin-top: 40rpx;
+					color: #666;
+				}
+			}
+		}
+	}
+</style>
diff --git a/activity/shortvideo/index.vue b/activity/shortvideo/index.vue
new file mode 100644
index 0000000..85276c6
--- /dev/null
+++ b/activity/shortvideo/index.vue
@@ -0,0 +1,196 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="搜索感兴趣的视频" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm"></input>
+				</view>
+			</view>
+			<dd-tab :itemdata="cnamelist" :itemst="cidlist" :st="st" :isfixed="false" @changetab="changetab" v-if="clist.length>0"></dd-tab>
+		</view>
+		<view class="content" :style="clist.length>0?'margin-top:190rpx':'margin-top:100rpx'">
+			<block v-if="sysset.list_type == 1">
+				<view v-for="(item, index) in datalist" :key="index" class="item2" @tap="goto"  :data-url="'detail?id=' + item.id +'&cid='+st">
+					<view class="f1"><image class="image" :src="item.coverimg" mode="widthFix"/></view>
+					<view class="f2">
+						<view class="t1">{{item.name}}</view>
+						<view class="t2">{{item.description}}</view>
+						<view class="t3">播放量 {{item.view_num}} <text style="padding:0 20rpx">·</text> 点赞数 {{item.zan_num}}</view>
+						<view class="t4"><image class="touxiang" :src="item.binfo.logo"/>{{item.binfo.name}}</view>
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<view v-for="(item, index) in datalist" :key="index" class="item" :style="index%2==0?'margin-right:2%':''">
+					<image class="ff" mode="widthFix" :src="item.coverimg" @tap="goto"  :data-url="'detail?id=' + item.id +'&cid='+st"></image>
+					<view class="f2">
+						<view class="t1"><image class="touxiang" :src="item.binfo.logo"/></view>
+						<view class="t2"><image class="tubiao" :src="event_rul +'/static/img/static/img/shortvideo_playnum.png'"/>{{item.view_num}}</view>
+						<view class="t3"><image class="tubiao" :src="event_rul +'/static/img/static/img/shortvideo_likenum.png'"/>{{item.zan_num}}</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<view class="item" style="display:block" v-if="nodata"><nodata></nodata></view>
+
+		<view v-if="sysset.can_upload==1" class="covermy" :class="menuindex>-1?'tabbarbot':'notabbarbot'" @tap="goto" data-url="uploadvideo"><image :src="pre_url+'/static/img/shortvideo_uploadbtn.png'"></image></view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		bid:'',
+		st: 'all',
+		keyword:'',
+		pagenum: 1,
+		clist: [],
+		binfo:{},
+		cnamelist:[],
+		cidlist:[],
+		datalist: [],
+		cid: 0,
+		nomore: false,
+		nodata:false,
+		sysset:{},
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.bid = this.opt.bid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+		getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiShortvideo/index', {bid:that.bid,cid: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.clist = res.clist
+					that.sysset = res.sysset
+					if((res.clist).length > 0){
+						var cnamelist = [];
+						var cidlist = [];
+						cnamelist.push('全部');
+						cidlist.push('all');
+						for(var i in that.clist){
+							cnamelist.push(that.clist[i].name);
+							cidlist.push(that.clist[i].id);
+						}
+						that.cnamelist = cnamelist;
+						that.cidlist = cidlist;
+					}
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+		},
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.getdata();
+    },
+  }
+};
+</script>
+<style>
+page{background:#fff}
+.search-container {position: fixed;width: 100%;background: #fff;z-index:9;top:var(--window-top)}
+.topsearch{width:100%;padding:20rpx 20rpx 10rpx 20rpx;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.navbg{text-align: center;height: 92rpx;line-height: 92rpx;font-size: 40rpx;color: #222; border-bottom: #eee 1rpx solid; background-color: #fff;}
+.navbg:after {content: '';width: 160%;height:300rpx;position: absolute;left: -30%;top:0;border-radius: 0 0 50% 50%;z-index:1;}
+.nav {width: 100%;position:fixed;z-index:10; top: 0; background-color: #fff;}
+.nav>scroll-view {overflow: visible !important;padding-top:20rpx;padding-bottom:20rpx}
+.nav .f1 {flex-grow: 0;flex-shrink: 0;display:flex;align-items:center;color:#222;position:relative;z-index:2}
+.nav .f1 .item{flex-grow: 0;flex-shrink: 0;width:25%;text-align:center;padding:16rpx 0;opacity: 0.6;}
+.nav .f1 .item .t1 {font-size:34rpx;font-weight:bold}
+.nav .f1 .item .t2 {font-size:24rpx}
+.nav .f1 .item.active {position: relative;color:#C68924;opacity:1;background-color: #FAF0E6; border-radius:20rpx ;}
+
+.content{width:96%;margin-left:2%;position:relative;margin-top:100rpx; display:flex;flex-wrap:wrap}
+.content .item{width:49%;height:500rpx;background:#fff;overflow:hidden;border-radius:8rpx;margin-bottom:20rpx;position:relative}
+.content .item .ff{width:100%;height:100%;display:block;}
+.content .item .f2{position: absolute;bottom:20rpx;left:20rpx;display:flex;align-items:center;color:#fff;font-size:22rpx}
+.content .item .f2 .t1{display:flex;align-items:center;text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);}
+.content .item .f2 .t2{display:flex;align-items:center;margin-left:30rpx;text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);}
+.content .item .f2 .t3{display:flex;align-items:center;margin-left:30rpx;text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);}
+.content .item .f2 .tubiao{display:block;height:28rpx;width:28rpx;margin-right:10rpx}
+.content .item .f2 .touxiang{display:block;width:40rpx;height:40rpx;border-radius:50%;}
+
+.content .item2{width:100%;background:#fff;display:flex;padding:20rpx 0;border-bottom:1px solid #f5f5f5}
+.content .item2 .f1 {width:30%;height:0;overflow:hidden;background: #ffffff;padding-bottom:40%;position: relative;border-radius:4rpx;}
+.content .item2 .f1 .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.content .item2 .f2 {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.content .item2 .f2 .t1 {color:#222222;font-weight:bold;font-size:30rpx;line-height:40rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.content .item2 .f2 .t2 {color:#666;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.content .item2 .f2 .t3{color:#222;font-size:22rpx;color:#9C9C9C;margin-top:20rpx;}
+.content .item2 .f2 .t4{display:flex;align-items:center;color:#515254;font-size:24rpx;position:absolute;bottom:10rpx;}
+.content .item2 .f2 .t4 .touxiang{display:block;width:30rpx;height:30rpx;border-radius:50%;margin-right:10rpx;}
+
+.covermy{position:fixed;z-index:99999;bottom:0;right:0;width:150rpx;height:150rpx;box-sizing:content-box}
+.covermy image{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/activity/shortvideo/myupload.vue b/activity/shortvideo/myupload.vue
new file mode 100644
index 0000000..5009e86
--- /dev/null
+++ b/activity/shortvideo/myupload.vue
@@ -0,0 +1,164 @@
+<template>
+<view>
+	<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+	<view class="container" id="datalist">
+	<block v-for="(item, index) in datalist" :key="index">
+		<view class="order-box">
+			<view class="content" style="border-bottom:none">
+				<view @tap="goto" :data-url="'detail?id=' + item.id">
+					<image :src="item.coverimg"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">播放量 {{item.view_num}}<text style="color:#a88;padding-left:20rpx">点赞数 {{item.zan_num}}</text></text>
+					<text class="t3" v-if="item.status==2">驳回原因：{{item.reason}}</text>
+				</view>
+			</view>
+			<view class="op">
+				<text style="color:orange" class="flex1" v-if="item.status==0">待审核</text>
+				<text style="color:red" class="flex1" v-if="item.status==2">未通过</text>
+				<text style="color:green" class="flex1" v-if="item.status==1">已通过</text>
+				<view class="btn2" @tap="todel" :data-id="item.id">删除</view>
+			</view>
+		</view>
+	</block>
+	</view>
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+	
+	<view style="height:140rpx"></view>
+	<view class="btn-add" :class="menuindex>-1?'tabbarbot':'notabbarbot3'" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" data-url="uploadvideo"><image :src="event_rul +'/static/img/static/img/add.png'" style="width:28rpx;height:28rpx;margin-right:6rpx"/>发布短视频</view>
+
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		count0: 0,
+		count1: 0,
+		countall: 0,
+		sclist: "",
+		keyword: '',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      var that = this;
+      that.st = st;
+      that.getdata();
+    },
+    getdata: function (loadmore,keyword) {
+     if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiShortvideo/myupload', {keyword:keyword,pagenum: pagenum,st: that.st}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1){
+					that.countall = res.countall;
+					that.count0 = res.count0;
+					that.count1 = res.count1;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该商品吗?', function () {
+        app.post('ApiShortvideo/myuploaddel', {id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要' + (st == 0 ? '下架' : '上架') + '吗?', function () {
+        app.post('ApiShortvideo/setst', {st: st,id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:106rpx}
+.order-box{ width: 94%;margin:0 3%;padding:3px 3%; background: #fff; margin-bottom:12rpx;border-radius:16rpx}
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;min-height:50rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height:36rpx;line-height:36rpx;color: #999;overflow: hidden;font-size: 24rpx;}
+.order-box .content .detail .t3{display:flex;height: 36rpx;line-height: 36rpx;color: #ff4246;font-size: 24rpx;}
+.order-box .content .detail .x1{ font-size:30rpx;margin-right:5px}
+.order-box .content .detail .x2{ font-size:24rpx;text-decoration:line-through;color:#999}
+
+.order-box .bottom{ width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.order-box .op{ display:flex;align-items:center;width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.btn1{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:0;margin-bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/shortvideo/uploadvideo.vue b/activity/shortvideo/uploadvideo.vue
new file mode 100644
index 0000000..3ce6277
--- /dev/null
+++ b/activity/shortvideo/uploadvideo.vue
@@ -0,0 +1,244 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="formsubmit">
+		<view class="st_box">
+			<view class="st_form">
+				<view v-if="cateArr">
+					<picker @change="cateChange" :value="cindex" :range="cateArr" style="height:80rpx;line-height:80rpx;border-bottom:1px solid #EEEEEE;font-size:18px">
+						<view class="picker">{{cindex==-1? '请选择类型' : cateArr[cindex]}}</view>
+					</picker>
+				</view>
+				<!-- <view v-if="cateArr">
+					<picker @change="cateChange" :value="cindex" :range="cateArr" style="height:80rpx;line-height:80rpx;border-bottom:1px solid #EEEEEE;font-size:18px">
+						<view class="picker">{{cindex==-1? '请选择曝光标签' : cateArr[cindex]}}</view>
+					</picker>
+				</view> -->
+				<view><input placeholder="输入标题" name="title" maxlength="-1"/></view>
+				<view><textarea placeholder="输入简介" name="content" maxlength="-1" style="height:100rpx;"></textarea></view>
+				<view class="uploadbtn_ziti1">上传封面</view>
+				<view class="flex" style="flex-wrap:wrap;padding-top:20rpx;">
+					<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" @tap="xuanzhuan" :data-index="index" data-field="pics"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" v-if="pics.length<1">
+						
+					</view>
+					
+				</view>
+				
+				<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+			
+			<view class="uploadbtn_ziti2">上传短视频</view>
+				<view class="flex-y-center" style="width:100%;padding:20rpx 0;margin-top:20rpx;">
+					<image :src="event_rul +'/static/img/static/img/uploadvideo.png'" style="width:200rpx;height:200rpx;background:#eee;" @tap="uploadvideo"></image><text v-if="video" style="padding-left:20rpx;color:#333">已上传短视频</text></view>
+				<input type="text" hidden="true" name="video" :value="video" maxlength="-1"></input>
+			</view>
+		</view>
+		<view class="st_button flex-y-center">
+			<button form-type="submit" :style="{background:t('color1')}">发表</button>
+		</view>
+		<view style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="myupload">我的发表记录<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+		<view style="width:100%;height:60rpx"></view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		datalist: [],
+		content_pic: [],
+		pagenum: 1,
+		cateArr: [],
+		cindex: -1,
+		pics:[],
+		video: '',
+		sysset:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiShortvideo/uploadvideo', {}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.clist = res.clist;
+				that.sysset = res.sysset;
+				var clist = res.clist;
+				if (clist.length > 0) {
+					var cateArr = [];
+					for (var i in clist) {
+						if (that.opt && that.opt.cid == clist[i].id) {
+							that.cindex = i;
+						}
+						cateArr.push(clist[i].name);
+					}
+				} else {
+					cateArr = false;
+				}
+				that.cateArr = cateArr
+				that.loaded();
+			});
+		},
+    cateChange: function (e) {
+      this.cindex = e.detail.value;
+    },
+    formsubmit: function (e) {
+      var that = this;
+      console.log(e);
+      var clist = that.clist;
+      if (clist.length > 0) {
+        if (that.cindex == -1) {
+          app.error('请选择分类');
+          return false;
+        }
+        var cid = clist[that.cindex].id;
+      } else {
+        var cid = 0;
+      }
+      var formdata = e.detail.value;
+      var title = formdata.title;
+			if (title == '') {
+        app.error('请输入标题');
+        return false;
+      }
+      var content = formdata.content;
+      var pics = formdata.pics;
+      var video = formdata.video;
+      if (pics == '') {
+        app.error('请上传封面');
+        return false;
+      }
+      if (video == '') {
+        app.error('请上传短视频');
+        return false;
+      }
+      app.post('ApiShortvideo/uploadvideo', {title:title,cid: cid,pics: pics,content: content,video: video}, function (res) {
+        app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+    uploadvideo: function () {
+      var that = this;
+      //var maxDuration = that.sysset.upload_maxduration;
+			//if(!maxDuration) maxDuration = 999999;
+      var maxsize = that.sysset.upload_maxsize;
+			if(!maxsize) maxsize = 999999999999999;
+      uni.chooseVideo({
+        sourceType: ['album', 'camera'],
+        //maxDuration: maxDuration,
+        success: function (res) {
+          var tempFilePath = res.tempFilePath;
+					var size = res.size;
+					if(size > maxsize * 1024){
+						app.alert('短视频文件过大');return;
+					}
+					//console.log(size);return;
+          app.showLoading('上传中');
+          uni.uploadFile({
+            url: app.globalData.baseurl + 'ApiImageupload/uploadImg/aid/' + app.globalData.aid + '/platform/' + app.globalData.platform + '/session_id/' + app.globalData.session_id,
+            filePath: tempFilePath,
+            name: 'file',
+            success: function (res) {
+              app.showLoading(false);
+              var data = JSON.parse(res.data);
+
+              if (data.status == 1) {
+                that.video = data.url;
+              } else {
+                app.alert(data.msg);
+              }
+            },
+            fail: function (res) {
+              app.showLoading(false);
+              app.alert(res.errMsg);
+            }
+          });
+        },
+        fail: function (res) {
+          console.log(res); //alert(res.errMsg);
+        }
+      });
+    },
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+page{background:#f7f7f7}
+.st_box{ padding:0rpx 0 }
+.st_button{ display: flex; justify-content: space-between;padding:24rpx 24rpx 10rpx 24rpx;}
+.st_button button{background: #1658c6;border-radius:6rpx;border: none;padding:0 20rpx;color: #fff;font-size:36rpx;text-align: center;width:100%;display: flex;height:100rpx;justify-content: center;align-items: center;}
+
+.st_form{ padding: 24rpx;background: #ffffff;margin: 10px;border-radius: 15px;}
+.st_form input{ width: 100%;height: 120rpx; border: none;border-bottom:1px solid #EEEEEE;}
+.st_form input::-webkit-input-placeholder { /* WebKit browsers */ color:    #BBBBBB; font-size: 24rpx}
+.st_form textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;border-bottom:1px solid #EEEEEE;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+.uploadbtn_ziti1{height:30rpx; line-height: 30rpx;font-size:30rpx; margin-top: 20rpx;}
+.uploadbtn_ziti2{height:30rpx; line-height: 30rpx;font-size:30rpx; padding-top: 20rpx; margin-top: 20rpx;border-top:1px solid #EEEEEE;}
+</style>
\ No newline at end of file
diff --git a/activity/toupiao/baoming.vue b/activity/toupiao/baoming.vue
new file mode 100644
index 0000000..db43725
--- /dev/null
+++ b/activity/toupiao/baoming.vue
@@ -0,0 +1,190 @@
+<template>
+<view class="container" style="padding:20rpx 0" :style="{background:toupiao.color1}">
+	<block v-if="isload">
+		<view style="color:red;padding:30rpx 30rpx;margin-top:20rpx;background:#fff;margin:0 28rpx;border-radius:8rpx" v-if="info.id && info.status==2">审核不通过：{{info.reason}}，请修改后再提交</view>
+		<view style="color:red;padding:30rpx 30rpx;margin-top:20rpx;background:#fff;margin:0 28rpx;border-radius:8rpx" v-if="info.id && info.status==1">您已成功参与报名</view>
+		<view style="color:green;padding:30rpx 30rpx;margin-top:20rpx;background:#fff;margin:0 28rpx;border-radius:8rpx" v-if="info.id && info.status==0">您已提交申请，请等待审核</view>
+		<form @submit="formSubmit" @reset="formReset">
+
+		
+		<view class="apply_box">
+			<view class="apply_item">
+				<view>名称<text style="color:red"> *</text></view>
+				<view class="flex-y-center"><input type="text" name="name" :value="info.name" placeholder="请输入选手名称"/></view>
+			</view>
+			<view class="apply_item">
+				<view>联系方式<text style="color:red"> *</text></view>
+				<view class="flex-y-center"><input type="text" name="weixin" :value="info.weixin" placeholder="请输入联系方式"></input></view>
+			</view>
+		</view>
+		<view class="apply_box">
+			<view class="apply_item" style="border-bottom:0"><text>首图<text style="color:red"> *</text></text></view>
+			<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+				<view v-if="pic" class="layui-imgbox">
+					<view class="layui-imgbox-close" @tap="removepic"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+					<view class="layui-imgbox-img"><image :src="pic" @tap="previewImage" :data-url="pic" mode="widthFix"></image></view>
+				</view>
+				<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadpic" v-if="!pic"></view>
+				<input type="text" hidden="true" name="pic" :value="pic" maxlength="-1"></input>
+			</view>
+		</view>
+		<view class="apply_box">
+			<view class="apply_item" style="border-bottom:0"><text>详情图片</text></view>
+			<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+				<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+					<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+					<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+				</view>
+				<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics"></view>
+				<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+			</view>
+		</view>
+		<view class="apply_box" style="padding-bottom:20rpx">
+			<view class="apply_item flex-col">
+				<view><text class="title">详情文字</text></view>
+				<view class="flex-y-center"><textarea type="text" name="detail_txt" :value="info.detail_txt" placeholder="请输入详情文字~" placeholder-style="font-size:24rpx" style="height:100rpx;background:#F8F8F8;padding:10rpx 20rpx" maxlength="-1"></textarea></view>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{color:toupiao.color2}" v-if="!info.id || info.status==2">提 交</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		pic:'',
+		pics:[],
+		info:{},
+		toupiao:{},
+		headimg:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiToupiao/baoming', {id:that.opt.id}, function (res) {
+				that.loading = false;
+        that.info = res.info;
+        that.toupiao = res.toupiao;
+				
+				var pics = res.info ? res.info.pics : '';
+				if (pics) {
+					pics = pics.split(',');
+				} else {
+					pics = [];
+				}
+				that.pics = pics;
+				
+				that.pic = res.info.pic ? res.info.pic : '';
+
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+			var that = this;
+      var formdata = e.detail.value;
+			formdata.id = that.opt.id;
+      if (formdata.name == '') {
+        app.alert('请输入名称');return;
+      }
+      if (formdata.weixin == '') {
+        app.alert('请输入联系方式');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiToupiao/baoming",formdata, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goto('index?id='+that.opt.id);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+		uploadpic:function(e){
+			var that = this;
+			app.chooseImage(function(urls){
+				that.pic = urls[0];
+			},1)
+		},
+		removepic:function(e){
+			var that = this;
+			that.pic = '';
+		},
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pics') that.pics = pics;
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'pics'){
+				var pics = that.pics
+				pics.splice(index,1);
+				that.pics = pics;
+			}
+		},
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.apply_box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.apply_title { background: #fff}
+.apply_title .qr_goback{ width:18rpx;height:32rpx; margin-left:24rpx;     margin-top: 34rpx;}
+.apply_title .qr_title{ font-size: 36rpx; color: #242424;   font-weight:bold;margin: 0 auto; line-height: 100rpx;}
+
+.apply_item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.apply_box .apply_item:last-child{ border:none}
+.apply_item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.apply_item input::placeholder{ color:#999999}
+.apply_item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.apply_item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.apply_item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.set-btn{width: 90%;margin:0 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-size:30rpx;font-weight:bold;background:#fff}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/toupiao/detail.vue b/activity/toupiao/detail.vue
new file mode 100644
index 0000000..3236155
--- /dev/null
+++ b/activity/toupiao/detail.vue
@@ -0,0 +1,313 @@
+<template>
+<view class="container" :style="{background:info.color1}">
+	<block v-if="isload">
+		<view class="topbannerbg" :style="detail.pic?'background:url('+detail.pic+') 100%;background-size:100%':''"></view>
+		<view class="topbannerbg2" :style="{background:'linear-gradient(rgba('+info.color1rgb+',0.8) 0%,'+info.color1+' 50%)'}"></view>
+
+		<view class="box1">
+			<view class="f1">
+				<image :src="detail.pic"></image>
+				<view class="t1">{{detail.name}}</view>
+			</view>
+			<view class="f2">
+				<view class="item"><view class="t1" :style="{color:info.color2}">{{detail.number}}</view><view class="t2">编号</view></view>
+				<view class="item"><view class="t1" :style="{color:info.color2}">{{detail.helpnum}}</view><view class="t2">得票数</view></view>
+				<view class="item"><view class="t1" :style="{color:info.color2}">{{detail.mingci}}</view><view class="t2">当前排名</view></view>
+			</view>
+
+			<view class="f3">
+				<image :src="event_rul +'/static/img/static/img/clock.png'" style="width:32rpx;height:32rpx;margin-right:6rpx"/>
+				<text>{{ info.starttime > nowtime ? '距活动开始还有' : '距活动结束还剩'}}</text>
+			</view>
+			<view class="f4" :style="{color:info.color2}">
+				<text class="t1">{{djsday}}</text><text class="t2">天</text><text class="t1">{{djshour}}</text><text class="t2">小时</text><text class="t1">{{djsmin}}</text><text class="t2">分钟</text><text class="t1">{{djssec}}</text><text class="t2">秒</text>
+			</view>
+
+		</view>
+		<view class="box2">
+			<view style="width:100%;">
+				<block v-for="(item,index) in detail.pics">
+					<image :src="item" style="width:100%;" mode="widthFix"/>
+				</block>
+			</view>
+			<view style="width:100%;text-align:left;white-space:pre-wrap;margin-top:10rpx;font-size:32rpx">{{detail.detail_txt}}</view>
+			<parse :content="detail.detail" />
+		</view>
+		<view style="width:100%;height:160rpx"></view>
+		<view class="footer">
+			<view class="btn1" :style="{background:'rgba('+info.color2rgb+',0.12)',color:info.color2}" v-if="info.canapply==1" @tap="goto" :data-url="'baoming?id='+info.id">我要报名</view>
+			<view class="btn2" :style="{background:info.color2}" @tap="toupiao" :data-id="detail.id" data-type="0">{{info.helptext}}</view>
+		</view>
+
+		
+		<uni-popup id="dialogCaptcha" ref="dialogCaptcha" type="dialog" v-if="info.help_check == 1">
+			<view class="hxqrbox">
+				<view class="hxqrbox1">
+					<input type="text" placeholder="请输入验证码" @input="setcaptcha"/>
+					<image @tap="regetcaptcha" :src="pre_url+'/?s=/ApiIndex/captcha&aid='+aid+'&session_id='+session_id+'&t='+randt"/>
+				</view>
+				<view class="tou2" :style="{background:'linear-gradient(90deg,'+info.color2+' 0%,rgba('+info.color2rgb+',0.7) 100%)'}" @tap="toupiao" :data-id="nowjoinid" data-type="1">确 定</view>
+				<view class="close" @tap="closeCaptcha">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogSmscode" ref="dialogSmscode" type="dialog" v-if="info.help_check == 2">
+			<view class="hxqrbox">
+				<view class="hxqrbox1">
+					<image :src="event_rul +'/static/img/static/img/reg-tel.png'" style="width:44rpx;height:44rpx;margin-right:30rpx"/>
+					<input type="text" placeholder="请输入手机号" @input="setsmstel"/>
+					<view class="code" :style="{color:t('color1')}" @tap="sendsmscode" style="font-size:30rpx;width:160rpx;text-align:center">{{smsdjs||'获取验证码'}}</view>
+				</view>
+				<view class="hxqrbox1" style="margin-top:40rpx">
+					<image :src="event_rul +'/static/img/static/img/reg-code.png'" style="width:44rpx;height:44rpx;margin-right:30rpx"/>
+					<input type="text" placeholder="请输入短信验证码" @input="setsmscode"/>
+				</view>
+				<view class="tou2" :style="{background:'linear-gradient(90deg,'+info.color2+' 0%,rgba('+info.color2rgb+',0.7) 100%)'}" @tap="toupiao" :data-id="nowjoinid" data-type="1">确 定</view>
+				<view class="close" @tap="closeSmscode">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+  data() {
+    return {  
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		info: {},
+		detail:{},
+
+
+		pre_url:app.globalData.pre_url,
+		aid:app.globalData.aid,
+		session_id:app.globalData.session_id,
+		captcha:'',
+		randt:'',
+		nowjoinid:0,
+		smscode:'',
+		smsdjs: '',
+		smstel:'',
+		hqing: 0,
+
+		nowtime:0,
+		djsday: '00',
+		djshour: '00',
+		djsmin: '00',
+		djssec: '00',
+		keyword:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	}, 
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  onShareAppMessage: function () {
+		var that = this;
+		var title = that.detail.name + ' - ' + (that.info.sharetitle ? that.info.sharetitle : that.info.name);
+		var sharepic = that.detail.pic;
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		return this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+  },
+	onShareTimeline:function(){
+		var that = this;
+		var title = that.detail.name + ' - ' + (that.info.sharetitle ? that.info.sharetitle : that.info.name);
+			var sharepic = that.detail.pic;
+			var sharelink = that.info.sharelink ? that.info.sharelink : '';
+			var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		var sharewxdata = this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+    getdata: function () {
+      var that = this;
+			that.loading = true;
+      app.post('ApiToupiao/detail', {id:that.opt.id}, function (res) {
+				that.loading = false;
+        that.info = res.info;
+        that.detail = res.detail;
+        that.nowtime = res.nowtime;
+				uni.setNavigationBarTitle({
+					title: that.info.name
+				});
+				var title = that.detail.name + ' - ' + (that.info.sharetitle ? that.info.sharetitle : that.info.name);
+				var sharepic = that.detail.pic;
+				var sharelink = that.info.sharelink ? that.info.sharelink : '';
+				var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+				that.loaded({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+
+				clearInterval(interval);
+				interval = setInterval(function () {
+					that.nowtime = that.nowtime + 1;
+					that.getdjs();
+				}, 1000);
+      });
+    },
+    getdjs: function () {
+      var that = this;
+      if (that.info.starttime * 1 > that.nowtime * 1) {
+        var totalsec = that.info.starttime * 1 - that.nowtime * 1;
+      } else {
+        var totalsec = that.info.endtime * 1 - that.nowtime * 1;
+      }
+      if (totalsec <= 0) {
+        that.djsday = '00';
+        that.djshour = '00';
+        that.djsmin = '00';
+        that.djssec = '00';
+      } else {
+        var date = Math.floor(totalsec / 86400);
+        var houer = Math.floor((totalsec - date * 86400) / 3600);
+        var min = Math.floor((totalsec - date * 86400 - houer * 3600) / 60);
+        var sec = totalsec - date * 86400 - houer * 3600 - min * 60;
+        var djsday = (date < 10 ? '0' : '') + date;
+        var djshour = (houer < 10 ? '0' : '') + houer;
+        var djsmin = (min < 10 ? '0' : '') + min;
+        var djssec = (sec < 10 ? '0' : '') + sec;
+        that.djsday = djsday;
+        that.djshour = djshour;
+        that.djsmin = djsmin;
+        that.djssec = djssec;
+      }
+    },
+		regetcaptcha:function(){
+			this.randt = this.randt+'1';
+		},
+		setcaptcha:function(e){
+			this.captcha = e.detail.value;
+		},
+		setsmscode:function(e){
+			this.smscode = e.detail.value;
+		},
+		setsmstel:function(e){
+			this.smstel = e.detail.value;
+		},
+    sendsmscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var smstel = that.smstel;
+      if (smstel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(smstel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: smstel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);return;
+        }
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    },
+		closeCaptcha:function(){
+			this.$refs.dialogCaptcha.close();
+		},
+		closeSmscode:function(){
+			this.$refs.dialogSmscode.close();
+		},
+		toupiao:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			var type = e.currentTarget.dataset.type;
+			if(type == 0 && that.info.help_check == 1){
+				this.nowjoinid = id;
+				this.$refs.dialogCaptcha.open();
+				return;
+			}
+			if(type == 0 && that.info.help_check == 2){
+				this.nowjoinid = id;
+				this.$refs.dialogSmscode.open();
+				return;
+			}
+			app.showLoading('投票中');
+			app.post('ApiToupiao/toupiao',{id:id,captcha:that.captcha,smstel:that.smstel,smscode:that.smscode},function(res){
+				app.showLoading(false);
+				if(res.status==1){
+					app.success(res.msg);
+					that.detail.helpnum++
+					if(type == 1 && that.info.help_check == 1){
+						that.$refs.dialogCaptcha.close();
+					}
+					if(type == 1 && that.info.help_check == 2){
+						that.$refs.dialogSmscode.close();
+					}
+				}else{
+					app.alert(res.msg);
+				}
+			})
+		}
+  }
+}
+</script>
+<style>
+.topbannerbg{width:100%;height:750rpx;background:#fff;position:relative;}
+.topbannerbg2{position:absolute;z-index:7;width:100%;height:750rpx;top:0;}
+
+.box1{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:60rpx 10rpx;display:flex;flex-direction:column;align-items:center;position:relative;z-index:12;margin-top:-400rpx}
+.box1 .f1{display:flex;flex-direction:column;align-items:center;margin-top:-200rpx;margin-bottom:40rpx}
+.box1 .f1 image{width:320rpx;height:320rpx;border-radius:16rpx}
+.box1 .f1 .t1{color:#222222;font-size:36rpx;font-weight:bold;height:100rpx;line-height:100rpx}
+.box1 .f2{display:flex;align-items:center;width:100%}
+.box1 .f2 .item{flex:1;display:flex;flex-direction:column;align-items:center;}
+.box1 .f2 .item .t1{font-size:48rpx;font-weight:bold;}
+.box1 .f2 .item .t2{font-size:24rpx;color:#778899;margin-top:10rpx}
+.box1 .f3{display:flex;align-items:center;color:#222222;margin-top:60rpx}
+.box1 .f4{display:flex;align-items:flex-end;color:#222222;margin-top:20rpx;font-size:24rpx}
+.box1 .f4 .t1{font-size:48rpx;font-weight:bold;padding:0 12rpx}
+.box1 .f4 .t2{color:#222222;height:48rpx;line-height:48rpx}
+
+.box2{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:20rpx 20rpx;display:flex;flex-direction:column;align-items:center;position:relative;z-index:12;margin-top:20rpx}
+
+.footer{width:100%;position:fixed;bottom:0;height:132rpx;border-top:1px solid #eeeeee;z-index:14;background:#fff;display:flex;align-items:center;justify-content:center;padding:0 30rpx}
+.footer .btn1{width:270rpx;height:88rpx;line-height:88rpx;border-radius:8rpx;text-align:center;margin-right:20rpx;}
+.footer .btn2{flex:1;height:88rpx;line-height:88rpx;border-radius:8rpx;text-align:center;color:#fff}
+
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .hxqrbox1{display:flex;align-items:center}
+.hxqrbox .hxqrbox1 input{width:270rpx;}
+.hxqrbox .hxqrbox1 image{width:210rpx;height:70rpx}
+.hxqrbox  .tou2{border-radius:24rpx;font-size:32rpx;color:#fff;height:80rpx;line-height:80rpx;padding:0 20rpx;text-align:center;margin-top:60rpx}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/activity/toupiao/index.vue b/activity/toupiao/index.vue
new file mode 100644
index 0000000..970c3d2
--- /dev/null
+++ b/activity/toupiao/index.vue
@@ -0,0 +1,380 @@
+<template>
+<view class="container" :style="{background:info.color1}">
+	<block v-if="isload">
+		<view class="banner"><image :src="info.banner" mode="widthFix"></image></view>
+		<view class="box1">
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.joinnum}}</view><view class="t2">参与人数</view></view>
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.helpnum}}</view><view class="t2">累计投票</view></view>
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.readcount}}</view><view class="t2">访问次数</view></view>
+		</view>
+		<view class="box2">
+			<view class="f1">
+				<image :src="event_rul +'/static/img/static/img/clock.png'" style="width:32rpx;height:32rpx;margin-right:6rpx"/>
+				<text>{{ info.starttime > nowtime ? '距活动开始还有' : '距活动结束还剩'}}</text>
+			</view>
+			<view class="f2" :style="{color:info.color2}">
+				<text class="t1">{{djsday}}</text><text class="t2">天</text><text class="t1">{{djshour}}</text><text class="t2">小时</text><text class="t1">{{djsmin}}</text><text class="t2">分钟</text><text class="t1">{{djssec}}</text><text class="t2">秒</text>
+			</view>
+			<view class="topsearch flex-y-center">
+				<view class="topsearch-f1 flex-y-center">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="搜索编号或选手名称" placeholder-style="font-size:24rpx;color:#778899" @confirm="searchConfirm"></input>
+				</view>
+			</view>
+		</view>
+		<view class="box3">
+			<block v-for="(item,index) in datalist">
+
+			<view v-if="info.listtype==0" class="item" @tap="goto" :data-url="'detail?id='+item.id">
+				<view class="pic"><image :src="item.pic" class="img" mode="widthFix"/></view>
+				<view class="name">{{item.name}}</view>
+				<view class="no">NO: {{item.number}}</view>
+				<view class="helpnum">{{item.helpnum}}票</view>
+				<view class="tou" :style="{background:'linear-gradient(90deg,'+info.color2+' 0%,rgba('+info.color2rgb+',0.7) 100%)'}" @tap.stop="toupiao" :data-id="item.id" data-type="0">{{info.helptext}}</view>
+			</view>
+			
+			<view v-if="info.listtype==1" class="itemlist" @tap="goto" :data-url="'detail?id='+item.id">
+				<view class="pic"><image :src="item.pic" class="img" mode="widthFix"/></view>
+				<view class="right">
+					<view class="name">{{item.name}}</view>
+					<view class="no">NO: {{item.number}}</view>
+					<view class="helpnum">{{item.helpnum}}票</view>
+					<view class="tou" :style="{background:'linear-gradient(90deg,'+info.color2+' 0%,rgba('+info.color2rgb+',0.7) 100%)'}" @tap.stop="toupiao" :data-id="item.id" data-type="0">{{info.helptext}}</view>
+				</view>
+			</view>
+
+			</block>
+		</view>
+		<view style="background:#fff;width:94%;margin:0 3%;border-radius:12rpx" v-if="nodata"><nodata></nodata></view>
+		<view style="width:100%;height:60rpx"></view>
+
+		
+		<uni-popup id="dialogCaptcha" ref="dialogCaptcha" type="dialog" v-if="info.help_check == 1">
+			<view class="hxqrbox">
+				<view class="hxqrbox1">
+					<input type="text" placeholder="请输入验证码" @input="setcaptcha"/>
+					<image @tap="regetcaptcha" :src="pre_url+'/?s=/ApiIndex/captcha&aid='+aid+'&session_id='+session_id+'&t='+randt"/>
+				</view>
+				<view class="tou2" :style="{background:'linear-gradient(90deg,'+info.color2+' 0%,rgba('+info.color2rgb+',0.7) 100%)'}" @tap="toupiao" :data-id="nowjoinid" data-type="1">确 定</view>
+				<view class="close" @tap="closeCaptcha">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogSmscode" ref="dialogSmscode" type="dialog" v-if="info.help_check == 2">
+			<view class="hxqrbox">
+				<view class="hxqrbox1">
+					<image :src="event_rul +'/static/img/static/img/reg-tel.png'" style="width:44rpx;height:44rpx;margin-right:30rpx"/>
+					<input type="text" placeholder="请输入手机号" @input="setsmstel"/>
+					<view class="code" :style="{color:t('color1')}" @tap="sendsmscode" style="font-size:30rpx;width:160rpx;text-align:center">{{smsdjs||'获取验证码'}}</view>
+				</view>
+				<view class="hxqrbox1" style="margin-top:40rpx">
+					<image :src="event_rul +'/static/img/static/img/reg-code.png'" style="width:44rpx;height:44rpx;margin-right:30rpx"/>
+					<input type="text" placeholder="请输入短信验证码" @input="setsmscode"/>
+				</view>
+				<view class="tou2" :style="{background:'linear-gradient(90deg,'+info.color2+' 0%,rgba('+info.color2rgb+',0.7) 100%)'}" @tap="toupiao" :data-id="nowjoinid" data-type="1">确 定</view>
+				<view class="close" @tap="closeSmscode">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+  data() {
+    return {  
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		aid:app.globalData.aid,
+		session_id:app.globalData.session_id,
+		captcha:'',
+		randt:'',
+		nowjoinid:0,
+		smscode:'',
+		smsdjs: '',
+		smstel:'',
+		hqing: 0,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata: false,
+
+		info: {},
+		nowtime:0,
+		djsday: '00',
+		djshour: '00',
+		djsmin: '00',
+		djssec: '00',
+		keyword:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	}, 
+  onReachBottom: function () {
+		return;
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  onUnload: function (loadmore) {
+    clearInterval(interval);
+  },
+  onShareAppMessage: function () {
+		var that = this;
+		var title = that.info.sharetitle ? that.info.sharetitle : that.info.name;
+		var sharepic = that.info.sharepic ? that.info.sharepic : that.info.banner;
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		return this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+  },
+	onShareTimeline:function(){
+		var that = this;
+		var title = that.info.sharetitle ? that.info.sharetitle : that.info.name;
+		var sharepic = that.info.sharepic ? that.info.sharepic : that.info.banner;
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		var sharewxdata = this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiToupiao/index', {id:that.opt.id,pagenum:pagenum,keyword:that.keyword}, function (res) {
+				that.loading = false;
+
+				if (pagenum == 1) {
+					that.datalist = res.datalist;
+          if ((that.datalist).length == 0) {
+            that.nodata = true;
+          }
+					that.info = res.info;
+					that.nowtime = res.nowtime;
+					uni.setNavigationBarTitle({
+						title: that.info.name
+					});
+					var title = that.info.sharetitle ? that.info.sharetitle : that.info.name;
+					var sharepic = that.info.sharepic ? that.info.sharepic : that.info.banner;
+					var sharelink = that.info.sharelink ? that.info.sharelink : '';
+					var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+					that.loaded({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+
+					clearInterval(interval);
+					interval = setInterval(function () {
+						that.nowtime = that.nowtime + 1;
+						that.getdjs();
+					}, 1000);
+        }else{
+          if ((res.datalist).length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(res.datalist);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    getdjs: function () {
+      var that = this;
+      if (that.info.starttime * 1 > that.nowtime * 1) {
+        var totalsec = that.info.starttime * 1 - that.nowtime * 1;
+      } else {
+        var totalsec = that.info.endtime * 1 - that.nowtime * 1;
+      }
+      if (totalsec <= 0) {
+        that.djsday = '00';
+        that.djshour = '00';
+        that.djsmin = '00';
+        that.djssec = '00';
+      } else {
+        var date = Math.floor(totalsec / 86400);
+        var houer = Math.floor((totalsec - date * 86400) / 3600);
+        var min = Math.floor((totalsec - date * 86400 - houer * 3600) / 60);
+        var sec = totalsec - date * 86400 - houer * 3600 - min * 60;
+        var djsday = (date < 10 ? '0' : '') + date;
+        var djshour = (houer < 10 ? '0' : '') + houer;
+        var djsmin = (min < 10 ? '0' : '') + min;
+        var djssec = (sec < 10 ? '0' : '') + sec;
+        that.djsday = djsday;
+        that.djshour = djshour;
+        that.djsmin = djsmin;
+        that.djssec = djssec;
+      }
+    },
+		searchConfirm:function(e){
+			var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+		},
+		regetcaptcha:function(){
+			this.randt = this.randt+'1';
+		},
+		setcaptcha:function(e){
+			this.captcha = e.detail.value;
+		},
+		setsmscode:function(e){
+			this.smscode = e.detail.value;
+		},
+		setsmstel:function(e){
+			this.smstel = e.detail.value;
+		},
+    sendsmscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var smstel = that.smstel;
+      if (smstel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(smstel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: smstel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);return;
+        }
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    },
+		closeCaptcha:function(){
+			this.$refs.dialogCaptcha.close();
+		},
+		closeSmscode:function(){
+			this.$refs.dialogSmscode.close();
+		},
+		toupiao:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			var type = e.currentTarget.dataset.type;
+			if(type == 0 && that.info.help_check == 1){
+				this.nowjoinid = id;
+				this.$refs.dialogCaptcha.open();
+				return;
+			}
+			if(type == 0 && that.info.help_check == 2){
+				this.nowjoinid = id;
+				this.$refs.dialogSmscode.open();
+				return;
+			}
+			app.showLoading('投票中');
+			app.post('ApiToupiao/toupiao',{id:id,captcha:that.captcha,smstel:that.smstel,smscode:that.smscode},function(res){
+				app.showLoading(false);
+				if(res.status==1){
+					app.success(res.msg);
+					var datalist = that.datalist;
+					for(var i in datalist){
+						if(datalist[i].id == id){
+							datalist[i].helpnum++;break;
+						}
+					}
+					that.datalist = datalist;
+					that.info.helpnum++
+					if(type == 1 && that.info.help_check == 1){
+						that.$refs.dialogCaptcha.close();
+					}
+					if(type == 1 && that.info.help_check == 2){
+						that.$refs.dialogSmscode.close();
+					}
+				}else{
+					app.alert(res.msg);
+				}
+			})
+		}
+  }
+}
+</script>
+<style>
+
+.banner{width:100%;}
+.banner image{width:100%;height:auto}
+
+.box1{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:60rpx 10rpx;display:flex;align-items:center;position:relative;z-index:12;margin-top:-160rpx}
+.box1 .item{flex:1;display:flex;flex-direction:column;align-items:center;}
+.box1 .item .t1{font-size:48rpx;font-weight:bold}
+.box1 .item .t2{font-size:24rpx;color:#778899;margin-top:10rpx}
+.box2{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:20rpx 10rpx;display:flex;flex-direction:column;align-items:center;margin-top:20rpx}
+.box2 .f1{display:flex;align-items:center;color:#222222}
+.box2 .f2{display:flex;align-items:flex-end;color:#222222;margin-top:20rpx;font-size:24rpx}
+.box2 .f2 .t1{font-size:48rpx;font-weight:bold;padding:0 12rpx}
+.box2 .f2 .t2{color:#222222;height:48rpx;line-height:48rpx}
+
+.topsearch{width:94%;margin:40rpx 3% 10rpx 3%;}
+.topsearch .topsearch-f1{height:80rpx;border-radius:10rpx;border:0;background-color:#f5f5f6;flex:1}
+.topsearch .topsearch-f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .topsearch-f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.box3{width:96%;margin-left:2%;display:flex;flex-wrap:wrap;margin-top:20rpx;}
+.box3 .item{width:48%;margin:8rpx 1%;background:#fff;border-radius:12rpx;overflow:hidden;position:relative;padding-bottom:24rpx}
+.box3 .item .pic {width: 100%;height:0;overflow:hidden;background: #f7f7f8;padding-bottom: 100%;position: relative;margin-bottom:10rpx}
+.box3 .item .pic .img{position:absolute;top:0;left:0;width: 100%;height:auto}
+.box3 .item .name{padding:10rpx 10rpx;color:#222222;font-size:28rpx;font-weight:bold;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.box3 .item .no{color:#778899;font-size:24rpx;padding:4rpx 10rpx;}
+.box3 .item .helpnum{color:#778899;font-size:24rpx;padding:4rpx 10rpx;}
+.box3 .item .tou{position:absolute;bottom:30rpx;right:20rpx;border-radius:24rpx;font-size:22rpx;color:#fff;height:48rpx;line-height:48rpx;padding:0 20rpx}
+
+.box3 .itemlist{width:98%;margin:8rpx 1%;background:#fff;border-radius:12rpx;overflow:hidden;position:relative;padding:24rpx;display:flex}
+.box3 .itemlist .pic {width:180rpx;height:180rpx;overflow:hidden;background: #f7f7f8;position: relative;}
+.box3 .itemlist .pic .img{position:absolute;top:0;left:0;width: 100%;height:auto}
+.box3 .itemlist .right{padding-left:20rpx;flex:1}
+.box3 .itemlist .name{margin:10rpx 10rpx;color:#222222;font-size:28rpx;font-weight:bold;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.box3 .itemlist .no{color:#778899;font-size:24rpx;padding:4rpx 10rpx;}
+.box3 .itemlist .helpnum{color:#778899;font-size:24rpx;padding:4rpx 10rpx;}
+.box3 .itemlist .tou{position:absolute;bottom:30rpx;right:20rpx;border-radius:24rpx;font-size:22rpx;color:#fff;height:48rpx;line-height:48rpx;padding:0 20rpx}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .hxqrbox1{display:flex;align-items:center}
+.hxqrbox .hxqrbox1 input{width:270rpx;}
+.hxqrbox .hxqrbox1 image{width:210rpx;height:70rpx}
+.hxqrbox  .tou2{border-radius:24rpx;font-size:32rpx;color:#fff;height:80rpx;line-height:80rpx;padding:0 20rpx;text-align:center;margin-top:60rpx}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/activity/toupiao/phb.vue b/activity/toupiao/phb.vue
new file mode 100644
index 0000000..ed55882
--- /dev/null
+++ b/activity/toupiao/phb.vue
@@ -0,0 +1,168 @@
+<template>
+<view class="container" :style="{background:info.color1}">
+	<block v-if="isload">
+		<view class="banner"><image :src="info.banner" mode="widthFix"></image></view>
+		<view class="box1">
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.joinnum}}</view><view class="t2">参与人数</view></view>
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.helpnum}}</view><view class="t2">累计投票</view></view>
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.readcount}}</view><view class="t2">访问次数</view></view>
+		</view>
+		<view class="box2">
+			<block v-for="(item,index) in datalist">
+			<view class="item" @tap="goto" :data-url="'detail?id='+item.id">
+				<view class="f1" :style="{color:info.color2}">{{index+1}}</view>
+				<view class="right">
+					<view class="f2">
+						<image :src="item.pic" class="img"/>
+						<view class="t1">
+							<text class="x1">{{item.name}}</text>
+							<text class="x2">编号：{{item.number}}</text>
+						</view>
+					</view>
+					<view class="f3" :style="{color:info.color2}">{{item.helpnum}}</view>
+				</view>
+			</view>
+			</block>
+			<view v-if="!nomore" style="width:100%;text-align:center;height:40rpx;line-height:40rpx;color:#778899;font-size:26rpx;margin-top:30rpx" @tap="getmore">- 查看更多 -</view>
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+		<view style="width:100%;height:20rpx"></view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+  data() {
+    return {  
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      nodata: false,
+
+      info: {},
+			nowtime:0,
+      djsday: '00',
+      djshour: '00',
+      djsmin: '00',
+      djssec: '00',
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	}, 
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+    getdata: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiToupiao/phb', {id:that.opt.id,pagenum:pagenum}, function (res) {
+				that.loading = false;
+				if (pagenum == 1) {
+					that.datalist = res.datalist;
+          if ((that.datalist).length == 0) {
+            that.nodata = true;
+          }
+
+					that.info = res.info;
+					that.nowtime = res.nowtime;
+					//uni.setNavigationBarTitle({
+					//	title: that.info.name
+					//});
+					var title = that.info.sharetitle ? that.info.sharetitle : that.info.name;
+					var sharepic = that.info.sharepic ? that.info.sharepic : that.info.pic;
+					var sharelink = that.info.sharelink ? that.info.sharelink : '';
+					var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+					that.loaded({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+
+					clearInterval(interval);
+					interval = setInterval(function () {
+						that.nowtime = that.nowtime + 1;
+						that.getdjs();
+					}, 1000);
+				}else{
+					if ((res.datalist).length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(res.datalist);
+            that.datalist = newdata;
+          }
+				}
+      });
+    },
+    getdjs: function () {
+      var that = this;
+      if (that.info.starttime * 1 > that.nowtime * 1) {
+        var totalsec = that.info.starttime * 1 - that.nowtime * 1;
+      } else {
+        var totalsec = that.info.endtime * 1 - that.nowtime * 1;
+      }
+      if (totalsec <= 0) {
+        that.djsday = '00';
+        that.djshour = '00';
+        that.djsmin = '00';
+        that.djssec = '00';
+      } else {
+        var date = Math.floor(totalsec / 86400);
+        var houer = Math.floor((totalsec - date * 86400) / 3600);
+        var min = Math.floor((totalsec - date * 86400 - houer * 3600) / 60);
+        var sec = totalsec - date * 86400 - houer * 3600 - min * 60;
+        var djsday = (date < 10 ? '0' : '') + date;
+        var djshour = (houer < 10 ? '0' : '') + houer;
+        var djsmin = (min < 10 ? '0' : '') + min;
+        var djssec = (sec < 10 ? '0' : '') + sec;
+        that.djsday = djsday;
+        that.djshour = djshour;
+        that.djsmin = djsmin;
+        that.djssec = djssec;
+      }
+    },
+		getmore:function(){
+			this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+		}
+  }
+}
+</script>
+<style>
+.container{min-height:100vh;display:flex;flex-direction:column;}
+.banner{width:100%;}
+.banner image{width:100%;height:auto}
+
+.box1{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:60rpx 10rpx;display:flex;align-items:center;position:relative;z-index:12;margin-top:-160rpx}
+.box1 .item{flex:1;display:flex;flex-direction:column;align-items:center;}
+.box1 .item .t1{font-size:48rpx;font-weight:bold}
+.box1 .item .t2{font-size:24rpx;color:#778899;margin-top:10rpx}
+
+.box2{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:30rpx 10rpx;display:flex;flex-direction:column;align-items:center;position:relative;z-index:12;margin-top:20rpx}
+.box2 .item{width:100%;display:flex;align-items:center;padding:0 40rpx 0 0;}
+.box2 .item .f1{font-size:36rpx;font-weight:bold;width:100rpx;text-align:center}
+.box2 .item .right{flex:1;border-bottom:1px solid #EEEEEE;display:flex;padding:20rpx 0;}
+.box2 .item .f2{display:flex;align-items:center;}
+.box2 .item .f2 .img{width:80rpx;height:80rpx;border-radius:50%;margin-right:20rpx;flex-shrink:0}
+.box2 .item .f2 .t1{display:flex;flex-direction:column;}
+.box2 .item .f2 .t1 .x1{color:#222222;font-size:28rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.box2 .item .f2 .t1 .x2{color:#778899;font-size:24rpx}
+.box2 .item .f3{flex:1;font-size:36rpx;font-weight:bold;display:flex;align-items:center;justify-content:flex-end;}
+</style>
\ No newline at end of file
diff --git a/activity/toupiao/shuoming.vue b/activity/toupiao/shuoming.vue
new file mode 100644
index 0000000..e2288a9
--- /dev/null
+++ b/activity/toupiao/shuoming.vue
@@ -0,0 +1,190 @@
+<template>
+<view class="container" style="min-height:100vh" :style="{background:info.color1}">
+	<block v-if="isload">
+		<view class="banner"><image :src="info.banner" mode="widthFix"></image></view>
+		<view class="box1">
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.joinnum}}</view><view class="t2">参与人数</view></view>
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.helpnum}}</view><view class="t2">累计投票</view></view>
+			<view class="item"><view class="t1" :style="{color:info.color2}">{{info.readcount}}</view><view class="t2">访问次数</view></view>
+		</view>
+		<view class="box2">
+			<view class="title"><text style="color:#999;font-weight:normal;padding-right:20rpx"> —— </text> 活动规则 <text style="color:#999;font-weight:normal;padding-left:20rpx"> —— </text></view>
+			<parse :content="info.guize" />
+		</view>
+		<view style="width:100%;height:60rpx"></view>
+
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+export default {
+  data() {
+    return {  
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+			pre_url:app.globalData.pre_url,
+			aid:app.globalData.aid,
+			session_id:app.globalData.session_id,
+			captcha:'',
+			randt:'',
+			nowjoinid:0,
+			smscode:'',
+      smsdjs: '',
+			smstel:'',
+      hqing: 0,
+			
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      nodata: false,
+			
+      info: {},
+			nowtime:0,
+      djsday: '00',
+      djshour: '00',
+      djsmin: '00',
+      djssec: '00',
+			keyword:'',
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	}, 
+  onReachBottom: function () {
+		return;
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  onUnload: function (loadmore) {
+    clearInterval(interval);
+  },
+  onShareAppMessage: function () {
+		var that = this;
+		var title = that.info.sharetitle ? that.info.sharetitle : that.info.name;
+		var sharepic = that.info.sharepic ? that.info.sharepic : that.info.banner;
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		return this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+  },
+	onShareTimeline:function(){
+		var that = this;
+		var title = that.info.sharetitle ? that.info.sharetitle : that.info.name;
+		var sharepic = that.info.sharepic ? that.info.sharepic : that.info.banner;
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		var sharewxdata = this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiToupiao/index', {id:that.opt.id,pagenum:pagenum,keyword:that.keyword}, function (res) {
+				that.loading = false;
+
+				if (pagenum == 1) {
+					that.datalist = res.datalist;
+          if ((that.datalist).length == 0) {
+            that.nodata = true;
+          }
+					that.info = res.info;
+					that.nowtime = res.nowtime;
+					uni.setNavigationBarTitle({
+						title: that.info.name
+					});
+					var title = that.info.sharetitle ? that.info.sharetitle : that.info.name;
+					var sharepic = that.info.sharepic ? that.info.sharepic : that.info.banner;
+					var sharelink = that.info.sharelink ? that.info.sharelink : '';
+					var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+					that.loaded({title:title,desc:sharedesc,link:sharelink,pic:sharepic});
+
+					clearInterval(interval);
+					interval = setInterval(function () {
+						that.nowtime = that.nowtime + 1;
+						that.getdjs();
+					}, 1000);
+					
+					that.loaded();
+        }else{
+          if ((res.datalist).length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(res.datalist);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    getdjs: function () {
+      var that = this;
+      if (that.info.starttime * 1 > that.nowtime * 1) {
+        var totalsec = that.info.starttime * 1 - that.nowtime * 1;
+      } else {
+        var totalsec = that.info.endtime * 1 - that.nowtime * 1;
+      }
+      if (totalsec <= 0) {
+        that.djsday = '00';
+        that.djshour = '00';
+        that.djsmin = '00';
+        that.djssec = '00';
+      } else {
+        var date = Math.floor(totalsec / 86400);
+        var houer = Math.floor((totalsec - date * 86400) / 3600);
+        var min = Math.floor((totalsec - date * 86400 - houer * 3600) / 60);
+        var sec = totalsec - date * 86400 - houer * 3600 - min * 60;
+        var djsday = (date < 10 ? '0' : '') + date;
+        var djshour = (houer < 10 ? '0' : '') + houer;
+        var djsmin = (min < 10 ? '0' : '') + min;
+        var djssec = (sec < 10 ? '0' : '') + sec;
+        that.djsday = djsday;
+        that.djshour = djshour;
+        that.djsmin = djsmin;
+        that.djssec = djssec;
+      }
+    },
+  }
+}
+</script>
+<style>
+
+.banner{width:100%;}
+.banner image{width:100%;height:auto}
+
+.box1{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:60rpx 10rpx;display:flex;align-items:center;position:relative;z-index:12;margin-top:-160rpx}
+.box1 .item{flex:1;display:flex;flex-direction:column;align-items:center;}
+.box1 .item .t1{font-size:48rpx;font-weight:bold}
+.box1 .item .t2{font-size:24rpx;color:#778899;margin-top:10rpx}
+.box2{width:94%;margin-left:3%;border-radius:12rpx;background:#fff;padding:20rpx 20rpx;display:flex;flex-direction:column;align-items:center;margin-top:20rpx}
+.box2 .title{width:100%;text-align:center;font-size:32rpx;color:#222222;font-weight:bold;height:100rpx;line-height:100rpx;margin-bottom:20rpx}
+
+
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/buy.vue b/activity/tuangou/buy.vue
new file mode 100644
index 0000000..d78a1e6
--- /dev/null
+++ b/activity/tuangou/buy.vue
@@ -0,0 +1,736 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="topay">
+		<view v-if="needaddress==0" class="address-add">
+			<view class="linkitem">
+				<text class="f1">联 系 人：</text>
+				<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+			<view class="linkitem">
+				<text class="f1">联系电话：</text>
+				<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx;"/>
+			</view>
+		</view>
+		<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/address?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+			<view class="f1"><image class="img" :src="event_rul +'/static/img/static/img/address.png'"/></view>
+			<view class="f2 flex1" v-if="address.name">
+				<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}}</view>
+				<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+			</view>
+			<view v-else class="f2 flex1">请选择收货地址</view>
+			<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"/>
+		</view>
+		<view class="buydata">
+			<view class="btitle"><image class="img" :src="event_rul +'/static/img/static/img/ico-shop.png'"/>{{business.name}}</view>
+			<view class="bcontent">
+				<view class="product">
+					<view class="item flex">
+						<view class="img" @tap="goto" :data-url="'product?id='+product.id"><image class="img" :src="product.pic"/></view>
+						<view class="info flex1">
+							<view class="f1">{{product.name}}</view>
+							<view class="f3">￥{{product.sell_price}}<text v-if="buytype!=1" class="collage_icon">团购</text> × {{num}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="freight">
+					<view class="f1">配送方式</view>
+					<view class="freight-ul">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <block v-for="(item, idx2) in freightList" :key="idx2">
+						 <view class="freight-li" :style="freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<view class="freighttips" v-if="freightList[freightkey].minpriceset==1 && freightList[freightkey].minprice > 0 && freightList[freightkey].minprice*1 > product_price*1">满{{freightList[freightkey].minprice}}元起送，还差{{freightList[freightkey].minprice - product_price}}元</view>
+					<view class="freighttips" v-if="freightList[freightkey].isoutjuli==1">超出配送范围</view>
+				</view>
+				<view class="price" v-if="freightList[freightkey].pstimeset==1">
+					<view class="f1">{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</view>
+					<view class="f2" @tap="choosePstime">{{pstimetext==''?'请选择时间':pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+				<view class="storeitem" v-if="freightList[freightkey].pstype==1">
+					<view class="panel">
+						<view class="f1">取货地点</view>
+						<view class="f2" @tap="openMendian" :data-freightkey="freightkey" :data-storekey="freightList[freightkey].storekey"><text class="iconfont icondingwei"></text>{{freightList[freightkey].storedata[freightList[freightkey].storekey].name}}</view>
+					</view>
+					<block v-for="(item, idx) in freightList[freightkey].storedata" :key="idx">
+						<view class="radio-item" @tap.stop="choosestore" :data-index="idx" v-if="idx<5 || storeshowall==true">
+							<view class="f1">{{item.name}} </view>
+							<text style="color:#f50;">{{item.juli}}</text>
+							<view class="radio" :style="freightList[freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+					<view v-if="storeshowall==false && (freightList[freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+				</view>
+				<view class="price">
+					<text class="f1">商品金额</text>
+					<text class="f2">¥{{product_price}}</text>
+				</view>
+				<view class="price" v-if="leveldk_money*1>0">
+					<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+					<text class="f2">-¥{{leveldk_money}}</text>
+				</view>
+				<view class="price">
+					<text class="f1">运费</text>
+					<text class="f2">+¥{{freight_price}}</text>
+				</view>
+				
+				<view class="price">
+					<view class="f1">{{t('优惠券')}}</view>
+					<view v-if="couponList.length>0" class="f2" @tap="showCouponList"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{couponrid!=0?couponList[couponkey].couponname:couponList.length+'张可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+					<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+				</view>
+
+				<view style="display:none">{{test}}</view>
+				<view class="form-item" v-for="(item,idx) in freightList[freightkey].formdata" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="radio-group" :name="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="checkbox-group">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector" :name="'form'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata[idx]">
+								<view class="form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix"/></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx"></view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<view class="scoredk"
+			v-if="userinfo.score2money>0 && (userinfo.scoremaxtype==0 || (userinfo.scoremaxtype==1 && userinfo.scoredkmaxmoney>0))">
+			<checkbox-group @change="scoredk" class="flex" style="width:100%">
+				<view class="f1">
+					<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text
+							style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+					<view style="font-size:22rpx;color:#999"
+						v-if="userinfo.scoremaxtype==0 && userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">
+						最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+					<view style="font-size:22rpx;color:#999" v-else-if="userinfo.scoremaxtype==1">
+						最多可抵扣{{userinfo.scoredkmaxmoney}}元</view>
+				</view>
+				<view class="f2">使用{{t('积分')}}抵扣
+					<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+				</view>
+			</checkbox-group>
+		</view>
+		<view style="padding:5px 3%;font-size:22rpx;color:red">注：商品金额并非实际成交的商品金额，活动结束后所有参与人均按照已达成的最低团购价格计算，多付的金额将全部退还</view>
+		<view style="width: 100%;height:110rpx"></view>
+		<view class="footer flex notabbarbot">
+			<view class="text1 flex1">总计：
+				<text style="font-weight:bold;font-size:36rpx">￥{{totalprice}}</text>
+			</view>
+			<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</button>
+		</view>
+		</form>
+
+		<view v-if="couponvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<couponlist :couponlist="couponList" :choosecoupon="true" :selectedrid="couponrid" :bid="product.bid" @chooseCoupon="chooseCoupon"></couponlist>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{freightList[freightkey].pstype==1?'取货':'配送'}}时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in freightList[freightkey].pstimeArr" :key="index" @tap="pstimeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		test:'test',
+
+		business:{},
+		productList: [],
+		freightList: [],
+		couponList: [],
+		couponrid: 0,
+		coupontype: 1,
+		address: [],
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		freightkey: 0,
+		freight_price: 0,
+		pstimetext: '',
+		freight_time: '',
+		usescore: 0,
+		totalprice: '0.00',
+		product_price: 0,
+		leveldk_money: 0,
+		scoredk_money: 0,
+		coupon_money: 0,
+		storedata: [],
+		storeid: '',
+		storename: '',
+		latitude: '',
+		longitude: '',
+		isload: 0,
+		leadermoney: 0,
+		couponvisible: false,
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		product: "",
+		guige: "",
+		userinfo: "",
+		buytype: "",
+		scorebdkyf: "",
+		num: "",
+		havetongcheng: "",
+		weight: "",
+		goodsnum: "",
+		beizhu: "",
+		couponkey: 0,
+		storeshowall:false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this; //获取产品信息
+			that.loading = true;
+			app.get('ApiTuangou/buy', {prodata:that.opt.prodata}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg,function(){
+						app.goback();
+					});return;
+				}
+				var product = res.product;
+				var freightList = res.freightList;
+				var userinfo = res.userinfo;
+				var couponList = res.couponList;
+				that.business = res.business;
+				that.product = product;
+				that.freightList = freightList;
+				that.userinfo = userinfo;
+				that.couponList = couponList;
+				that.buytype = res.buytype;
+				that.address = res.address;
+				that.scorebdkyf = res.scorebdkyf;
+				that.num = res.num;
+				that.havetongcheng = res.havetongcheng;
+				that.linkman = res.linkman;
+				that.tel = res.tel;
+
+				var product_price = product.sell_price * res.num;
+				var weight = product.weight;
+				var goodsnum = 0;
+
+				var leveldk_money = 0;
+				if (userinfo.discount > 0 && userinfo.discount < 10) {
+					leveldk_money = product_price * (1 - userinfo.discount * 0.1);
+					leveldk_money = leveldk_money.toFixed(2);
+				}
+				product_price = product_price.toFixed(2);
+				that.product_price = product_price;
+				that.leveldk_money = leveldk_money;
+				that.weight = weight;
+				that.scoredk_money = userinfo.scoredk_money;
+				that.goodsnum = goodsnum;
+				that.isload = 1;
+				that.calculatePrice();
+				that.loaded();
+
+				if (res.needLocation == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+
+						for (var j in freightList) {
+							if (freightList[j].pstype == 1) {
+								var storedata = freightList[j].storedata;
+
+								if (storedata) {
+									for (var x in storedata) {
+										if (latitude && longitude && storedata[x].latitude && storedata[x].longitude){
+											var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+											storedata[x].juli = juli;
+										}
+									}
+									storedata.sort(function (a, b) {
+										return a["juli"] - b["juli"];
+									});
+									for (var x in storedata) {
+										if (storedata[x].juli) {
+											storedata[x].juli = storedata[x].juli + '千米';
+										}
+									}
+									freightList[j].storedata = storedata;
+								}
+							}
+						}
+						that.freightList = freightList;
+					});
+				}
+			});
+		},
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var product_price = parseFloat(that.product_price); //+商品总价
+      var leadermoney = parseFloat(that.leadermoney); //-团长优惠
+      var leveldk_money = parseFloat(that.leveldk_money); //-会员折扣
+      var coupon_money = parseFloat(that.coupon_money); //-优惠券抵扣 
+      var address = that.address; //算运费
+      var freightdata = that.freightList[that.freightkey];
+      if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+        var needaddress = 1;
+      } else {
+        var needaddress = 0;
+      }
+      that.needaddress = needaddress;
+      var freight_price = freightdata.freight_price;
+
+      if (that.coupontype == 4) {
+        freight_price = 0;
+        coupon_money = 0;
+      }
+      var totalprice = product_price - leadermoney - leveldk_money - coupon_money;
+      if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+      var oldtotalprice = totalprice;
+      if (that.usescore) {
+        var scoredk_money = parseFloat(that.scoredk_money); //-积分抵扣
+      } else {
+        var scoredk_money = 0;
+      }
+      totalprice = totalprice + freight_price - scoredk_money;
+      if (that.scorebdkyf == '1' && scoredk_money > 0 && totalprice < freight_price) {
+        //积分不抵扣运费
+        totalprice = freight_price;
+        scoredk_money = oldtotalprice - freight_price;
+      }
+      var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+			var scoremaxtype = parseInt(that.userinfo.scoremaxtype);
+			var scoredkmaxmoney = parseFloat(that.userinfo.scoredkmaxmoney);
+
+			if (scoremaxtype == 0 && scoredk_money > 0 && scoredkmaxpercent > 0 && scoredkmaxpercent < 100 &&
+				scoredk_money > oldtotalprice * scoredkmaxpercent * 0.01) {
+				scoredk_money = oldtotalprice * scoredkmaxpercent * 0.01;
+				totalprice = oldtotalprice - scoredk_money;
+			} else if (scoremaxtype == 1 && scoredk_money > scoredkmaxmoney) {
+				scoredk_money = scoredkmaxmoney;
+				totalprice = oldtotalprice - scoredk_money;
+			}
+
+      if (totalprice < 0) totalprice = 0;
+      freight_price = freight_price.toFixed(2);
+      totalprice = totalprice.toFixed(2);
+      that.totalprice = totalprice
+			that.freight_price = freight_price;
+    },
+    changeFreight: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			this.freightkey = index;
+			that.calculatePrice();
+    },
+    chooseCoupon: function (e) {
+			var couponrid = e.rid;
+      var couponkey = e.key;
+
+      if (couponrid == this.couponrid) {
+        this.couponkey = 0;
+        this.couponrid = 0;
+        this.coupontype = 1;
+        this.coupon_money = 0;
+        this.couponvisible = false;
+      } else {
+        var couponList = this.couponList;
+        var coupon_money = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        if (coupontype == 4) {
+          coupon_money = this.freightprice;
+        }
+        this.couponkey = couponkey;
+        this.couponrid = couponrid;
+        this.coupontype = coupontype;
+        this.coupon_money = coupon_money;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+    },
+    choosePstime: function () {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      if (itemlist.length > 6) {
+        that.pstimeDialogShow = true;
+        that.pstimeIndex = -1;
+      } else {
+        uni.showActionSheet({
+          itemList: itemlist,
+          success: function (res) {
+						if(res.tapIndex >= 0){
+							var choosepstime = pstimeArr[res.tapIndex];
+							that.pstimetext = choosepstime.title;
+							that.freight_time = choosepstime.value;
+						}
+          }
+        });
+      }
+    },
+    pstimeRadioChange: function (e) {
+      var pstimeIndex = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey;
+      var freightList = this.freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var choosepstime = pstimeArr[pstimeIndex];
+      this.pstimetext = choosepstime.title;
+			this.freight_time = choosepstime.value;
+      this.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false
+    },
+    choosestore: function (e) {
+      var storekey = e.currentTarget.dataset.index;
+			var freightkey = this.freightkey
+			var freightList = this.freightList
+			freightList[freightkey].storekey = storekey
+      this.freightList = freightList;
+    },
+    //提交并支付
+    topay: function (e) {
+      var that = this;
+      var freightkey = this.freightkey;
+      var freightid = this.freightList[freightkey].id;
+      var prodata = this.opt.prodata;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+      var usescore = this.usescore;
+      var couponkey = this.couponkey;
+      var couponrid = this.couponrid;
+      var freight_time = that.freight_time; //console.log(yhqrecoid); return;
+
+      if(this.freightList[freightkey].pstype==1){
+				var storekey = this.freightList[freightkey].storekey
+				var storeid = this.freightList[freightkey].storedata[storekey].id;
+			}else{
+				var storeid = 0;
+			}
+      var needaddress = that.needaddress;
+      if (needaddress == 0) addressid = 0;
+
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+
+      if (this.freightList[freightkey].pstimeset == 1 && freight_time == '') {
+        app.error('请选择' + (this.freightList[freightkey].pstype == 0 ? '配送' : '提货') + '时间');
+        return;
+      }
+
+			var formdataSet = this.freightList[freightkey].formdata;
+      var formdata = e.detail.value;
+			var newformdata = {};
+			for (var i = 0; i < formdataSet.length;i++){
+				if (formdataSet[i].val3 == 1 && (formdata['form' + i] === '' || formdata['form' + i] === undefined || formdata['form' + i].length==0)){
+						app.alert(formdataSet[i].val1+' 必填');return;
+				}
+				if (formdataSet[i].key == 'selector') {
+						formdata['form' + i] = formdataSet[i].val2[formdata['form' + i]]
+				}
+				newformdata['form'+i] = formdata['form' + i];
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiTuangou/createOrder', {
+        proid: that.product.id,
+        ggid: that.guige.id,
+        num: that.num,
+        storeid: storeid,
+        couponrid: couponrid,
+        freightid: freightid,
+        freight_time: freight_time,
+        addressid: addressid,
+        usescore: usescore,
+        linkman: linkman,
+        tel: tel,
+				formdata: newformdata
+      }, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.error(data.msg);
+          return;
+        }
+        app.goto('/pages/pay/pay?id=' + data.payorderid);
+      });
+    },
+    showCouponList: function () {
+      this.couponvisible = true;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+    },
+		openLocation:function(e){
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			var latitude = parseFloat(storeinfo.latitude);
+			var longitude = parseFloat(storeinfo.longitude);
+			var address = storeinfo.name;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		openMendian: function(e) {
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = this.freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			app.chooseImage(function(data){
+				editorFormdata[idx] = data[0];
+				console.log(editorFormdata)
+				that.editorFormdata = editorFormdata
+				that.test = Math.random();
+			})
+		},
+		editorBindPickerChange:function(e){
+			var idx = e.currentTarget.dataset.idx;
+			var tplindex = e.currentTarget.dataset.tplindex;
+			var val = e.detail.value;
+			var editorFormdata = this.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			console.log(editorFormdata)
+			this.editorFormdata = editorFormdata
+			this.test = Math.random();
+		},
+		doStoreShowAll:function(){
+			this.storeshowall = true;
+		},
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:30rpx}
+.product .img{ width:140rpx;height:140rpx}
+.collage_icon{ color:#fe7203;border:1px solid #feccaa;display:flex;align-items:center;font-size:20rpx;padding:0 6rpx;margin-left:6rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 96%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 2%;display: flex;align-items: center;z-index: 8;box-sizing:content-box}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.storeviewmore{width:100%;text-align:center;color:#889;height:40rpx;line-height:40rpx;margin-top:10rpx}
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/comment.vue b/activity/tuangou/comment.vue
new file mode 100644
index 0000000..fb96cbb
--- /dev/null
+++ b/activity/tuangou/comment.vue
@@ -0,0 +1,193 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.propic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.proname}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul +'/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul +'/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiTuangou/comment', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiTuangou/comment', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 40px; line-height: 40px; color: #fff; background: #e94745; }
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/commentlist.vue b/activity/tuangou/commentlist.vue
new file mode 100644
index 0000000..a5f9d6f
--- /dev/null
+++ b/activity/tuangou/commentlist.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiTuangou/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/orderdetail.vue b/activity/tuangou/orderdetail.vue
new file mode 100644
index 0000000..797ab77
--- /dev/null
+++ b/activity/tuangou/orderdetail.vue
@@ -0,0 +1,338 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择货到付款' : '已成功付款'}}</view>
+				<view class="t2" v-if="detail.freight_type!=1">我们会尽快为您发货</view>
+				<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<text class="t2" user-select="true">发货信息：{{detail.express_com}} {{detail.express_no}}</text>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul +'/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1" user-select="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openMendian" :data-storeinfo="storeinfo" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		
+		<view class="btitle flex-y-center" v-if="detail.bid>0">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid"></image>
+			<text class="flex1" decode="true" space="true" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid" style="padding-left:16rpx">{{detail.binfo.name}}</text>
+		</view>
+		
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==0 && tuangouset.comment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && detail.iscomment==1" @tap.stop="goto" :data-url="'comment?orderid=' + detail.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.leveldk_money > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.coupon_money > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk_money > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">预付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+			<view class="item" v-if="detail.tuimoney > 0">
+				<text class="t1">已退款</text>
+				<text class="t2 red">¥{{detail.tuimoney}}</text>
+			</view>
+			<view class="item" v-if="detail.tuimoney > 0">
+				<text class="t1">实付金额</text>
+				<text class="t2 red">¥{{detail.real_price}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text v-if="detail.status==1 && detail.freight_type!=1" class="t2">待发货</text>
+				<text v-if="detail.status==1 && detail.freight_type==1" class="t2">待提货</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot" v-if="detail.status!=3">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+			<block v-if="detail.status==1">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.real_price">申请退款</view>
+			</block>
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">查看物流</view>
+			</block>
+
+			<block v-if="detail.status==2">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.real_price">申请退款</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="orderCollect" :data-id="detail.id">确认收货</view>
+			</block>
+			<block v-if="([1,2,3]).includes(detail.status) && invoice">
+				<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=tuangou&orderid=' + detail.id">发票</view>
+			</block>
+			<block v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3">
+				<view class="btn2">已完成</view>
+			</block>
+			<block v-if="detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		detail:{},
+		team:{},
+		storeinfo:{},
+		tuangouset:{},
+		invoice:0,
+
+		event_rul: app.globalData.event_url,
+    }
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function (option) {
+			var that = this;
+			that.loading = true;
+			app.get('ApiTuangou/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.tuangouset = res.tuangouset;
+				that.invoice = res.invoice;
+				that.loaded();
+			});
+		},
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiTuangou/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiTuangou/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiTuangou/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/orderlist.vue b/activity/tuangou/orderlist.vue
new file mode 100644
index 0000000..063a53a
--- /dev/null
+++ b/activity/tuangou/orderlist.vue
@@ -0,0 +1,215 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+			<view class="order-box" @tap="goto" :data-url="'orderdetail?id=' + item.id">
+				<view class="head">
+					<view class="f1" v-if="item.bid!=0" @tap.stop="goto" :data-url="'/pages/business/index?id=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+					<view v-else>订单号：{{item.ordernum}}</view>
+					<view class="flex1"></view>
+					<text v-if="item.status==0" class="st0">待付款</text>
+					<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+					<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+					<text v-if="item.status==2" class="st2">待收货</text>
+					<text v-if="item.status==3" class="st3">已完成</text>
+					<text v-if="item.status==4" class="st4">已关闭</text>
+				</view>
+
+				<view class="content" style="border-bottom:none">
+					<view @tap.stop="goto" :data-url="'product?id=' + item.proid">
+						<image :src="item.propic"></image>
+					</view>
+					<view class="detail">
+						<text class="t1">{{item.proname}}</text>
+						<text class="t2">{{item.ggname}}</text>
+						<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+					</view>
+				</view>
+				<view class="bottom">
+					<text>共计{{item.num}}件商品 实付:￥{{item.real_price}}</text>
+					<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+					<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+				</view>
+				<view class="op">
+					<block v-if="([1,2,3]).includes(item.status) && item.invoice">
+						<view class="btn2" @tap="goto" :data-url="'/pages/order/invoice?type=tuangou&orderid=' + item.id">发票</view>
+					</block>
+					<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+					<block v-if="item.status==0">
+						<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+					</block>
+					<block v-if="item.status==1">
+						<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.real_price">申请退款</view>
+					</block>
+					<block v-if="item.status==2">
+						<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.real_price">申请退款</view>
+						<view class="btn2" @tap.stop="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">查看物流</view>
+						<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id">确认收货</view>
+					</block>
+					<block v-if="item.status==4">
+						<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+					</block>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+			this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiTuangou/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiTuangou/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiTuangou/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.onLoad();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiTuangou/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.onLoad();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;flex-wrap: wrap;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/product.vue b/activity/tuangou/product.vue
new file mode 100644
index 0000000..5b6c716
--- /dev/null
+++ b/activity/tuangou/product.vue
@@ -0,0 +1,753 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<block v-if="sysset.showgzts">
+			<view style="width:100%;height:88rpx"> </view>
+			<view class="follow_topbar">
+				<view class="headimg"><image :src="sysset.logo"/></view>
+				<view class="info">
+					<view class="i">欢迎进入 <text :style="{color:t('color1')}">{{sysset.name}}</text></view>
+					<view class="i">关注公众号享更多专属服务</view>
+				</view>
+				<view class="sub" @tap="showsubqrcode" :style="{'background-color':t('color1')}">立即关注</view>
+			</view>
+			<uni-popup id="qrcodeDialog" ref="qrcodeDialog" type="dialog">
+				<view class="qrcodebox">
+					<image :src="sysset.qrcode" @tap="previewImage" :data-url="sysset.qrcode" class="img"/>
+					<view class="txt">长按识别二维码关注</view>
+					<view class="close" @tap="closesubqrcode">
+						<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+					</view>
+				</view>
+			</uni-popup>
+		</block>
+		<view style="position:fixed;top:15vh;left:20rpx;z-index:9;background:rgba(0,0,0,0.6);border-radius:20rpx;color:#fff;padding:0 10rpx" v-if="bboglist.length>0">
+			<swiper style="position:relative;height:54rpx;width:350rpx;" :autoplay="true" :interval="5000" :vertical="true">
+				<swiper-item v-for="(item, index) in bboglist" :key="index" @tap="goto" :data-url="'product?id=' + item.proid" class="flex-y-center">
+					<image :src="item.headimg" style="width:40rpx;height:40rpx;border:1px solid rgba(255,255,255,0.7);border-radius:50%;margin-right:4px"/>
+					<div style="width:300rpx;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;font-size:22rpx">{{item.nickname}} {{item.showtime}}购买了该商品</div>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="swiper-container" v-if="isplay==0">
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+				<block v-for="(item, index) in product.pics" :key="index">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+					</swiper-item>
+				</block>
+			</swiper>
+			<view class="imageCount">{{current+1}}/{{(product.pics).length}}</view>
+			<view v-if="product.video" class="provideo" @tap="payvideo"><image :src="event_rul +'/static/img/static/img/video.png'"/><view class="txt">{{product.video_duration}}</view></view>
+		</view>
+		<view class="videobox" v-if="isplay==1">
+			<video autoplay="true" class="video" id="video" :src="product.video"></video>
+			<view class="parsevideo" @tap="parsevideo">退出播放</view>
+		</view>
+
+		<view class="seckill_title">
+			<image :src="event_rul +'/static/img/static/img/tghd.png'" class="f0"/>
+			<view class="f1">
+				<view class="t1"><text style="font-size:24rpx">低至￥</text>{{product.min_price}}<text class="x2">￥{{product.market_price}}</text></view>
+				<view class="t2" v-if="tuangou_status==0">团购未开始</view>
+				<view class="t2" v-if="tuangou_status==1">火爆团购中</view>
+				<view class="t2" v-if="tuangou_status==2">团购已结束</view>
+			</view>
+			<view class="f3">
+				<view class="t1">距团购{{tuangou_status==0?'开始':'结束'}}还剩</view>
+				<view class="t2" id="djstime"><text class="djsspan">{{djshour}}</text> : <text class="djsspan">{{djsmin}}</text> : <text class="djsspan">{{djssec}}</text></view>
+			</view>
+		</view>
+
+		<view class="header"> 
+			<view class="price_share">
+				<view class="price">
+					<view class="f1" :style="{color:t('color1')}"><text style="font-size:36rpx">￥</text>{{product.sell_price}}</view>
+					<view class="f2" v-if="product.market_price*1 > product.sell_price*1">￥{{product.market_price}}</view>
+				</view>
+				<view class="share" @tap="shareClick"><image class="img" :src="event_rul +'/static/img/static/img/share.png'"/><text class="txt">分享</text></view>
+			</view>
+			<view class="title">{{product.name}}</view>
+			<view class="sales_stock">
+				<view class="f1">已参团：{{product.buynum}}人次</view>
+				<view class="f2">库存：{{product.stock}}</view>
+			</view>
+		</view>
+
+		
+		<view class="tg_pricedata">
+			<view class="tg_pricetitle">团购价格</view>
+			<view class="tg_price flex" v-for="(item, index) in product.pricedata" :key="index">
+				<view class="t1">满{{item.num}}人次</view>
+				<view class="t2 flex1" style="color:#e94745;margin-left:10rpx">{{item.money}}元</view>
+				<view class="t3"><text style="color:#f50" v-if="product.buynum>=item.num">已达成</text><text style="color:#333" v-else>还差{{item.num-product.buynum}}人次</text></view>
+			</view>
+			<view style="padding:5px 0;font-size:22rpx;color:red">注：付款金额并非实际花费金额，活动结束后所有参与人均按照已达成的最低价格计算，多付的金额将全部退还</view>
+		</view>
+
+		<!-- <view class="choose" @tap="buydialogChange" data-btntype="2">
+			<view class="f1 flex1">请选择商品规格及数量</view>
+			<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+		</view> -->
+		
+		<view class="cuxiaodiv" v-if="product.givescore > 0">
+			<view class="cuxiaopoint">
+				<view class="f0">送{{t('积分')}}</view>
+				<view class="f1" style="font-size:26rpx">购买可得{{t('积分')}}{{product.givescore}}个</view>
+			</view>
+		</view>
+
+		<view class="cuxiaodiv" v-if="cuxiaolist.length>0 || couponlist.length>0">
+			<view class="cuxiaopoint" v-if="cuxiaolist.length>0">
+				<view class="f0">促销</view>
+				<view class="f1">
+					<view v-for="(item, index) in cuxiaolist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0">{{item.tip}}</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			<view class="cuxiaopoint" v-if="couponlist.length>0">
+				<view class="f0">优惠</view>
+				<view class="f1">
+					<view v-for="(item, index) in couponlist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0" style="padding:0 6px">券</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+		</view>
+		<view v-if="showcuxiaodialog" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidecuxiaodetail"></view>
+			<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">优惠促销</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidecuxiaodetail"/>
+					</view>
+					<view class="popup__content">
+						<view v-for="(item, index) in cuxiaolist" :key="index" class="service-item">
+							<view class="suffix">
+								<view class="type-name"><text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text> <text style="color:#333;margin-left:20rpx">{{item.name}}</text></view>
+							</view>
+						</view>
+						<couponlist :couponlist="couponlist" @getcoupon="getcoupon"></couponlist>
+					</view>
+			</view>
+		</view>
+		<view class="commentbox" v-if="tuangouset.comment==1 && commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评度 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul +'/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :key="index2" :src="event_rul +'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"></image></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		<view class="shop" v-if="product.bid != 0">
+			<image :src="business.logo" class="p1"/>
+			<view class="p2 flex1">
+				<view class="t1">{{business.name}}</view>
+				<view class="t2">{{business.desc}}</view>
+			</view>
+			<button class="p4" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="goto" :data-url="'/pagesA/shop/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+		</view>
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+		<view class="bottombar flex-row" v-if="product.status==1">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+				<view class="item flex1" @tap="shareClick">
+					<image class="img" :src="event_rul +'/static/img/static/img/share2.png'"/>
+					<view class="t1">分享</view> 
+				</view>
+				<view class="item" @tap="addfavorite">
+					<text class="iconfont icon-shoucang" v-if="!isfavorite" style="font-size: 40rpx; margin-bottom: 3rpx;"></text>
+					<text class="iconfont icon-Collection" v-else style="color:#0A5D3B; font-size: 40rpx; margin-bottom: 3rpx;"></text>
+					<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+				</view>
+			</view>
+			<view class="op">
+				<view class="tobuy flex-x-center flex-y-center" :style="{background:t('color1')}" @tap="buydialogChange" data-controller="ApiTuangou" data-btntype="2" v-if="tuangou_status==1">立即团购</view>
+				<view class="tobuy flex-x-center flex-y-center" style="background:#ccc" v-else>立即团购</view>
+			</view>
+		</view>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+
+		<buydialog-tuangou v-if="buydialogShow" :proid="product.id" :btntype="btntype" @buydialogChange="buydialogChange" :menuindex="menuindex" controller="ApiTuangou"></buydialog-tuangou>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  
+	data() {
+  
+		return {
+ 
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+			initdata:{},
+			pre_url:app.globalData.pre_url,
+
+			tuangou_status:1,
+			nowtime:0,
+			djshour:'00',
+			djsmin:'00',
+			djssec:'00',
+			buydialogShow: false,
+			btntype:1,
+			isfavorite: false,
+			current: 0,
+			isplay: 0,
+			showcuxiaodialog: false,
+			business: "",
+			product: [],
+
+			cartnum: "",
+			commentlist: "",
+			commentcount: "",
+
+			cuxiaolist: "",
+
+			couponlist: "",
+
+			pagecontent: "",
+
+			guigelist: "",
+
+			guigedata: "",
+
+			sysset:{},
+
+			tuangouset: "",
+
+			title: "",
+
+			bboglist: "",
+
+			sharepic: "",
+
+			sharetypevisible: false,
+
+			showposter: false,
+
+			posterpic: "",
+
+			scrolltopshow: false,
+			kfurl:'',
+
+			event_rul: app.globalData.event_url,
+		};
+
+	},
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+
+	onUnload: function () {
+		clearInterval(interval);
+
+	},
+
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.loading = true;
+			app.post('ApiTuangou/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var product = res.product;
+				var sysset = res.sysset;
+				var pagecontent = JSON.parse(product.detail);
+				that.business = res.business;
+				that.product = product;
+				that.cartnum = res.cartnum;
+				that.commentlist = res.commentlist;
+				that.commentcount = res.commentcount;
+				that.cuxiaolist = res.cuxiaolist;
+				that.couponlist = res.couponlist;
+				that.pagecontent = pagecontent;
+				that.sysset = sysset;
+				that.tuangouset = res.tuangouset;
+				that.title = product.name;
+				that.isfavorite = res.isfavorite;
+				that.oglist = res.oglist;
+				that.sharepic = product.pics[0];
+				that.nowtime = res.nowtime;
+				
+				that.getdjs();
+				clearInterval(interval);
+				interval = setInterval(function(){
+					that.nowtime = that.nowtime+1;
+					that.getdjs();
+				},1000)
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+				that.kfurl = '/pages/kefu/index?bid='+res.product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:res.product.name,pic:res.product.pic});
+			});
+		},
+		getdjs:function(){
+			var that = this
+			var nowtime = that.nowtime*1;
+			var starttime = that.product.starttime*1;
+			var endtime = that.product.endtime*1;
+			if(endtime < nowtime){ //已结束
+				that.tuangou_status = 2
+				that.djshour = '00';
+				that.djsmin = '00';
+				that.djssec = '00';
+			}else{
+				if(starttime > nowtime){ //未开始
+					that.tuangou_status = 0
+					var totalsec = starttime - nowtime;
+				}else{ //进行中
+					that.tuangou_status = 1
+					var totalsec = endtime - nowtime;
+				}
+				var houer = Math.floor(totalsec/3600);
+				var min = Math.floor((totalsec - houer *3600)/60);
+				var sec = totalsec - houer*3600 - min*60
+				var djs = (houer<10?'0':'')+houer+'时'+(min<10?'0':'')+min+'分'+(sec<10?'0':'')+sec+'秒';
+				var djshour = (houer<10?'0':'')+houer
+				var djsmin = (min<10?'0':'')+min
+				var djssec = (sec<10?'0':'')+sec
+				that.djshour = djshour;
+				that.djsmin = djsmin;
+				that.djssec = djssec;
+			}
+		},
+
+		swiperChange: function (e) {
+
+			var that = this;
+
+			that.current = e.detail.current
+
+		},
+
+		payvideo: function () {
+
+			this.isplay = 1
+;
+			uni.createVideoContext('video').play();
+
+		},
+
+		parsevideo: function () {
+
+			this.isplay = 0
+;
+			uni.createVideoContext('video').stop();
+
+		},
+
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.btntype = e.currentTarget.dataset.btntype
+			}
+
+			this.buydialogShow = !this.buydialogShow;
+
+		},
+
+		//收藏操作
+
+		addfavorite: function () {
+
+			var that = this;
+
+			var proid = that.product.id;
+
+			app.post('ApiTuangou/addfavorite', {proid: proid,type: 'tuangou'
+}, function (data) {
+
+				if (data.status == 1) {
+
+					that.isfavorite = !that.isfavorite;
+
+				}
+
+
+				app.success(data.msg);
+
+			});
+
+		},
+
+		shareClick: function () {
+
+			this.sharetypevisible = true
+;
+		},
+
+		handleClickMask: function () {
+
+			this.sharetypevisible = false
+
+		},
+		showPoster: function () {
+			var that = this;
+			that.showposter = true;
+			that.sharetypevisible = false;
+			app.showLoading('生成海报中');
+			app.post('ApiTuangou/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+				if (data.status == 0) {
+					app.alert(data.msg);
+				} else {
+					that.posterpic = data.poster;
+				}
+			});
+		},
+
+		posterDialogClose: function () {
+
+			this.showposter = false;
+
+		},
+
+		showcuxiaodetail: function () {
+
+			this.showcuxiaodialog = true;
+
+		},
+
+		hidecuxiaodetail: function () {
+
+			this.showcuxiaodialog = false
+
+		},
+		getcoupon:function(){
+			this.showcuxiaodialog = false;
+			this.getdata();
+		},
+
+		onPageScroll: function (e) {
+
+			var that = this;
+
+			var scrollY = e.scrollTop;     
+			if (scrollY > 200) {
+				that.scrolltopshow = true
+
+;
+			}
+			if(scrollY < 150) {
+
+				that.scrolltopshow = false
+
+			}
+
+		},
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/seckill/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/seckill/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		},
+		showsubqrcode:function(){
+			this.$refs.qrcodeDialog.open();
+		},
+		closesubqrcode:function(){
+			this.$refs.qrcodeDialog.close();
+		},
+
+	}
+
+};
+</script>
+<style lang="scss">
+.container {padding-bottom: calc(124rpx + constant(safe-area-inset-bottom));padding-bottom: calc(124rpx + env(safe-area-inset-bottom));}
+.follow_topbar {height:88rpx; width:100%;max-width:640px; background:rgba(0,0,0,0.8); position:fixed; top:0; z-index:13;}
+.follow_topbar .headimg {height:64rpx; width:64rpx; margin:6px; float:left;}
+.follow_topbar .headimg image {height:64rpx; width:64rpx;}
+.follow_topbar .info {height:56rpx; padding:16rpx 0;}
+.follow_topbar .info .i {height:28rpx; line-height:28rpx; color:#ccc; font-size:24rpx;}
+.follow_topbar .info {height:80rpx; float:left;}
+.follow_topbar .sub {height:48rpx; width:auto; background:#FC4343; padding:0 20rpx; margin:20rpx 16rpx 20rpx 0; float:right; font-size:24rpx; color:#fff; line-height:52rpx; border-radius:6rpx;}
+.qrcodebox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.qrcodebox .img{width:400rpx;height:400rpx}
+.qrcodebox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.qrcodebox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+
+.provideo{background:rgba(255,255,255,0.7);width:160rpx;height:54rpx;padding:0 20rpx 0 4rpx;border-radius:27rpx;position:absolute;bottom:30rpx;left:50%;margin-left:-80rpx;display:flex;align-items:center;justify-content:space-between}
+.provideo image{width:50rpx;height:50rpx;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+
+.videobox{width:100%;height:750rpx;text-align:center;background:#000}
+.videobox .video{width:100%;height:650rpx;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx}
+
+.seckill_title{ width:100%;height:110rpx;background: linear-gradient(90deg, #FF3143 0%, #FD6647 100%);display:flex;align-items:center;}
+.seckill_title .f0{width:88rpx;height:88rpx;margin-left:20rpx}
+.seckill_title .f1{flex:1;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.seckill_title .f1 .t1{font-size:40rpx;color:#fff;line-height:50rpx}
+.seckill_title .f1 .t1 .x2{padding-left:8rpx;font-size:26rpx;color:#fff;text-decoration:line-through}
+.seckill_title .f1 .t2{color:#fff;font-size:22rpx}
+.seckill_title .f3{width:250rpx;height:110rpx;background:#FFDBDF;color:#333;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.seckill_title .f3 .t2{color:#FF3143}
+.seckill_title .djsspan{font-size:22rpx;border-radius:8rpx;background:#FF3143;color:#fff;text-align:center;padding:4rpx 8rpx;margin:0 4rpx}
+
+
+.header {width: 100%;padding: 20rpx 3%;background: #fff;}
+.header .price_share{width:100%;height:100rpx;display:flex;align-items:center;justify-content:space-between}
+.header .price_share .price{display:flex;align-items:flex-end}
+.header .price_share .price .f1{font-size:50rpx;color:#51B539;font-weight:bold}
+.header .price_share .price .f2{font-size:26rpx;color:#C2C2C2;text-decoration:line-through;margin-left:30rpx;padding-bottom:5px}
+.header .price_share .share{display:flex;flex-direction:column;align-items:center;justify-content:center}
+.header .price_share .share .img{width:32rpx;height:32rpx;margin-bottom:2px}
+.header .price_share .share .txt{color:#333333;font-size:20rpx}
+.header .title {color:#000000;font-size:32rpx;line-height:42rpx;font-weight:bold;}
+.header .sales_stock{display:flex;justify-content:space-between;height:60rpx;line-height:60rpx;margin-top:30rpx;font-size:24rpx;color:#777777}
+.header .commission{display:inline-block;margin-top:20rpx;margin-bottom:10rpx;border-radius:10rpx;font-size:20rpx;height:44rpx;line-height:44rpx;padding:0 20rpx}
+
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; }
+.choose .f2{ width: 32rpx; height: 32rpx;}
+
+.cuxiaodiv{background:#fff;margin-top:20rpx;padding: 0 3%;}
+.cuxiaopoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.cuxiaopoint .f0{color:#777777;height:32rpx;font-size:24rpx;padding-right:20rpx;display:flex;justify-content:center;align-items:center}
+.cuxiaopoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.cuxiaopoint .f1 .t{margin-left:10rpx;border-radius:3px;font-size:24rpx;height:40rpx;line-height:40rpx;padding-right:10rpx;flex-shrink:0;overflow:hidden}
+.cuxiaopoint .f1 .t0{display:inline-block;padding:0 5px;}
+.cuxiaopoint .f1 .t1{padding:0 4px}
+.cuxiaopoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.cuxiaopoint .f2 .img{width:32rpx;height:32rpx;}
+.cuxiaodiv .cuxiaopoint{border-bottom:1px solid #E6E6E6;}
+.cuxiaodiv .cuxiaopoint:last-child{border-bottom:0}
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+.service-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.service-item .prefix{padding-top: 2px;}
+.service-item .suffix{padding-left: 10rpx;}
+.service-item .suffix .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:100%;background:#fff;padding:0 3%;margin-top:20rpx}
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{position: fixed;bottom: 0px; left: 0px;right: 0; background: #fff;display:flex;padding:16rpx 24rpx 30rpx;padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));padding-bottom: calc(20rpx + env(safe-area-inset-bottom));align-items:center;}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:80rpx;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+
+.tg_pricedata{width: 100%; background: #fff;  margin-top:20rpx; padding: 0 3%;padding-top:0;position: relative; min-height:100rpx;}
+.tg_pricetitle{height:70rpx;line-height:70rpx;font-size:30rpx;color:#555;font-weight: bold;border-bottom:1px solid #ddd}
+.tg_price{height:80rpx;line-height:80rpx;border-bottom:1px dotted #ddd}
+.tg_price .t1{width:120rpx}
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/prolist.vue b/activity/tuangou/prolist.vue
new file mode 100644
index 0000000..6e8bb32
--- /dev/null
+++ b/activity/tuangou/prolist.vue
@@ -0,0 +1,333 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container" :style="history_show?'height:100%;':''">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<text class="iconfont icon-search"></text>
+					<input :value="keyword" placeholder="商品搜索..." placeholder-style="font-size:24rpx;color:#FFFFFF" @confirm="searchConfirm" @input="searchChange" />
+				</view>
+				<view class="search-btn" @tap="searchbtn">
+					<text class="iconfont icon-pailie" v-if="!history_show && productlisttype=='itemlist'"></text>
+					<text class="iconfont icon-shipailie" v-if="!history_show && productlisttype=='item2'"></text>
+					<text v-if="history_show">搜索</text>
+				</view>
+			</view>
+			<view class="search-history" v-show="history_show">
+				<view>
+					<text class="search-history-title">最近搜索</text>
+					<view class="delete-search-history" @tap="deleteSearchHistory">
+						<image :src="event_rul +'/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+					</view>
+				</view>
+				<view class="search-history-list">
+					<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+					</view>
+					<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul +'/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+				</view>
+			</view>
+			<view class="search-navbar" v-show="!history_show">
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="(!field||field=='sort')?'color:'+t('color1'):''" data-field="sort" data-order="desc">综合</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='sales'?'color:'+t('color1'):''" data-field="sales" data-order="desc">销量</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+					<text :style="field=='sell_price'?'color:'+t('color1'):''">价格</text>
+					<text class="iconfont icon-danbianjiantou1" :style="field=='sell_price'&&order=='asc'?'color:'+t('color1'):''"></text>
+					<text class="iconfont icon-danbianjiantou" :style="field=='sell_price'&&order=='desc'?'color:'+t('color1'):''"></text>
+				</view>
+				<view class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view>
+			</view>
+			<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+				<view class="filter-scroll-view">
+					<scroll-view class="filter-scroll-view-box" scroll-y="true">
+						<view class="search-filter">
+							<view class="filter-title">筛选</view>
+							<view class="filter-content-title">商品分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+								<block v-for="(item, index) in clist" :key="index">
+									<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<view class="search-filter-btn">
+								<view class="btn" @tap="filterReset">重置</view>
+								<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</uni-drawer>
+
+			
+		</view>
+		<view class="product-container">
+			<block v-if="datalist && datalist.length>0">
+				<dp-tuangou-item v-if="productlisttype=='item2'" :data="datalist" :menuindex="menuindex"></dp-tuangou-item>
+				<dp-tuangou-itemlist v-if="productlisttype=='itemlist'" :data="datalist" :menuindex="menuindex"></dp-tuangou-itemlist>
+			</block>
+			<nomore text="没有更多商品了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: false,
+		order: '',
+		field:'',
+		oldcid: "",
+		catchecid: "",
+		cid: "",
+		clist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		istg:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.cpid = this.opt.cpid || 0;
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用商品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list');
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getprolist();
+    }
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			that.loading = true;
+			app.get('ApiTuangou/prolist', {cid:cid,bid:bid}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.glist = res.glist;
+				that.loaded();
+				that.getprolist();
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var cid = that.cid;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			var bid = that.opt.bid ? that.opt.bid : '';
+      app.post('ApiTuangou/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,cid: cid,cpid:cpid,bid:bid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    }
+  }
+};
+</script>
+<style lang="scss">
+.container {background: #F5F5F5;height: 100vh;}
+.search-container {position: fixed;width: 100%;z-index:9;top:var(--window-top);background: #0A5D3B;}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height: 80rpx;border-radius: 40rpx;border: 0;background: rgba(255,255,255,.3);flex:1;padding: 0 28rpx;}
+.topsearch .f1 .icon-search{font-size: 40rpx;margin-right: 16rpx;color:#FFFFFF;}
+.topsearch .f1 input{height: 100%;flex: 1;font-size: 28rpx;color:#FFFFFF;}
+.topsearch .search-btn{
+	display:flex;align-items:center;color:#FFFFFF;text-align:center;margin-left:20rpx;
+	.iconfont {font-size:40rpx;}
+}
+.search-navbar {border-radius: 12rpx 12rpx 0 0;overflow: hidden;background: #F5F5F5;display: flex;text-align: center;align-items:center;padding:32rpx 0}
+.search-navbar-item {flex: 1;height: 28rpx;line-height: 28rpx;position: relative;font-size:28rpx;font-weight:bold;color:#333333}
+
+.search-navbar-item .icon-danbianjiantou,.icon-danbianjiantou1{font-size: 28rpx;color:#7D7D7D}
+.search-navbar-item .icon-danbianjiantou {margin-left: -10rpx;}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{min-width: 140rpx;box-sizing: border-box;background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 20rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%;font-size:26rpx;padding:206rpx 24rpx 0;}
+</style>
\ No newline at end of file
diff --git a/activity/tuangou/refund.vue b/activity/tuangou/refund.vue
new file mode 100644
index 0000000..cece4c3
--- /dev/null
+++ b/activity/tuangou/refund.vue
@@ -0,0 +1,91 @@
+<template>
+<view class="container">
+	<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-item">
+			<text class="label">退款原因</text>
+			<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+		</view>
+		<view class="form-item">
+			<text class="label">退款金额(元)</text>
+			<view class="flex"><input name="money" type="digit" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+		</view>
+		<button class="ref-btn" :style="{background:t('color1')}" form-type="submit">确定</button>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: '',
+      totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.orderid = this.opt.orderid
+		this.totalprice = this.opt.price
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			this.loaded();
+		},
+    formSubmit: function (e) {
+      //console.log(e);return;
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+
+      if (money <= 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiTuangou/refund', {orderid: orderid,reason: reason,money: money}, function (data) {
+				app.showLoading(false);
+        app.alert(data.msg);
+        var pages = getCurrentPages();
+
+        if (pages.length > 1) {
+          var prePage = pages[pages.length - 2];
+          prePage.getdata();
+        }
+        setTimeout(function () {
+          app.goback();
+        }, 1000);
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-item{ width:100%;background: #fff; padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.ref-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; text-align: center; color: #fff; font-size: 16px; border-radius: 8px;border: none; background: #ff8758; }
+</style>
\ No newline at end of file
diff --git a/activity/workorder/detail.vue b/activity/workorder/detail.vue
new file mode 100644
index 0000000..c073fb4
--- /dev/null
+++ b/activity/workorder/detail.vue
@@ -0,0 +1,152 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">标题</text>
+				<text class="t2">{{detail.title}}</text>
+			</view>
+			<view v-for="(item, index) in formcontent" :key="index" class="item">
+				<text class="t1">{{item.val1}}</text>
+				<text class="t2" v-if="item.key!='upload'">{{detail['form'+index]}}</text>
+				<view class="t2" style="display: flex; justify-content: flex-end;" v-else>
+					<view v-for="(sub, indx) in detail['form'+index]">
+						<image :src="sub" style="width:50px; margin-left: 10rpx;" mode="widthFix" @tap="previewImage" :data-url="sub"></image>
+					</view>
+				</view>
+			</view>
+			<view class="item">
+				<text class="t1">提交时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">审核状态</text>
+				<text class="t2" v-if="detail.status==0 && (!detail.payorderid||detail.paystatus==1)" style="color:#88e">待处理</text>
+				<text class="t2" v-if="detail.status==0 && detail.payorderid && detail.paystatus==0" style="color:red">待支付</text>
+				<text class="t2" v-if="detail.status==1" style="color:#F7B52D">处理中</text>
+				<text class="t2" v-if="detail.status==2" style="color:green">已完成</text>
+				<text class="t2" v-if="detail.status==-1" style="color:red">已驳回</text>
+			</view>
+			<view class="item" v-if="detail.status==-1">
+				<text class="t1">驳回原因</text>
+				<text class="t2" style="color:red">{{detail.reason}}</text>
+			</view>
+			<block v-if="detail.payorderid">
+			<view class="item">
+				<text class="t1">付款金额</text>
+				<text class="t2" style="font-size:32rpx;color:#e94745">￥{{detail.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款状态</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==0" style="color:green">已付款</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==1" style="color:red">已退款</text>
+				<text class="t2" v-if="detail.paystatus==0" style="color:red">未付款</text>
+			</view>
+			<view class="item" v-if="detail.paystatus>0 && detail.paytime">
+				<text class="t1">付款时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			</block>
+			<block v-if="detail.ordertype==1 && detail.glordernum && detail.orderid">
+				<view class="item">
+					<text class="t1">关联订单</text>
+					<text class="t2"  @tap="goto" :data-url="'pages/order/detail?id='+detail.orderid">商城订单（{{detail.glordernum}})
+					</text>
+				</view>
+			</block>	
+			<block v-if="detail.ordertype==2 && detail.glordernum && detail.orderid">
+				<view class="item" >
+					<text class="t1" >关联订单</text>
+					<text class="t2" @tap="goto" :data-url="'/activity/yuyue/orderdetail?id='+detail.orderid">预约订单（{{detail.glordernum}})
+					</text>
+				</view>
+			</block>	
+		</view>
+
+		
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view class="btn2" @tap="todel" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="goto" :data-url="detail.fromurl" v-if="detail.fromurl">再次提交</view>
+			<block v-if="detail.payorderid && detail.paystatus==0">
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			detail:{},
+			formcontent:[],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiWorkorder/formdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.form = res.form;
+				that.formcontent = res.formcontent;
+				that.detail = res.detail;
+				that.loaded();
+			});
+		},
+		todel:function(e){
+			var id = e.currentTarget.dataset.id;
+			app.confirm('确定要删除吗?',function(){
+				app.showLoading('删除中');
+        app.post('ApiWorkorder/formdelete', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+			})
+		}
+  }
+};
+</script>
+<style>
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;min-width:160rpx;padding: 0 20rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center;}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center;}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/activity/workorder/form/formdetail.vue b/activity/workorder/form/formdetail.vue
new file mode 100644
index 0000000..2e488ad
--- /dev/null
+++ b/activity/workorder/form/formdetail.vue
@@ -0,0 +1,132 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">标题</text>
+				<text class="t2">{{detail.title}}</text>
+			</view>
+			<view v-for="(item, index) in formcontent" :key="index" class="item">
+				<text class="t1">{{item.val1}}</text>
+				<text class="t2" v-if="item.key!='upload'">{{detail['form'+index]}}</text>
+				<view class="t2" v-else><image :src="detail['form'+index]" style="width:50px" mode="widthFix" @tap="previewImage" :data-url="detail['form'+index]"></image></view>
+			</view>
+			<view class="item">
+				<text class="t1">提交时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">审核状态</text>
+				<text class="t2" v-if="detail.status==0 && (!detail.payorderid||detail.paystatus==1)" style="color:#88e">待确认</text>
+				<text class="t2" v-if="detail.status==0 && detail.payorderid && detail.paystatus==0" style="color:red">待支付</text>
+				<text class="t2" v-if="detail.status==1" style="color:green">已确认</text>
+				<text class="t2" v-if="detail.status==2" style="color:red">已驳回</text>
+			</view>
+			<view class="item" v-if="detail.status==2">
+				<text class="t1">驳回原因</text>
+				<text class="t2" style="color:red">{{detail.reason}}</text>
+			</view>
+			<block v-if="detail.payorderid">
+			<view class="item">
+				<text class="t1">付款金额</text>
+				<text class="t2" style="font-size:32rpx;color:#e94745">￥{{detail.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款状态</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==0" style="color:green">已付款</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==1" style="color:red">已退款</text>
+				<text class="t2" v-if="detail.paystatus==0" style="color:red">未付款</text>
+			</view>
+			<view class="item" v-if="detail.paystatus>0 && detail.paytime">
+				<text class="t1">付款时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			</block>
+		</view>
+
+		
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view class="btn2" @tap="todel" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="goto" :data-url="detail.fromurl" v-if="detail.fromurl">再次提交</view>
+			<block v-if="detail.payorderid && detail.paystatus==0">
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			detail:{},
+			formcontent:[],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/formdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.form = res.form;
+				that.formcontent = res.formcontent;
+				that.detail = res.detail;
+				that.loaded();
+			});
+		},
+		todel:function(e){
+			var id = e.currentTarget.dataset.id;
+			app.confirm('确定要删除吗?',function(){
+				app.showLoading('删除中');
+        app.post('ApiMy/formdelete', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+			})
+		}
+  }
+};
+</script>
+<style>
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;min-width:160rpx;padding: 0 20rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center;}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center;}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/activity/workorder/form/formpay.vue b/activity/workorder/form/formpay.vue
new file mode 100644
index 0000000..308faf9
--- /dev/null
+++ b/activity/workorder/form/formpay.vue
@@ -0,0 +1,180 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view class="info-item">
+				<text class="t1">订单名称:</text>
+				<text class="t2">{{orderinfo.title}}</text>
+			</view>
+			<view class="info-item">
+				<text class="t1">订单编号:</text>
+				<text class="t2">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="info-item">
+				<text class="t1">支付金额:</text>
+				<text class="t2" style="color:#e94745">￥{{orderinfo.money}}</text>
+			</view>
+		</view>
+		<button class="fpay-btn" @tap="topay" data-typeid="1" v-if="wxpayst==1">微信支付</button>
+		<button class='fpay-btn' @tap="topay" data-typeid="10" v-if="alipay==1" style="background:#108EE9;margin-top:20rpx">支付宝支付</button>
+		<block v-if="moneypay==1">
+			<button class="fpay-btn2" @tap="modalinput" v-if="userinfo.haspwd">{{t('余额')}}支付（当前余额¥{{userinfo.money}}）</button>
+			<button class="fpay-btn2" @tap="topay" data-typeid="2" v-else>{{t('余额')}}支付（当前余额¥{{userinfo.money}}）</button>
+		</block>
+
+		<view v-if="userinfo.haspwd" :class="'weui-demo-dialog ' + (!hiddenmodalput ? 'weui-demo-dialog_show' : '')">
+			<view class="weui-mask" @tap="cancel"></view>
+			<view class="weui-dialog__wrp">
+				<view class="weui-dialog">
+					<view class="weui-dialog__hd">
+						<view class="weui-dialog__title">支付密码</view>
+					</view>
+					<view class="weui-dialog__bd">
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 130rpx;">
+							<text style="font-size:40rpx;color:#000"></text><input type="digit" placeholder="请输入支付密码" @input="getpwd"></input>
+						</view> 
+					</view>
+					<view class="weui-dialog__ft">
+						<view class="weui-dialog__btn weui-dialog__btn_default" @tap="cancel">取消</view>
+						<view class="weui-dialog__btn" @tap="topay" data-typeid="2">确定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			textset:{},
+			wxpayst:0,
+			alipay:0,
+			moneypay:0,
+			userinfo:{},
+      paypwd: '',
+      hiddenmodalput: true,
+      orderinfo: []
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiWxpay/formpay', {orderid: that.opt.orderid}, function (res) {
+				that.loading = false;
+				that.textset = app.globalData.textset;
+				if (res.status == 0) {
+					app.error(res.msg);
+				} else {
+					that.wxpayst = res.wxpayst;
+					that.alipay = res.alipay;
+					that.moneypay = res.moneypay;
+					that.orderinfo = res.orderinfo;
+					that.userinfo = res.userinfo;
+				}
+				that.loaded();
+			});
+		},
+    getpwd: function (e) {
+      var paypwd = e.detail.value;
+      this.paypwd = paypwd
+    },
+    cancel: function () {
+      this.hiddenmodalput = true
+    },
+    modalinput: function () {
+      this.hiddenmodalput = !this.hiddenmodalput
+    },
+    topay: function (e) {
+      var that = this;
+      var typeid = e.currentTarget.dataset.typeid;
+      var orderid = this.orderinfo.id;
+      if (typeid == 2) {
+        that.hiddenmodalput = true;
+        app.confirm('确定用' + that.t('余额') + '支付吗?', function () {
+          app.post('ApiWxpay/formpay', {orderid: orderid,typeid: typeid,paypwd: that.paypwd}, function (data) {
+            if (data.status == 0) {
+              app.error(data.msg);
+              return;
+            }
+            if (data.status == 2) {
+              //无需付款
+              app.success(data.msg);
+              setTimeout(function () {
+               app.goto(decodeURIComponent(that.opt.tourl));
+              }, 1000);
+              return;
+            }
+          });
+        });
+      } else {
+        app.post('ApiWxpay/uppay', {orderid: orderid,typeid: typeid}, function (data) {
+          if (data.status == 0) {
+            app.error(data.msg);
+            return;
+          }
+          if (data.status == 2) {
+            //无需付款
+            app.success(data.msg);
+            setTimeout(function () {
+              app.goto(decodeURIComponent(that.opt.tourl));
+            }, 1000);
+            return;
+          }
+          var opt = data.data;
+					uni.requestPayment({
+						'timeStamp': opt.timeStamp,
+						'nonceStr': opt.nonceStr,
+						'package': opt.package,
+						'signType': 'MD5',
+						'paySign': opt.paySign,
+						'success': function (res) {
+							app.success('付款完成');
+							setTimeout(function () {
+								app.goto(decodeURIComponent(that.opt.tourl));
+							}, 1000);
+						},
+						'fail': function (res) {}
+					});
+				})
+			}
+    }
+  }
+}
+</script>
+<style>
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:20rpx 20rpx;}
+.info-item2{ display:flex;width: 100%; background: #fff;padding: 0 3%;padding:20rpx 20rpx; margin-bottom:20rpx;}
+.info-item2 .t1{ width:70rpx; }
+.info-item2 .t2{ color: #000;}
+.info-item2 .x2{ color: #888;}
+
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding: 0 3%;  border-bottom: 1px #f3f3f3 solid;}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx; height: 80rpx; line-height: 80rpx; color: #000; }
+.info-item .t2{ height: 80rpx;line-height: 80rpx; color: #000;text-align:right;flex:1}
+
+
+.fpay-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; margin-top: 20px;border-radius: 5px; color: #fff; background: #1aac19; border: none; font-size: 15px; }
+.fpay-btn2{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; margin-top: 10px;border-radius: 5px; color: #fff; background: #e2cc05; border: none; font-size: 15px; }
+</style>
\ No newline at end of file
diff --git a/activity/workorder/index.vue b/activity/workorder/index.vue
new file mode 100644
index 0000000..bd4cf5c
--- /dev/null
+++ b/activity/workorder/index.vue
@@ -0,0 +1,366 @@
+<template>
+<view class="container">
+
+			<form  @submit="editorFormSubmit" :data-formcontent="formdata.content" :data-formid="cateid"  >
+			<view class="content">
+				<view class="form-item flex">
+					<view class="title"> 工单类型:</view>
+					<view class="inputbox flex">
+						<picker class="picker" mode="selector" @change="BindPickerChange" :range="cate" :value="index" range-key="name">
+								<view class="uni-input">{{catename}}</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#ccc;font-weight:normal"></text>
+					</view>
+				</view>
+
+				<view class="form-item" v-for="(item,idx) in formdata.content" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input"  :placeholder="item.val2" :data-formidx="'form'+idx" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" :data-formidx="'form'+idx" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="radio-group" :name="'form'+idx" :data-formidx="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="checkbox-group" :data-formidx="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector"  :name="'form'+idx"  :range="item.val2" @change="editorBindPickerChange" :data-idx="idx" :data-formidx="'form'+idx">		
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="formdata" :data-idx="idx"  :data-formidx="'form'+idx" >
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="formdata" :data-idx="idx" :data-formidx="'form'+idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					
+					<block v-if="item.key=='region'">
+						<uni-data-picker :localdata="items"  popup-title="请选择省市区" :placeholder="formdata['form'+idx] || '请选择省市区'" @change="onchange" :data-formidx="'form'+idx"></uni-data-picker>
+						<!-- <picker class="picker" mode="region" :name="'form'+idx" value="" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view> 
+							<view v-else>请选择省市区</view>
+						</picker> -->
+						<input type="text" style="display:none" :name="'form'+idx" :value="regiondata ? regiondata : formdata['form'+idx]"/>
+					</block>
+					
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata['content_pics'+idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata['content_pic'+idx]" v-for="(item, index) in editorFormdata['content_pic'+idx]" :key="index">
+								<view class="form-imgbox-close" @tap="removeimg" :data-pindex="index" :data-field="'content_pic'+idx"  :data-idx="idx"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+								<view class="form-imgbox-img"><image  :src="item" @click="previewImage" :data-url="item" mode="widthFix" /></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-field="'content_pic'+idx"  :data-idx="idx" :data-formidx="'form'+idx"></view>
+						</view>
+					</block>
+				</view>
+				<view class="dp-form-item" v-if="formdata.payset==1">
+					<text class="label">支付金额：</text>
+					<input type="text" class="input" name="price" :value='formdata.price' v-if="formdata.priceedit==1" @input="setfield" data-formidx="price"/>
+					<text v-if="formdata.priceedit==0">{{formdata.price}}</text>
+					<text style="padding-left:10rpx">元</text>
+				</view>
+			</view>
+			<view style="height: 100rpx;"></view>
+			<view class="btnbox">	<button class="dp-form-btn" form-type="submit"  :data-formcontent="formdata.content"  :data-formid="cateid"  :style="{background:t('color1')}" >提交</button>	</view>
+		</form>
+		
+		<!--悬浮按钮-->
+		<view class="myworkorder"  @tap="goto" data-url="record">我的工单</view>
+		
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		cate:[],
+		nomore: false,
+		nodata:false,
+		index:0,
+		catename:'请选择',
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		formdata:{},
+		formvaldata:{},
+		regiondata:'',
+		cateid:'',
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.type = this.opt.type || '';
+		this.orderid = this.opt.id || '';
+		this.cateid = this.opt.cateid || '';
+
+		this.getdata();
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		onchange(e) {
+		  const value = e.detail.value
+			console.log(value[0].text + ',' + value[1].text + ',' + value[2].text)
+			this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text;
+		},
+    getdata: function () {
+			var that = this;
+			app.get('ApiIndex/getCustom',{}, function (customs) {
+				var url = app.globalData.pre_url+'/static/area.json';
+				uni.request({
+					url: app.globalData.pre_url+'/static/area.json',
+					data: {},
+					method: 'GET',
+					header: { 'content-type': 'application/json' },
+					success: function(res2) {
+						that.items = res2.data
+					}
+				});
+			});
+      app.post('ApiWorkorder/getcategory', { type:that.type ,cateid:that.cateid}, function (res) {
+					that.isload = true;
+					var cate = res.data;
+					that.cate = cate;
+					//console.log(that.cateid)
+					if(that.cateid){
+								that.BindPickerChanges();
+					}
+			})
+			
+    },
+		BindPickerChange:function(e){
+			var that = this;
+			var index = e.detail.value;
+			that.index = index
+			console.log(index);
+			that.catename = that.cate[index].name
+			var cateid = that.cate[index].id
+			that.cateid = cateid
+			/*app.post('ApiWorkorder/getform', {id:cateid }, function (res) {
+					that.isload = true;
+					that.loading=false
+					if(res && res.status == 1 && res.data){
+						var formcontent = res.data;
+						that.formdata = formcontent
+						console.log(formdata);
+					}
+			})*/
+	
+			that.formdata = that.cate[index]
+		
+		},
+		BindPickerChanges:function(){
+			var that = this;
+			var index = that.index;
+			that.catename = that.cate[index].name
+			var cateid = that.cate[index].id
+			that.cateid = cateid
+
+			that.formdata = that.cate[index]
+		
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+		  var field = e.currentTarget.dataset.field;
+			var pics = that.editorFormdata[field]
+			//console.log(field);
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				that.editorFormdata[field] = pics;
+				that.editorFormdata['content_pics'+idx] = that.editorFormdata[field].join(',');
+				that.formvaldata[field] = pics;
+				//that.editorFormdata = editorFormdata
+				that.getdata();
+			},5)
+		},
+		removeimg:function(e){
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var pindex= e.currentTarget.dataset.pindex
+			var field= e.currentTarget.dataset.field
+			var pics = that.editorFormdata[field]
+			that.editorFormdata[field].splice(pindex,1)
+			that.editorFormdata['content_pics'+idx] = that.editorFormdata[field].join(',');
+			//console.log(that.editorFormdata[field]);
+			that.getdata();
+		},
+		editorBindPickerChange:function(e){
+			var that=this
+			var idx = e.currentTarget.dataset.idx;
+			var val = e.detail.value;
+			var editorFormdata = that.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			this.editorFormdata = editorFormdata
+			//console.log(this.editorFormdata);
+		
+			this.test = Math.random();			
+			var field = e.currentTarget.dataset.formidx;
+			this.formvaldata[field] = val;
+			that.getdata();
+		},
+		editorFormSubmit:function(e){
+			var that = this;
+			if(this.submitDisabled) return ;
+			//console.log('form发生了submit事件，携带数据为：', e.detail.value)
+			//var subdata = e.detail.value;
+			var formcontent = e.currentTarget.dataset.formcontent;
+			var formid = e.currentTarget.dataset.formid;
+			var formdataval = e.detail.value;
+			//console.log(formdataval);
+			var newformdata = {};
+			for (var i = 0; i < formcontent.length;i++){
+				//console.log(subdata['form' + i]);
+				if (formcontent[i].key == 'region') {
+						formdataval['form' + i] = that.regiondata;
+				}
+				if (formcontent[i].val3 == 1 && (formdataval['form' + i] === '' || formdataval['form' + i] === null || formdataval['form' + i] === undefined || formdataval['form' + i].length==0)){
+						app.alert(formcontent[i].val1+' 必填');return;
+				}
+				if (formcontent[i].key =='switch'){
+						if (subdata['form' + i]==false){
+								subdata['form' + i] = '否'
+						}else{
+								subdata['form' + i] = '是'
+						}
+				}
+			
+
+				if (formcontent[i].key == 'input' && formcontent[i].val4 && formdataval['form' + i]!==''){
+					if(formcontent[i].val4 == '2'){ //手机号
+						if (!/^1[3456789]\d{9}$/.test(formdataval['form' + i])) {
+							app.alert(formcontent[i].val1+' 格式错误');return;
+						}
+					}
+					if(formcontent[i].val4 == '3'){ //身份证号
+						if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(formdataval['form' + i])) {
+							app.alert(formcontent[i].val1+' 格式错误');return;
+						}
+					}
+					if(formcontent[i].val4 == '4'){ //邮箱
+						if (!/^(.+)@(.+)$/.test(formdataval['form' + i])) {
+							app.alert(formcontent[i].val1+' 格式错误');return;
+						}
+					}
+				}
+				newformdata['form'+i] = formdataval['form' + i];
+			}
+			that.submitDisabled = true;
+			app.showLoading('提交中');
+		
+			var pages = getCurrentPages(); //获取加载的页面
+			var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+			var thispath = '/' + (currentPage.route ? currentPage.route : currentPage.__route__); //当前页面url 
+			var opts = currentPage.$vm.opt;
+			app.post('ApiWorkorder/formsubmit', {formid:formid,formdata:newformdata,price:that.cate[that.index].price,type:that.type,orderid:that.orderid},function(data){
+				app.showLoading(false);
+				if (data.status == 0) {
+					setTimeout(function () {
+						app.error(data.msg);
+					}, 100)
+					that.submitDisabled = false;
+					return;
+				}else if(data.status == 1) { //无需付款
+					that.subscribeMessage(function () {
+						setTimeout(function () {
+							app.success(data.msg);
+						}, 100)
+						setTimeout(function () {
+							app.goto('record');
+						}, 1000)
+					});
+					return;
+				}else if(data.status==2){
+					
+					that.subscribeMessage(function () {
+						setTimeout(function () {
+							app.goto('/pages/pay/pay?id='+data.payorderid+'&tourl=record');
+						}, 100);
+					});
+				}
+				that.submitDisabled = false;
+			});
+		},
+  }
+}
+</script>
+<style>
+	.content{ width:90%;margin-top:40rpx; background: #fff; margin: 40rpx; border-radius:10rpx; padding: 20rpx;}
+	.dp-form-btn{color:#fff;width:90%;height:66rpx;display:flex;align-items:center;justify-content:center;border-radius:50rpx}
+	.btnbox{ background: #fff; position: fixed; bottom: 0; width: 100%; padding: 20rpx 0;}
+	.form-item .inputbox{ align-items: center; color: #ccc}
+	.content .item .uni-input{ color: #ccc}
+	
+	.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between;border-bottom: 1px #ededed solid;}
+	.form-item .label {color: #333;width: 150rpx;flex-shrink:0}
+	.form-item .radio{transform:scale(.7);}
+	.form-item .checkbox{transform:scale(.7);}
+	.form-item .input {height: 70rpx;padding-left: 10rpx;text-align: right;flex:1;border:1px solid #eee;padding:0 8rpx;border-radius:2px;}
+	.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+	.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+	.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+	.form-item .radio2{display:flex;align-items:center;}
+	.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+	.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+	.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+	.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+	.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+	.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+	
+	
+	.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+	.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+	.form-imgbox-close image{width:100%;height:100%}
+	.form-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+	.form-imgbox-img>image{max-width:100%;}
+	.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+	.form-uploadbtn{position:relative;height:200rpx;width:200rpx}
+	
+	.myworkorder{ background: #fff; width: 150rpx; height: 70rpx; position: fixed; right: 0%; bottom: 20%; display: flex; align-items: center; border-top-left-radius: 30rpx; border-bottom-left-radius: 30rpx; justify-content: center;}
+</style>
\ No newline at end of file
diff --git a/activity/workorder/record.vue b/activity/workorder/record.vue
new file mode 100644
index 0000000..9f41c3b
--- /dev/null
+++ b/activity/workorder/record.vue
@@ -0,0 +1,187 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待处理','处理中','已处理','待支付']" :itemst="['all','0','1','2','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view style="width:100%;height:90rpx"></view>
+		<view class="content" id="datalist">
+			<view class="item"  v-for="(item, index) in datalist" :key="index">
+				<view class="f1">
+
+						<view class="flex" style="justify-content: space-between;">
+							<text class="t1" @tap="goto" :data-url="'detail?id='+item.id">工单类型：{{item.title}}</text>	
+								<view class="f2">
+									<text class="t1" v-if="item.status==0 && (!item.payorderid||item.paystatus==1)" style="color:#88e">待处理</text>
+									<text class="t1" v-if="item.status==0 && item.payorderid && item.paystatus==0" style="color:red">待支付</text>
+									<text class="t1" v-if="item.status==1" style="color:green">处理中</text>
+									<text class="t1" v-if="item.status==2" style="color:red">已处理</text>
+									<text class="t1" v-if="item.status==-1" style="color:red">已驳回</text>
+								</view>
+						</view>
+						<view class="flex" style="justify-content: space-between;">
+							<text class="t2" @tap="goto" :data-url="'detail?id='+item.id">提交时间：{{item.createtime}}</text>
+							<view class="jindu" @tap="jindu" :data-id="item.id"  v-if="!item.payorderid || (item.payorderid && item.paystatus==1)" >查看进度</view>
+						</view>
+						<block v-if="item.ordertype==1 && item.glordernum && item.orderid">
+							<view class="flex" style="justify-content: space-between;">
+								<text class="t2" @tap="goto" :data-url="'pages/order/detail?id='+item.orderid">关联订单：商城订单（{{item.glordernum}}）</text>
+							</view>
+						</block>
+						<block v-if="item.ordertype==2 && item.glordernum && item.orderid">
+							<view class="flex" style="justify-content: space-between;">
+								<text class="t2" @tap="goto" :data-url="'/activity/yuyue/orderdetail?id='+item.orderid">关联订单：预约订单（{{item.glordernum}}）</text>
+							</view>
+						</block>
+				</view>
+			
+			</view>
+		</view>
+		<view class="modal" v-if="ishowjindu">
+			<view class="modal_jindu">
+						<view class="close" @tap="close"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+						<block v-if="jdlist.length>0">
+							<view class="item " v-for="(item,index) in jdlist">
+								<view class="f1"><image :src="event_rul + '/static/img/static/img/jindu' + (index==0?'2':'1') + '.png'"></image></view>
+								<view class="f2">
+									<text class="t2"> 时间：{{item.time}}</text>
+									<text class="t1">{{item.desc}}({{item.remark}}) </text>
+								</view>
+							</view>
+						</block>
+						<block v-else>
+								<view style="font-size:14px;color:#f05555;padding:10px;">等待处理</view>
+						</block>
+			</view>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		ishowjindu:false,
+		jdlist:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.formid = this.opt.formid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			this.nodata = false;
+			this.nomore = false;
+			this.loading = true;
+      app.post('ApiWorkorder/record', {formid:that.formid,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },jindu:function(e){
+			var that=this
+			that.ishowjindu=true
+			var id = e.currentTarget.dataset.id
+			//读取进度表
+			app.post('ApiWorkorder/selectjindu', { id: id }, function (res) {
+					if(res.status==1){
+						var data = res.data
+						that.jdlist =data
+					}
+				
+			})
+		},
+		close:function(e){
+			var that=this
+			that.ishowjindu=false
+		}
+  }
+}
+</script>
+<style>
+
+	.content{ width:100%;margin:0;}
+	.content .item{ width:94%;margin:20rpx 3%;;background:#fff;border-radius:16rpx;padding:30rpx 30rpx;display:flex;align-items:center;}
+	.content .item:last-child{border:0}
+	.content .item .f1{width:100%;display:flex;flex-direction:column}
+	.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+	.content .item .f1 .t2{color:#666666;margin-top:10rpx}
+	.content .item .f1 .t3{color:#666666}
+	.content .item .f2{width:20%;font-size:24rpx;text-align:right}
+	.content .item .f2 .t1{color:#03bc01;font-size:24rpx;}
+	.content .item .f2 .t2{color:#000000}
+	.content .item .f3{ flex:1;font-size:30rpx;text-align:right}
+	.content .item .f3 .t1{color:#03bc01}
+	.content .item .f3 .t2{color:#000000}
+	.jindu{ border: 1rpx solid #ccc; font-size: 24rpx; padding: 5rpx 10rpx; border-radius: 10rpx; color: #555;}
+	
+	.modal{ position: fixed; background:rgba(0,0,0,0.3); width: 100%; height: 100%; top:0; z-index: 1000;}
+	.modal .modal_jindu{ background: #fff; position: absolute; top: 20%; align-items: center; margin: auto; width: 90%; left: 30rpx; border-radius: 10rpx; padding: 40rpx;}
+	.modal_jindu .close image { width: 20rpx; height: 20rpx; position: absolute; top:10rpx; right: 20rpx;}
+	.modal_jindu .on{color: #23aa5e;}
+	.modal_jindu .item{display:flex;width: 96%;  margin: 0 2%;/*border-left: 1px #dadada solid;*/padding:0 0}
+	.modal_jindu .item .f1{ width:60rpx;position:relative}
+	/*.logistics img{width: 15px; height: 15px; position: absolute; left: -8px; top:11px;}*/
+	.modal_jindu .item .f1 image{width: 30rpx; height: 100%; position: absolute; left: -16rpx; top: 0rpx;}
+	.modal_jindu .item .f2{display:flex;flex-direction:column;flex:auto;padding:10rpx 0}
+	.modal_jindu .item .f2 .t1{font-size: 30rpx;}
+	.modal_jindu .item .f2 .t1{font-size: 26rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/xydzp/index.vue b/activity/xydzp/index.vue
new file mode 100644
index 0000000..6e4cf98
--- /dev/null
+++ b/activity/xydzp/index.vue
@@ -0,0 +1,432 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="wrap" :style="'background-image:url(' + info.bgpic + ');background-size:100% 100%;'">
+			<view class="header clearfix">
+				<view class="rule" @tap="changemaskrule">活动规则</view>
+				<view @tap="goto" :data-url="'myprize?hid=' + info.id" class="my">我的奖品</view>
+			</view>
+			<view class="title" :style="'background-image:url(' + info.banner + ');background-size:100% 100%;'"></view>
+
+			<view class="canvas" :hidden="showmaskrule || jxshow">
+				<canvas canvas-id="roulette" style=" width: 650rpx; height: 650rpx;">
+				</canvas>
+				<cover-image :src="pre_url + '/static/img/xydzp_start.png'" class="start" @tap="rollStart"></cover-image>
+			</view>
+
+			<view class="border" v-if="info.use_type != 2">您今日还有 <text id="change">{{remaindaytimes}}</text> 次抽奖机会</view>
+			<view class="border2" v-if="info.use_type == 1 && info.usescore>0">每次抽奖将消耗 <text>{{info.usescore}}</text> {{t('积分')}}，您共有 <text id="myscore">{{member.score}}</text> {{t('积分')}}</view>
+			<view class="border2" v-if="info.use_type == 2 && info.usemoney>0">每次抽奖将消耗 <text>{{t('余额')}}</text>{{info.usemoney}}元 ，您共有 <text id="mymoney">{{member.money}}</text> 元</view>
+            <!--滚动信息-->
+			<view class="scroll">
+				<view class="p" :style="'background-image: url('+pre_url+'/static/img/dzp/list.png);background-size:100% 100%;'"></view>
+				<view class="sideBox">
+					<swiper class="bd" autoplay="true" :indicator-dots="false" current="0" :vertical="true">
+						<swiper-item v-for="(item, index) in zjlist" :key="index" class="sitem" v-if="index%2==0">
+							<view>恭喜{{item.nickname}} 获得<text class="info">{{item.jxmc}}</text></view>
+							<view v-if="zjlist[index+1]">恭喜{{zjlist[index+1].nickname}} 获得<text class="info">{{zjlist[index+1].jxmc}}</text></view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+
+			<view id="mask-rule" v-if="showmaskrule">
+				<view class="box-rule">
+					<view class="h2">活动规则说明</view>
+					<view id="close-rule" :style="'background-image:url('+pre_url+'/static/img/dzp/close.png);background-size:100%'" @tap="changemaskrule"></view>
+					<view class="con">
+						<view class="text">
+							<text decode="true" space="true">{{info.guize}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!--中奖提示-->
+			<view id="mask" v-if="jxshow && jx>0">
+				<view class="blin"></view>
+				<view class="caidai" :style="'background-image: url('+pre_url+'/static/img/dzp/dianzhui.png);'"></view>
+				<view class="winning reback" :style="'background:url(' + pre_url + '/static/img/dzp/bg2.png) no-repeat;background-size:100% 100%;'">
+					<view class="p">
+						<view>恭喜您抽中了</view>
+						<view class="b" id="text1">{{jxmc}}</view>
+					</view>
+					<view @tap="changemask" class="btn">确定</view>
+				</view>
+			</view>
+			<!--未中奖提示-->
+			<view id="mask2" v-if="jxshow && jx==0">
+				<view class="blin"></view>
+				<view class="caidai" :style="'background-image: url('+pre_url+'/static/img/dzp/dianzhui.png);'"></view>
+				<view class="winning reback" :style="'background:url(' + pre_url + '/static/img/dzp/bg3.png) no-repeat;background-size:100% 100%;'">
+					<view class="p">
+						<view class="b" id="text2">{{jxmc}}</view>
+					</view>
+					<view @tap="changemask" class="btn">确定</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var dot_inter, bool;
+var app = getApp();
+var windowWidth = uni.getSystemInfoSync().windowWidth;
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      speed: 10,
+
+      /**转盘速度 */
+      speedDot: 1000,
+
+      /**点切换速度 */
+      dotColor: ['#ffffff', '#FCDF00'],
+      dotColor_1: ['#ffffff', '#FCDF00'],
+      dotColor_2: ['#FCDF00', '#ffffff'],
+      jxshow: false,
+      showmaskrule: false,
+			info:{},
+			member:{},
+			remaindaytimes:0,
+			remaintimes:0,
+			zjlist:[],
+      jxarr: "",
+      latitude: "",
+      longitude: "",
+      angelTo: "",
+      jxmc: "",
+      jx: ""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onShareAppMessage: function () {
+		var that = this;
+		var title = that.info.name;
+		if (that.info.sharetitle) title = that.info.sharetitle;
+		var sharepic = that.info.sharepic ? that.info.sharepic : '';
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		return this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic,callback:function(){that.sharecallback();}});
+  },
+	onShareTimeline:function(){
+		var that = this;
+		var title = that.info.name;
+		if (that.info.sharetitle) title = that.info.sharetitle;
+		var sharepic = that.info.sharepic ? that.info.sharepic : '';
+		var sharelink = that.info.sharelink ? that.info.sharelink : '';
+		var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+		var sharewxdata = this._sharewx({title:title,desc:sharedesc,link:sharelink,pic:sharepic,callback:function(){that.sharecallback();}});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiChoujiang/index', {id: id}, function (res) {
+				that.loading = false;
+				if(res.status == 0){
+					app.alert(res.msg);
+					return;
+				}
+				that.info = res.info;
+				that.jxarr = res.jxarr;
+				that.member = res.member;
+				that.remaindaytimes = res.remaindaytimes;
+				that.remaintimes = res.remaintimes;
+				that.zjlist = res.zjlist;
+				uni.setNavigationBarTitle({
+					title: res.info.name
+				});
+				that.downloadFile(res.jxarr, 0);
+				if (that.info.fanwei == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						that.latitude = latitude;
+						that.longitude = longitude;
+						console.log(longitude);
+					});
+				}
+				var title = that.info.name;
+				if (that.info.sharetitle) title = that.info.sharetitle;
+				var sharepic = that.info.sharepic ? that.info.sharepic : '';
+				var sharelink = that.info.sharelink ? that.info.sharelink : '';
+				var sharedesc = that.info.sharedesc ? that.info.sharedesc : '';
+				that.loaded({title:title,desc:sharedesc,link:sharelink,pic:sharepic,callback:function(){that.sharecallback();}});
+			});
+		},
+		sharecallback:function(){
+			var that = this;
+			app.post("ApiChoujiang/share", {hid: that.info.id}, function (res) {
+				if (res.status == 1) {
+					setTimeout(function () {
+						that.getdata();
+					}, 1000);
+				} else if (res.status == 0) {//dialog(res.msg);
+				}
+			});
+		},
+    downloadFile: function (jxarr, i) {
+      var that = this;
+      if (jxarr[i].pic) {
+        uni.downloadFile({
+          url: jxarr[i].pic,
+          success: function (res) {
+            if (res.tempFilePath) {
+              jxarr[i].pic = res.tempFilePath;
+              that.jxarr = jxarr;
+            }
+          },
+          complete: function () {
+            if (jxarr.length > i + 1) {
+              that.downloadFile(jxarr, i + 1);
+            } else {
+              that.dotStart();
+            }
+          }
+        });
+      } else {
+        if (jxarr.length > i + 1) {
+          that.downloadFile(jxarr, i + 1);
+        } else {
+          that.dotStart();
+        }
+      }
+    },
+    changemaskrule: function () {
+      this.showmaskrule = !this.showmaskrule
+    },
+    changemask: function () {
+      this.jxshow = !this.jxshow;
+      this.getdata();
+    },
+    rollStart: function () {
+      var that = this;
+      if (bool) return; // 如果在执行就退出
+      bool = true; // 标志为 在执行
+      app.post('ApiChoujiang/index', {id: that.info.id,op: 'getjx',longitude: that.longitude,latitude: that.latitude}, function (res) {
+        if (res.status != 1) {
+          app.alert(res.msg);
+          bool = false;
+          return;
+        } else {
+          //奖品数量等于10,指针落在对应奖品区域的中心角度[252, 216, 180, 144, 108, 72, 36, 360, 324, 288]
+          var angel = 360 - 360 / res.jxcount * res.jxindex;
+        }
+        angel += 360 * 6;
+        var baseStep = 30; // 起始滚动速度
+
+        var baseSpeed = 0.3;
+        var count = 1;
+        var timer = setInterval(function () {
+          that.angelTo = count
+          clearInterval(dot_inter);
+          that.drawCanvas();
+
+          if (count == angel) {
+            console.log('完毕');
+            bool = false;
+            clearInterval(timer);
+            that.jxshow = true;
+            that.jxmc = res.jxmc;
+            that.jx = res.jx;
+            that.dotStart();
+
+            if (res.jxtp == 2 && res.spdata) {
+              uni.sendBizRedPacket({
+                timeStamp: res.spdata.timeStamp,
+                // 支付签名时间戳，
+                nonceStr: res.spdata.nonceStr,
+                // 支付签名随机串，不长于 32 位
+                package: res.spdata.package,
+                //扩展字段，由商户传入
+                signType: res.spdata.signType,
+                // 签名方式，
+                paySign: res.spdata.paySign,
+                // 支付签名
+                success: function (res) {
+                  console.log(res);
+                },
+                fail: function (res) {
+                  console.log(res);
+                },
+                complete: function (res) {
+                  console.log(res);
+                }
+              });
+            }
+          }
+
+          count = count + baseStep * ((angel - count) / angel > baseSpeed ? baseSpeed : (angel - count) / angel);
+
+          if (angel - count < 0.5) {
+            count = angel;
+          }
+        }, that.speed);
+      });
+    },
+    drawCanvas: function () {
+      var that = this;
+      var ctx = uni.createCanvasContext('roulette', this);
+      var angelTo = this.angelTo || 0;
+      var width = windowWidth / 750 * 650;
+      var height = width;
+      var x = width / 2;
+      var y = width / 2;
+      var num = that.jxarr.length;
+      ctx.translate(x, y);
+      ctx.clearRect(-width, -height, width, height);
+      ctx.rotate(angelTo * Math.PI / 180); // 画外圆
+
+      ctx.beginPath();
+      ctx.lineWidth = width / 2;
+      ctx.strokeStyle = '#FFF7C5';
+      ctx.arc(0, 0, width / 4, 0, 2 * Math.PI);
+      ctx.stroke();
+      ctx.beginPath();
+      ctx.lineWidth = 1;
+      ctx.strokeStyle = '#D9644F';
+      ctx.arc(0, 0, width / 2 - 1, 0, 2 * Math.PI);
+      ctx.stroke();
+      ctx.beginPath();
+      ctx.lineWidth = 2;
+      ctx.strokeStyle = '#FDF28C';
+      ctx.arc(0, 0, width / 2 - 3, 0, 2 * Math.PI);
+      ctx.stroke();
+      ctx.beginPath();
+      ctx.lineWidth = 15;
+      ctx.strokeStyle = '#F8645E';
+      ctx.arc(0, 0, width / 2 - 14, 0, 2 * Math.PI);
+      ctx.stroke(); // 装饰点
+
+      var dotColor = that.dotColor;
+      var startAngel = 0;
+
+      for (var i = 0; i < 26; i++) {
+        ctx.beginPath();
+        var radius = width / 2 - 14;
+        var xr = radius * Math.cos(startAngel);
+        var yr = radius * Math.sin(startAngel);
+        ctx.fillStyle = dotColor[i % dotColor.length];
+        ctx.arc(xr, yr, 4, 0, 2 * Math.PI);
+        ctx.fill();
+        startAngel += 360 / 26 * (Math.PI / 180);
+      }
+
+      var jxarr = that.jxarr;
+      ctx.rotate(-(360 / num) * Math.PI / 180);
+
+      for (var i = 0; i < num; i++) {
+        ctx.rotate(360 / num * Math.PI / 180); //ctx.setFontSize(14)
+
+        ctx.font = 'normal bold 14px Arial';
+        ctx.fillStyle = '#e75228', ctx.textAlign = "center";
+        ctx.fillText(jxarr[i].mc, 0, -(width / 2 - 50));
+        ctx.drawImage(jxarr[i].pic, -20, -(width / 2 - 70), 40, 40); //ctx.restore();
+      }
+
+      if (num % 2 == 0) {
+        ctx.rotate(180 / num * Math.PI / 180);
+      }
+
+      for (var i = 0; i < num; i++) {
+        //ctx.save();
+        ctx.rotate(360 / num * Math.PI / 180);
+        ctx.beginPath();
+        ctx.lineWidth = 2;
+        ctx.moveTo(0, 0);
+        ctx.lineTo(0, width / 2 - 20);
+        ctx.setStrokeStyle('#f6625c');
+        ctx.stroke();
+      }
+
+      ctx.draw();
+    },
+    dotStart: function () {
+      var that = this;
+      var times = 0;
+      that.drawCanvas();
+      dot_inter = setInterval(function () {
+        if (times % 2) {
+          var dotColor = that.dotColor_1;
+        } else {
+          var dotColor = that.dotColor_2;
+        }
+
+        times++;
+        that.dotColor = dotColor;
+        that.drawCanvas();
+      }, that.speedDot);
+    }
+  }
+};
+</script>
+<style>
+.canvas{position: relative;}
+.canvas{width: 650rpx;height: 650rpx;margin:0 auto;margin-bottom:20rpx}
+.canvas>canvas{z-index: 0;}
+.start{height: 200rpx;width: 160rpx;position: absolute;top:50%;left: 50%;margin-left: -80rpx;margin-top: -110rpx;z-index: 2;}
+
+.wrap {width:100%;height:100%;}
+.header{width:100%;padding:22rpx 37rpx 0 37rpx;display:flex;justify-content:space-between}
+.rule,.my{width:140rpx;height:60rpx;border: 1px solid #f58d40;font-size:30rpx;line-height:60rpx;text-align: center;color: #f58d40;border-radius:5rpx;}
+.title {width:640rpx;height:316rpx;margin: auto;margin-top:-60rpx;}
+
+/*次数*/
+.border {width: 380rpx;height:64rpx;margin: 0 auto 25rpx;background:#fb3a13;font-size:24rpx;line-height:64rpx;text-align: center;color: #fff;border-radius:45rpx}
+.border2 {width:600rpx;height:50rpx;margin: 0 auto;background:#dbaa83;font-size:24rpx;line-height:50rpx;text-align: center;color: #fff;border-radius:10rpx}
+.scroll {width:550rpx;height:185rpx;margin:75rpx auto 0 auto;}
+.scroll .p {width: 372rpx;height:24rpx;margin: auto;}
+.sideBox{  width: 100%;height:100rpx;margin-top:20rpx;padding: 10rpx 0 10rpx 0;background-color: rgba(255, 255, 255, 0.2);border-radius:10rpx;overflow:hidden;}
+.sideBox .bd {width: 100%;height:80rpx;overflow:hidden;}
+.sideBox .sitem{overflow:hidden;text-align: center;font-size:20rpx;line-height:40rpx;color: #fff;-o-transition: all 0.5s ease-in-out;-ms-transition: all 0.5s ease-in-out;-moz-transition: all 0.5s ease-in-out;-webkit-transition: all 0.5s ease-in-out;transition: all 0.5s ease-in-out;}
+
+/*规则弹窗*/
+#mask-rule,#mask {position: fixed;left: 0;top: 0;z-index: 999;width: 100%;height: 100%;background-color: rgba(0, 0, 0, 0.85);}
+#mask-rule .box-rule {position: relative;margin: 30% auto;padding-top: 40rpx;width: 90%;height: 675rpx;border-radius: 20rpx;background-color: #f58d40;}
+#mask-rule .box-rule .star {position: absolute;left: 50%;top: -100rpx;margin-left: -130rpx;width: 259rpx;height:87rpx;}
+#mask-rule .box-rule .h2 {width: 100%;text-align: center;line-height: 34rpx;font-size: 34rpx;font-weight: normal;color: #fff;}
+#mask-rule #close-rule {position: absolute;right: 34rpx;top: 38rpx;width: 40rpx;height: 40rpx;}
+/*内容盒子*/
+#mask-rule .con {overflow: auto;position: relative;margin: 40rpx auto;padding-right: 15rpx;width: 580rpx;height: 82%;line-height: 48rpx;font-size: 26rpx;color: #fff;}
+#mask-rule .con .text {position: absolute;top: 0;left: 0;width: inherit;height: auto;}
+/*中奖提示*/
+#mask,#mask2{position: fixed;left: 0;top: 0;z-index: 999;width: 100%;height: 100%;background-color: rgba(0, 0, 0, 0.85);}
+#mask .blin,#mask2 .blin {width: 100%;height: 100%;-o-animation: circle 10s linear infinite;-ms-animation: circle 10s linear infinite;-moz-animation: circle 10s linear infinite;-webkit-animation: circle 10s linear infinite;animation: circle 10s linear infinite;}
+@keyframes circle {0% {-o-transform: rotate(0deg);-ms-transform: rotate(0deg);-moz-transform: rotate(0deg);-webkit-transform: rotate(0deg);transform: rotate(0deg);}100% {-o-transform: rotate(360deg);-ms-transform: rotate(360deg);-moz-transform: rotate(360deg);-webkit-transform: rotate(360deg);transform: rotate(360deg);}}
+#mask .caidai,#mask2 .caidai{position: absolute;left: 0;top: 0;z-index: 1;width: 100%;height: 100%;-o-transform: scale(1.2);-ms-transform: scale(1.2);-moz-transform: scale(1.2);-webkit-transform: scale(1.2);transform: scale(1.2);}
+#mask .winning,#mask2 .winning {position: absolute;left: 50%;top: 50%;z-index: 1;width: 675rpx;height: 600rpx;margin: -300rpx 0 0 -338rpx;-o-transform: scale(0.1);-ms-transform: scale(0.1);-moz-transform: scale(0.1);-webkit-transform: scale(0.1);transform: scale(0.1);}
+#mask .reback,#mask2 .reback{-o-animation: reback .5s linear forwards;-ms-animation: reback .5s linear forwards;-moz-animation: reback .5s linear forwards;-webkit-animation: reback .5s linear forwards;animation: reback .5s linear forwards;}
+@keyframes reback {100% {-o-transform: scale(1);-ms-transform: scale(1);-moz-transform: scale(1);-webkit-transform: scale(1);transform: scale(1);}}
+.winning .p{ position: absolute;left: 50%;top: 30%;width:80%;margin-left:-40%;color:#FFF;font-size:52rpx;text-align:center;}
+.winning .b{ font-size:44rpx;}
+.winning .btn {position: absolute;left: 50%;bottom: 15%;z-index: 2;width: 364rpx;height: 71rpx;line-height: 71rpx;margin-left: -182rpx;background-color:#ffee8d;border-radius:45rpx;-webkit-border-radius:45rpx;color:#f62a39;text-align:center;font-size:45rpx;
+}
+@keyframes shake {50% {-o-transform: rotate(-5deg);-ms-transform: rotate(-5deg);-moz-transform: rotate(-5deg);-webkit-transform: rotate(-5deg);transform: rotate(-5deg);}100% {-o-transform: rotate(5deg);-ms-transform: rotate(5deg);-moz-transform: rotate(5deg);-webkit-transform: rotate(5deg);transform: rotate(5deg);}}
+@keyframes fadein {100% {opacity: 1;-o-transform: rotate(360deg);-ms-transform: rotate(360deg);-moz-transform: rotate(360deg);-webkit-transform: rotate(360deg);transform: rotate(360deg);}}
+</style>
\ No newline at end of file
diff --git a/activity/xydzp/myprize.vue b/activity/xydzp/myprize.vue
new file mode 100644
index 0000000..0e34948
--- /dev/null
+++ b/activity/xydzp/myprize.vue
@@ -0,0 +1,259 @@
+<template>
+<view class="container" style="background-color:#fce243;min-height:100vh">
+	<block v-if="isload">
+		<view class="banner"><image :src="info.banner" mode="widthFix"></image></view>
+		<view class="activity">
+			<view class="activity-amin">
+				<view class="h2">我的奖品</view>
+				<view class="tb0">
+					<view class="tr">
+						<view class="td">中奖时间 </view>
+						<view class="td">中奖奖品</view>
+						<view class="td">领奖状态</view>
+						<view class="td">操作</view>
+					</view>
+					<view v-for="(item, index) in datalist" :key="index" class="tr">
+						<view class="td td2">{{item.createtime}}</view>
+						<view class="td td2">{{item.jxmc}}</view>
+						<view class="td td2"><block v-if="item.status==0">未领奖</block><block v-else>已领奖</block></view>
+						<view class="td td2">
+							<text v-if="item.status==0" @tap="duijiang" :data-k="index" :data-id="item.id" style="background-color:#fb5a43;padding:4rpx 8rpx">兑奖</text>
+							<text v-if="item.jxtp==3 && item.status==1" @tap="goto" data-url="/pages/coupon/mycoupon" style="background-color:#fb6a43;padding:4rpx 8rpx">查看</text>
+						</view>
+					</view>
+				</view>
+				<view v-if="!datalist" style="width:100%;padding:40rpx 0;text-align:center;color:#f19132">暂无中奖记录~</view>
+				<view @tap="goback" class="goback">返回</view>
+			</view>
+		</view>
+		
+		<view id="mask-rule2" v-if="maskshow && formdata">
+			<view class="box-rule" style="height:900rpx">
+				<view class="h2">兑奖信息</view>
+				<view id="close-rule2" style="background: no-repeat center / contain;background-image: url({pre_url}}/static/img/dzp/close.png);" @tap="changemaskshow"></view>
+				<view class="con">
+					<view class="text" style="text-align:center">
+						<view id="linkinfo" style="text-align: left;margin-left:10%;">
+							<view v-for="(item, index) in formdata" :key="index">{{index}}:{{item}}</view>
+						</view>
+						<image :src="record.hexiaoqr" style="width:80%" id="hexiaoqr" mode="widthFix"></image>
+						<view>请出示兑奖码给核销员进行兑奖</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view id="mask-rule1" v-if="maskshow && !formdata">
+			<view class="box-rule" style="height:640rpx">
+				<view class="h2">请填写兑奖信息</view>
+				<view id="close-rule1" style="background: no-repeat center / contain;background-image: url({pre_url}}/static/img/dzp/close.png);" @tap="changemaskshow"></view>
+				<view class="con">
+					<form class @submit="formsub">
+					<view class="pay-form" style="margin-top:0.18rem">
+						<view v-for="(item, idx) in info.formcontent" :key="idx" class="item flex-y-center">
+							<view class="f1">{{item.val1}}：</view>
+							<view class="f2 flex flex1">
+								<block v-if="item.key=='input'">
+									<input type="text" :name="'form' + idx" class="input" :placeholder="item.val2"></input>
+								</block>
+								<block v-if="item.key=='textarea'">
+									<textarea :name="'form' + idx" class="textarea" :placeholder="item.val2"></textarea>
+								</block>
+								<block v-if="item.key=='radio'">
+									<radio-group class="radio-group" :name="'form' + idx">
+										<label v-for="(item1, index) in item.val2" :key="index">
+												<radio :value="item1"></radio>{{item1}}
+										</label>
+									</radio-group>
+								</block>
+								<block v-if="item.key=='checkbox'">
+									<checkbox-group :name="'form' + idx">
+										<label v-for="(item1, index) in item.val2" :key="index">
+											<checkbox :value="item1" class="xyy-zu"></checkbox>{{item1}}
+										</label>
+									</checkbox-group>
+								</block>
+								<block v-if="item.key=='switch'">
+									<switch class="xyy-zu" value="1" :name="'form' + idx"></switch>
+								</block>
+								<block v-if="item.key=='selector'">
+									<picker mode="selector" :name="'form' + idx" value class="xyy-pic" :range="item.val2" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="item.val2[_editorFormdata[0][idx]]"> {{item.val2[_editorFormdata[0][idx]]}}</view>
+										<view v-else>请选择</view>
+									</picker>
+								</block>
+								<block v-if="item.key=='time'">
+									<picker mode="time" :name="'form' + idx" value :start="item.val2[0]" :end="item.val2[1]" class="xyy-pic" :range="item.val2" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="_editorFormdata[0][idx]">{{_editorFormdata[0][idx]}}</view>
+										<view v-else>请选择</view>
+									</picker>
+								</block>
+								<block v-if="item.key=='date'">
+									<picker mode="date" :name="'form' + idx" value :start="item.val2[0]" :end="item.val2[1]" class="xyy-pic" :range="item.val2" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="_editorFormdata[0][idx]"> {{_editorFormdata[0][idx]}}</view>
+										<view v-else>请选择</view>
+									</picker>
+								</block>
+								<block v-if="item.key=='region'">
+									<picker mode="region" :name="'form' + idx" value class="xyy-pic" @change="_editorBindPickerChange" :data-idx="idx" data-tplindex="0">
+										<view class="picker" v-if="_editorFormdata[0][idx]"> {{_editorFormdata[0][idx]}}</view>
+										<view v-else>请选择省市区</view>
+									</picker>
+								</block>
+							</view>
+						</view>
+						<view style="padding:0 40px 0 80px">
+							<button class="subbtn" form-type="submit">确 定</button>
+						</view>
+					</view>
+					</form>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 0,
+			info:{},
+      datalist: [],
+      pagenum: 1,
+      maskshow: false,
+      record: "",
+      formdata: ""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			app.get('ApiChoujiang/myprize', {hid: that.opt.hid}, function (res) {
+				res.info.formcontent = JSON.parse(res.info.formcontent);
+				that.info = res.info;
+				that.datalist = res.datalist;
+				that.loaded();
+			});
+		},
+    duijiang: function (e) {
+      var that = this;
+      var k = e.currentTarget.dataset.k;
+      var id = e.currentTarget.dataset.id;
+      var record = that.datalist[k];
+      var formdata = JSON.parse(record.formdata);
+      console.log(formdata);
+      that.record = record;
+      that.formdata = formdata;
+      that.maskshow = true;
+    },
+    changemaskshow: function () {
+      var that = this;
+      that.maskshow = !that.maskshow;
+    },
+    formsub: function (e) {
+      var that = this;
+      console.log(e);
+      var subdata = e.detail.value;
+      var formcontent = that.info.formcontent;
+      var record = that.record;
+      var formdata = {};
+
+      for (var i = 0; i < formcontent.length; i++) {
+        //console.log(subdata['form' + i]);
+        if (formcontent[i].val3 == 1 && (subdata['form' + i] === '' || subdata['form' + i] === undefined || subdata['form' + i].length == 0)) {
+          app.alert(formcontent[i].val1 + ' 必填');
+          return;
+        }
+
+        if (formcontent[i].key == 'switch') {
+          if (subdata['form' + i] == false) {
+            subdata['form' + i] = '否';
+          } else {
+            subdata['form' + i] = '是';
+          }
+        }
+
+        if (formcontent[i].key == 'selector') {
+          subdata['form' + i] = formcontent[i].val2[subdata['form' + i]];
+        }
+
+        var nowformdata = {};
+        formdata[formcontent[i].val1] = subdata['form' + i];
+      }
+
+      console.log(formdata);
+      app.post("ApiChoujiang/subinfo/rid/" + record.id, {
+        formcontent: formdata
+      }, function (res) {
+        if (res.status == 0) {
+          app.alert(res.msg);
+        } else {
+          that.changemaskshow();
+          app.success(res.msg);
+          that.getdata();
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.banner{ width:100%;padding:0 5%}
+.banner image{ display:block;width:100%;}
+.activity{padding:0 0 45rpx 0;margin-top:20rpx}
+.activity-amin{width:94%; margin:0 auto;}
+.activity-amin .h2{ margin:0 auto 30rpx auto;width:330rpx;height: 60rpx;background-color: #fc8209;text-align: center;line-height:60rpx;font-size: 30rpx;color: #ffffff;border-radius: 26rpx;letter-spacing:14rpx}
+.wt1{display:block; border:none; background-color:#FFF; padding:22rpx 22rpx; border-radius:8rpx; font-size: 30rpx; margin-bottom:60rpx;width:100%}
+.wt4{width:100%;background-color:#fb3a13; color:#FFF;font-size:30rpx;margin-top: 60rpx;}
+.tb0{ width:100%; margin-bottom:6%;font-size:24rpx}
+.tb0 .tr{width:100%;display:flex;border-bottom:1px solid #fff}
+.tb0 .tr .td{width:20%;background-color:#f19132;line-height:80rpx;text-align:center; color:#fff886;}
+.tb0 .tr .td:nth-child(1){width:32%; }
+.tb0 .tr .td:nth-child(2){width:32%; }
+.tb0 .tr .td:nth-child(3){width:18%; }
+.tb0 .tr .td:nth-child(4){width:18%; }
+.tb0 .tr .td2{padding:20rpx 0; text-align:center; color:#FFF; background-color:#f19c48}
+.goback{display:block;color:#fff;background-color:#fb3a13;margin:20rpx auto 40rpx auto;width:90%;padding:20rpx 0;text-align:center;font-size:36rpx;border-radius:15rpx;}
+
+#mask-rule1{position: fixed;top: 0;z-index: 10;width: 100%;max-width:640px;height: 100%;background-color: rgba(0, 0, 0, 0.85);}
+#mask-rule1 .box-rule {background-color: #f58d40;position: relative;margin: 30% auto;padding-top:40rpx;width: 90%;height:700rpx;border-radius:20rpx;}
+#mask-rule1 .box-rule .h2{width: 100%;text-align: center;line-height:34rpx;font-size: 34rpx;font-weight: normal;color: #fff;}
+#mask-rule1 #close-rule1{position: absolute;right:34rpx;top: 38rpx;width: 40rpx;height: 40rpx;}
+#mask-rule1 .con {overflow: auto;position: relative;margin: 40rpx auto;padding-right: 15rpx;width:580rpx;height: 82%;line-height: 48rpx;font-size: 26rpx;color: #fff;}
+#mask-rule1 .con .text {position: absolute;top: 0;left: 0;width: inherit;height: auto;}
+
+#mask-rule2{position: fixed;top: 0;z-index: 10;width: 100%;max-width:640px;height: 100%;background-color: rgba(0, 0, 0, 0.85);}
+#mask-rule2 .box-rule {background-color: #f58d40;position: relative;margin: 30% auto;padding-top:40rpx;width: 90%;height:700rpx;border-radius:20rpx;}
+#mask-rule2 .box-rule .h2{width: 100%;text-align: center;line-height:34rpx;font-size: 34rpx;font-weight: normal;color: #fff;}
+#mask-rule2 #close-rule2{position: absolute;right:34rpx;top: 38rpx;width: 40rpx;height: 40rpx;}
+#mask-rule2 .con {overflow: auto;position: relative;margin: 20rpx auto;padding-right: 15rpx;width:580rpx;height:90%;line-height: 48rpx;font-size: 26rpx;color: #fff;}
+#mask-rule2 .con .text {position: absolute;top: 0;left: 0;width: inherit;height: auto;}
+
+.pay-form .item{width:100%;padding:0 0 10px 0;color:#fff;}
+.pay-form .item:last-child{border-bottom:0}
+.pay-form .item .f1{width:80px;text-align:right;padding-right:10px}
+.pay-form .item .f2 input[type=text]{width:100%;height:35px;padding:2px 5px;border:1px solid #ddd;border-radius:2px}
+.pay-form .item .f2 textarea{width:100%;height:60px;padding:2px 5px;border:1px solid #ddd;border-radius:2px}
+.pay-form .item .f2 select{width:100%;height:35px;padding:2px 5px;border:1px solid #ddd;border-radius:2px}
+.pay-form .item .f2 label{height:35px;line-height:35px;}
+.subbtn{width:100%;background:#fb3a13;font-size: 30rpx;padding:0 22rpx;border-radius: 8rpx;color:#FFF;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/buy.vue b/activity/yuyue/buy.vue
new file mode 100644
index 0000000..10ffcb6
--- /dev/null
+++ b/activity/yuyue/buy.vue
@@ -0,0 +1,530 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<form @submit="topay">
+				<view v-if="sindex==1" class="address-add">
+					<view class="linkitem">
+						<text class="f1">联 系 人：</text>
+						<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx;"/>
+					</view>
+					<view class="linkitem">
+						<text class="f1">联系电话：</text>
+						<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx;"/>
+					</view>
+				</view>
+				<view v-else class="address-add flex-y-center" @tap="goto"
+					:data-url="'/pages/address/'+(address.id ? 'address' : 'addressadd')+'?fromPage=buy&type=1'">
+					<view class="f1">
+						<image class="img" :src="event_rul +'/static/img/static/img/address.png'" />
+					</view>
+					<view class="f2 flex1" v-if="address.id">
+						<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+						<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+					</view>
+					<view v-else class="f2 flex1">请选择您的地点</view>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"></image>
+				</view>
+				<view v-for="(buydata, index) in allbuydata" :key="index" class="buydata">			
+					<view class="bcontent">
+						<view class="btitle">
+							服务信息
+						</view>
+						<view class="product">
+							<view v-for="(item, index2) in buydata.prodata" :key="index2" class="item flex">
+								<view class="img" @tap="goto" :data-url="'product?id=' + item.product.id">
+									<image v-if="item.guige.pic" :src="item.guige.pic"></image>
+									<image v-else :src="item.product.pic"></image>
+								</view>
+								<view class="info flex1">
+									<view class="f1">{{item.product.name}}</view>
+									<view class="f2">{{item.guige.name}}</view>
+									<view class="f3"><text style="font-weight:bold;">￥{{item.guige.sell_price}}</text><text
+											style="padding-left:20rpx"> × {{item.num}}</text></view>
+								</view>
+							</view>
+						</view>
+				
+						<view class="freight">
+							<view class="f1">服务方式</view>
+							<view class="freight-ul">
+								<block v-for="(item, idx2) in fwtypelist" :key="idx2">
+									<view class="freight-li"
+										:style="item.key==sindex?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''"
+										@tap="selectFwtype" :data-index="item.key" >{{item.name}}
+									</view>
+								</block>
+		
+							</view>
+						</view>
+						
+						<view class="price" >
+							<view class="f1">预约时间</view>
+							<view class="f2" >{{yydate}}</view>
+						</view>
+
+						
+						<view class="price" v-if="buydata.fwpeople==1" >
+							<view class="f1">服务人员</view>
+							<view class="f2" @tap="goto"
+					:data-url="'selectpeople?prodata='+prodata+'&yydate='+yydate" > 
+								{{!isEmpty(buydata.fw)?buydata.fw.realname:'请选择人员'}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</view>
+						</view>
+							
+						
+					</view>
+					<view class="bcontent2">
+						<view class="price" v-if="buydata.leveldk_money>0">
+							<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+							<text class="f2">-¥{{buydata.leveldk_money}}</text>
+						</view>
+						<view class="price" v-if="yyset.iscoupon==1">
+							<view class="f1">{{t('优惠券')}}</view>
+							<view v-if="buydata.couponCount > 0" class="f2" @tap="showCouponList" :data-bid="buydata.bid">
+								<text
+									style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx"
+									:style="{background:t('color1')}">{{buydata.couponrid!=0?buydata.couponList[buydata.couponkey].couponname:buydata.couponCount+'张可用'}}</text><text
+									class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</view>
+							<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+						</view>
+						<view class="price">
+							<text class="f1">服务价格</text>
+							<text class="f2">¥{{buydata.product_price}}</text>
+						</view>
+						<view class="price">
+							<text class="f1">应付定金</text>
+							<text class="f2">¥{{buydata.sell_price}}</text>
+						</view>
+						<view style="display:none">{{test}}</view>
+						<view class="form-item" v-for="(item,idx) in buydata.formdata" :key="item.id">
+							<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+							<block v-if="item.key=='input'">
+								<input type="text" :name="'form'+buydata.bid+'_'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+							</block>
+							<block v-if="item.key=='textarea'">
+								<textarea :name="'form'+buydata.bid+'_'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+							</block>
+							<block v-if="item.key=='radio'">
+								<radio-group class="radio-group" :name="'form'+buydata.bid+'_'+idx">
+									<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+										<radio class="radio" :value="item1"/>{{item1}}
+									</label>
+								</radio-group>
+							</block>
+							<block v-if="item.key=='checkbox'">
+								<checkbox-group :name="'form'+buydata.bid+'_'+idx" class="checkbox-group">
+									<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+										<checkbox class="checkbox" :value="item1"/>{{item1}}
+									</label>
+								</checkbox-group>
+							</block>
+							<block v-if="item.key=='selector'">
+								<picker class="picker" mode="selector" :name="'form'+buydata.bid+'_'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx] || buydata.editorFormdata[idx]===0"> {{item.val2[buydata.editorFormdata[idx]]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='time'">
+								<picker class="picker" mode="time" :name="'form'+buydata.bid+'_'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx]">{{buydata.editorFormdata[idx]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='date'">
+								<picker class="picker" mode="date" :name="'form'+buydata.bid+'_'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx]">{{buydata.editorFormdata[idx]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='upload'">
+								<input type="text" style="display:none" :name="'form'+buydata.bid+'_'+idx" :value="buydata.editorFormdata[idx]"/>
+								<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+									<view class="form-imgbox" v-if="buydata.editorFormdata[idx]">
+										<view class="form-imgbox-img"><image class="image" :src="buydata.editorFormdata[idx]" @click="previewImage" :data-url="buydata.editorFormdata[idx]" mode="widthFix"/></view>
+									</view>
+									<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-bid="buydata.bid" :data-idx="idx"></view>
+								</view>
+							</block>
+						</view>
+					</view>
+					
+				</view>
+
+
+				<view style="width: 100%; height:110rpx;"></view>
+				<view class="footer flex">
+					<view class="text1 flex1">总计：
+						<text style="font-weight:bold;font-size:36rpx">￥{{alltotalprice}}</text>
+					</view>
+					<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">
+						确认提交</button>
+				</view>
+			</form>
+
+			<view v-if="couponvisible" class="popup__container">
+				<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+				<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+							@tap.stop="handleClickMask" />
+					</view>
+					<view class="popup__content">
+						<couponlist :couponlist="allbuydata[bid].couponList" :choosecoupon="true"
+							:selectedrid="allbuydata[bid].couponrid" :bid="bid" @chooseCoupon="chooseCoupon">
+						</couponlist>
+					</view>
+				</view>
+			</view>
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+				pre_url:app.globalData.pre_url,
+				test:'test',
+				address: [],
+				totalprice: '0.00',
+				couponvisible: false,
+				bid: 0,
+				nowbid: 0,
+				needaddress: 1,
+				linkman: '',
+				tel: '',
+				userinfo: {},
+				latitude: "",
+				longitude: "",
+				allbuydata: {},
+				alltotalprice: "",
+				type11visible: false,
+				type11key: -1,
+				regiondata: '',
+				items: [],
+				editorFormdata:[],
+				sindex:0,
+				prodata:'',
+				yydate:'',
+				yyset:'',
+				
+				event_rul: app.globalData.event_url,
+			};
+		},
+
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			this.yydate = opt.yydate
+			this.prodata = opt.prodata;
+			this.getdata();
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		methods: {
+			getdata: function() {
+				var that = this;
+				
+				app.get('ApiYuyue/buy', {
+					prodata: that.opt.prodata,
+					worker_id:that.opt.worker_id,
+				}, function(res) {
+					that.address = res.address;
+					that.linkman = res.linkman;
+					that.tel = res.tel;
+					that.yyset = res.yyset;
+					that.allbuydata = res.allbuydata;
+					that.fwtypelist = res.fwtypelist;
+					that.sindex = that.fwtypelist[0].key;
+					that.calculatePrice();
+					that.loaded();
+				});
+			},
+			chooseCoupon: function(e) {
+				var allbuydata = this.allbuydata;
+				var bid = e.bid;
+				var couponrid = e.rid;
+				var couponkey = e.key;
+				if (couponrid == allbuydata[bid].couponrid) {
+					allbuydata[bid].couponkey = 0;
+					allbuydata[bid].couponrid = 0;
+					allbuydata[bid].coupontype = 1;
+					allbuydata[bid].coupon_money = 0;
+					this.allbuydata = allbuydata;
+					this.couponvisible = false;
+				} else {
+					var couponList = allbuydata[bid].couponList;
+					var coupon_money = couponList[couponkey]['money'];
+					var coupontype = couponList[couponkey]['type'];
+					allbuydata[bid].couponkey = couponkey;
+					allbuydata[bid].couponrid = couponrid;
+					allbuydata[bid].coupontype = coupontype;
+					allbuydata[bid].coupon_money = coupon_money;
+					this.allbuydata = allbuydata;
+					this.couponvisible = false;
+				}
+				this.calculatePrice();
+			},
+			showCouponList: function(e) {
+				this.couponvisible = true;
+				this.bid = e.currentTarget.dataset.bid;
+			},
+			handleClickMask: function() {
+				this.couponvisible = false;
+			},
+			//计算价格
+			calculatePrice: function() {
+				var that = this;
+				var address = that.address;
+				var allbuydata = that.allbuydata;
+				var alltotalprice = 0;
+				var needaddress = 0;
+				for (var k in allbuydata) {
+					var product_price = parseFloat(allbuydata[k].sell_price);
+					var coupon_money = parseFloat(allbuydata[k].coupon_money); //-优惠券抵扣 
+					var totalprice = product_price - coupon_money ;
+					if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费					
+					alltotalprice += totalprice;
+				}
+				
+				that.needaddress = needaddress;
+				var oldalltotalprice = alltotalprice;
+				if (alltotalprice < 0) alltotalprice = 0;
+				alltotalprice = alltotalprice.toFixed(2);
+				that.alltotalprice = alltotalprice;
+				that.allbuydata = allbuydata;
+			},
+			//提交并支付
+			topay: function(e) {
+				var that = this;
+				var addressid = this.address.id;
+				var linkman = this.linkman;
+				var tel = this.tel;
+				var worker_id = that.opt.worker_id;
+				var frompage = that.opt.frompage ? that.opt.frompage : '';
+				var allbuydata = that.allbuydata;
+				if (that.sindex == 0) {
+					app.error('请选择服务方式');
+					return;
+				}
+				if(that.sindex==2 && addressid == undefined) {
+					app.error('请选择地址');
+					return;
+				}
+				if(that.sindex==1 && (!linkman || !tel)) {
+					app.error('请填写联系人及联系电话');
+					return;
+				}
+				if (worker_id == 0) {
+					app.error('请选择服务人员');
+					return;
+				}
+				var buydata = [];
+				for (var i in allbuydata) {
+					var formdata_fields = allbuydata[i].formdata;
+					var formdata = e.detail.value;
+					var newformdata = {};
+					for (var j = 0; j < formdata_fields.length;j++){
+						var thisfield = 'form'+allbuydata[i].bid + '_' + j;
+						console.log(allbuydata[i]);
+						if (formdata_fields[j].val3 == 1 && (formdata[thisfield] === '' || formdata[thisfield] === undefined || formdata[thisfield].length==0)){
+								app.alert(formdata_fields[j].val1+' 必填');return;
+						}
+						if (formdata_fields[j].key == 'selector') {
+								formdata[thisfield] = formdata_fields[j].val2[formdata[thisfield]]
+						}
+						newformdata['form'+j] = formdata[thisfield];
+					}			
+					buydata.push({
+						bid: allbuydata[i].bid,
+						prodata: allbuydata[i].prodatastr,
+						couponrid: allbuydata[i].couponrid,
+						formdata:newformdata
+					});
+				}
+				var remark =  this.remark;
+				var yydate = that.yydate;
+				//console.log(buydata);return;
+				app.showLoading('提交中');
+				app.post('ApiYuyue/createOrder', {
+					frompage: frompage,
+					buydata: buydata,
+					addressid: addressid,
+					linkman: linkman,
+					tel: tel,
+					remark:remark,
+					yydate:that.yydate,
+					worker_id:worker_id,
+					fwtype:that.sindex
+				}, function(res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+						//that.showsuccess(res.data.msg);
+						app.error(res.msg);
+						return;
+					}
+					//app.error('订单编号：' +res.payorderid);
+					app.goto('/pages/pay/pay?id=' + res.payorderid);
+				});
+			},
+			editorChooseImage: function (e) {
+				var that = this;
+				var bid = e.currentTarget.dataset.bid;
+				var idx = e.currentTarget.dataset.idx;
+				var editorFormdata = that.allbuydata[bid].editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				app.chooseImage(function(data){
+					editorFormdata[idx] = data[0];
+					// console.log(editorFormdata)
+					that.allbuydata[bid].editorFormdata = editorFormdata
+					that.test = Math.random();
+				})
+			},editorBindPickerChange:function(e){
+				var that = this;
+				var bid = e.currentTarget.dataset.bid;
+				var idx = e.currentTarget.dataset.idx;
+				var val = e.detail.value;
+				var editorFormdata = that.allbuydata[bid].editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				editorFormdata[idx] = val;
+				// console.log(editorFormdata)
+				that.allbuydata[bid].editorFormdata = editorFormdata;
+				that.test = Math.random();
+			},
+			//选择服务方式
+			selectFwtype: function(e) {
+				var that = this;
+				var index = e.currentTarget.dataset.index;
+				that.sindex = index
+			},
+			inputLinkman: function (e) {
+				this.linkman = e.detail.value
+			},
+			inputTel: function (e) {
+				this.tel = e.detail.value
+			},
+		}
+	}
+</script>
+
+<style>
+	.redBg{color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx; width: auto; display: inline-block; margin-top: 4rpx;}
+.address-add {width: 94%;margin: 20rpx 3%;background: #fff;border-radius: 20rpx;padding: 20rpx 3%;min-height: 140rpx;}
+.address-add .f1 {margin-right: 20rpx}
+.address-add .f1 .img {width: 66rpx;height: 66rpx;}
+.address-add .f2 {color: #666;}
+.address-add .f3 {width: 26rpx;height: 26rpx;}
+.linkitem {width: 100%;padding: 1px 0;background: #fff;display: flex;align-items: center}.cf3 {width: 200rpx;height: 26rpx;display: block;
+    text-align: right;}
+.linkitem .f1 {width: 160rpx;color: #111111}
+.linkitem .input {height: 50rpx;padding-left: 10rpx;color: #222222;font-weight: bold;font-size: 28rpx;flex: 1}
+.buydata {width: 94%;margin: 0 3%;margin-bottom: 20rpx;}
+.btitle {width: 100%;padding: 20rpx 20rpx;display: flex;align-items: center;color: #111111;font-weight: bold;font-size: 30rpx}
+.btitle .img {width: 34rpx;height: 34rpx;margin-right: 10rpx}
+.bcontent {width: 100%;padding: 0 20rpx;background: #fff;border-radius: 20rpx;}
+.bcontent2 {width: 100%;padding: 0 20rpx; margin-top: 30rpx;background: #fff;border-radius: 20rpx;}
+.product {width: 100%;border-bottom: 1px solid #f4f4f4}
+.product .item {width: 100%;padding: 20rpx 0;background: #fff;border-bottom: 1px #ededed dashed;}
+.product .item:last-child {border: none}
+.product .info {padding-left: 20rpx;}
+.product .info .f1 {color: #222222;font-weight: bold;font-size: 26rpx;line-height: 36rpx;margin-bottom: 10rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+.product .info .f2 {color: #999999;font-size: 24rpx}
+.product .info .f3 {color: #FF4C4C;font-size: 28rpx;display: flex;align-items: center;margin-top: 10rpx}
+.product image {width: 140rpx;height: 140rpx}
+.freight {width: 100%;padding: 20rpx 0;background: #fff;display: flex;flex-direction: column;}
+.freight .f1 {color: #333;margin-bottom: 10rpx}
+.freight .f2 {color: #111111;text-align: right;flex: 1}
+.freight .f3 {width: 24rpx;height: 28rpx;}
+.freighttips {color: red;font-size: 24rpx;}
+.freight-ul {width: 100%;display: flex;}
+.freight-li {flex-shrink: 0;display: flex;background: #F5F6F8;border-radius: 24rpx;color: #6C737F;font-size: 24rpx;text-align: center;height: 48rpx;line-height: 48rpx;padding: 0 28rpx;margin: 12rpx 10rpx 12rpx 0}
+
+.price {width: 100%;padding: 20rpx 0;background: #fff;display: flex;align-items: center}
+.price .f1 {color: #333}
+.price .f2 {color: #111;font-weight: bold;text-align: right;flex: 1}
+.price .f3 {width: 24rpx;height: 24rpx;}
+.scoredk {width: 94%;margin: 0 3%;margin-bottom: 20rpx;border-radius: 20rpx;padding: 24rpx 20rpx;background: #fff;display: flex;align-items: center}
+.scoredk .f1 {color: #333333}
+.scoredk .f2 {color: #999999;text-align: right;flex: 1}
+.remark {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center}
+.remark .f1 {color: #333;width: 200rpx}
+.remark input {border: 0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right}
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 20rpx;display: flex;align-items: center;z-index: 8}
+.footer .text1 {height: 110rpx;line-height: 110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1 text {color: #e94745;font-size: 32rpx;}
+.footer .op {width: 200rpx;height: 80rpx;line-height: 80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius: 44rpx}
+.storeitem {width: 100%;padding: 20rpx 0;display: flex;flex-direction: column;color: #333}
+.storeitem .panel {width: 100%;height: 60rpx;line-height: 60rpx;font-size: 28rpx;color: #333;margin-bottom: 10rpx;display: flex}
+.storeitem .panel .f1 {color: #333}
+.storeitem .panel .f2 {color: #111;font-weight: bold;text-align: right;flex: 1}
+.storeitem .radio-item {display: flex;width: 100%;color: #000;align-items: center;background: #fff;border-bottom: 0 solid #eee;padding: 8rpx 20rpx;}
+.storeitem .radio-item:last-child {border: 0}
+.storeitem .radio-item .f1 {color: #666;flex: 1}
+.storeitem .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left: 30rpx}
+.storeitem .radio .radio-img {width: 100%;height: 100%}
+.pstime-item {display: flex;border-bottom: 1px solid #f5f5f5;padding: 20rpx 30rpx;}
+.pstime-item .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.pstime-item .radio .radio-img {width: 100%;height: 100%}
+.cuxiao-desc {width: 100%}
+.cuxiao-item {display: flex;padding: 0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name {font-size: 28rpx;color: #49aa34;margin-bottom: 10rpx;flex: 1}
+.cuxiao-item .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.cuxiao-item .radio .radio-img {width: 100%;height: 100%}
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.member_search{width:100%;padding:0 40rpx;display:flex;align-items:center}
+.searchMemberButton{height:60rpx;background-color: #007AFF;border-radius: 10rpx;width: 160rpx;line-height: 60rpx;color: #fff;text-align: center;font-size: 28rpx;display: block;}
+.memberlist{width:100%;padding:0 40rpx;height: auto;margin:20rpx auto;}
+.memberitem{display:flex;align-items:center;border-bottom:1px solid #f5f5f5;padding:20rpx 0}
+.memberitem image{display: block;height:100rpx;width:100rpx;margin-right:20rpx;}
+.memberitem .t1{color:#333;font-weight:bold}
+.memberitem .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.memberitem .radio .radio-img {width: 100%;height: 100%}
+
+.checkMem{ display: inline-block; }
+.checkMem p{ height: 30px; width: 100%; display: inline-block; }
+.placeholder{  font-size: 26rpx;line-height: 80rpx;}
+.selected-item span{ font-size: 26rpx !important;}
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+</style>
diff --git a/activity/yuyue/buy2.vue b/activity/yuyue/buy2.vue
new file mode 100644
index 0000000..7163a37
--- /dev/null
+++ b/activity/yuyue/buy2.vue
@@ -0,0 +1,375 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<form @submit="topay">
+				<view v-if="sindex==1" class="address-add">
+					<view class="linkitem">
+						<text class="f1">联 系 人：</text>
+						<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx;"/>
+					</view>
+					<view class="linkitem">
+						<text class="f1">联系电话：</text>
+						<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx;"/>
+					</view>
+				</view>
+				<view v-else class="address-add flex-y-center" @tap="goto"
+					:data-url="'/pages/address/'+(address.id ? 'address' : 'addressadd')+'?fromPage=buy&type=1'">
+					<view class="f1">
+						<image class="img" :src="event_rul +'/static/img/static/img/address.png'" />
+					</view>
+					<view class="f2 flex1" v-if="address.id">
+						<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+						<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+					</view>
+					<view v-else class="f2 flex1">请选择您的地点</view>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"></image>
+				</view>
+				<view class="buydata">			
+					<view class="bcontent">
+						<view class="btitle">
+							服务信息
+						</view>
+						<view class="product">
+							<view class="item flex">
+								<view class="img" @tap="goto" :data-url="'product2?id=' + allbuydata.skillId">
+									<image v-if="allbuydata.pic" :src="allbuydata.pic"></image>
+									<image v-else :src="allbuydata.pic"></image>
+								</view>
+								<view class="info flex1">
+									<view class="f1">{{allbuydata.name}}</view>
+								
+									<view class="f3"><text style="font-weight:bold;">￥{{allbuydata.price}}{{allbuydata.unit}}</text>
+									<text style="padding-left:20rpx"> × {{allbuydata.num}}</text></view>
+								</view>
+							</view>
+						</view>	
+					</view>
+					<view class="bcontent2">
+						<view class="btitle2">
+							服务方式
+						</view>	
+		
+							<view class="price" >
+								<view class="f1">预约时间</view>
+								<view class="f2" >{{yydate}}</view>
+							</view>
+							<view class="price" >
+								<view class="f1">服务人员</view>
+								<view class="f2" >{{master.name}}</view>
+							</view>
+							<view class="price" >
+								<view class="f1">服务类型</view>
+								<view class="f2" >{{allbuydata.serviceType}}</view>
+							</view>
+					</view>
+					<view class="bcontent2">
+						<view class="price">
+							<text class="f1">服务价格</text>
+							<text class="f2">¥{{allbuydata.price}}</text>
+						</view>
+
+						<view class="price" >
+							<text class="f1">路程费用</text>
+							<view class="f2">
+								<text style="color:red; ">{{master.juli}}km </text> 
+								<text> ¥{{allbuydata.freight_price}}</text>
+							</view>
+						</view>
+						
+						<view class="form-item" >
+							<view class="label">顾客备注<text> </text></view>
+							
+							<input name="remark" class='input' placeholder="请输入备注" placeholder-style="font-size:28rpx"/>
+						</view>
+						
+					</view>
+					
+				</view>
+
+
+				<view style="width: 100%; height:110rpx;"></view>
+				<view class="footer flex">
+					<view class="text1 flex1">总计：
+						<text style="font-weight:bold;font-size:36rpx">￥{{totalprice}}</text>
+					</view>
+					<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">
+						确认提交</button>
+				</view>
+			</form>
+
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+				pre_url:app.globalData.pre_url,
+				test:'test',
+				address: [],
+				totalprice: '0.00',
+				couponvisible: false,
+				bid: 0,
+				nowbid: 0,
+				needaddress: 1,
+				linkman: '',
+				tel: '',
+				userinfo: {},
+				latitude: "",
+				longitude: "",
+				allbuydata: {},
+				alltotalprice: "",
+				type11visible: false,
+				type11key: -1,
+				regiondata: '',
+				items: [],
+				editorFormdata:[],
+				sindex:0,
+				prodata:'',
+				yydate:'',
+				master:[],
+				
+				event_rul: app.globalData.event_url,
+			};
+		},
+
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			this.yydate = opt.yydate
+			this.prodata = opt.prodata;
+			this.getdata();
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		methods: {
+			getdata: function() {
+				var that = this;			
+				app.get('ApiYuyue2/buy', {
+					prodata: that.opt.prodata,
+				}, function(res) {
+					if(res.status==0){		app.error('技能获取失败'); }
+					that.address = res.address;
+					that.linkman = res.linkman;
+					that.tel = res.tel;
+					that.allbuydata = res.allbuydata;
+					that.totalprice = res.totalprice;
+					that.rdata = res.rdata;
+					that.master = res.master;
+				
+					//	that.calculatePrice();
+					that.loaded();
+				});
+			},
+			showCouponList: function(e) {
+				this.couponvisible = true;
+				this.bid = e.currentTarget.dataset.bid;
+			},
+			handleClickMask: function() {
+				this.couponvisible = false;
+			},
+	
+			//提交并支付
+			topay: function(e) {
+				var formdata = e.detail.value;
+			
+				var that = this;
+				var addressid = this.address.id;
+				var linkman = this.linkman;
+				var tel = this.tel;
+				var frompage = that.opt.frompage ? that.opt.frompage : '';
+				var allbuydata = that.allbuydata;
+				if(addressid == undefined) {
+					app.error('请选择地址');
+					return;
+				}
+				if(!linkman || !tel) {
+					app.error('请填写联系人及联系电话');
+					return;
+				}
+				var remark =  formdata.remark;
+				var yydate = that.yydate;
+				//console.log(buydata);return;
+				app.showLoading('提交中');
+				app.post('ApiYuyue2/createOrder', {
+					frompage: frompage,
+					addressid: addressid,
+					linkman: linkman,
+					tel: tel,
+					remark:remark,
+					yydate:that.yydate,
+					prodata:that.prodata,
+				}, function(res) {
+					app.showLoading(false);
+					if (res.status == 1) {
+							app.goto('/pages/pay/pay?id=' + res.payorderid);
+						//that.showsuccess(res.data.msg);
+					}else{
+						app.error(res.msg);
+						return;
+						
+					}
+					//app.error('订单编号：' +res.payorderid);
+				
+				});
+			},
+			editorChooseImage: function (e) {
+				var that = this;
+				var bid = e.currentTarget.dataset.bid;
+				var idx = e.currentTarget.dataset.idx;
+				var editorFormdata = that.allbuydata[bid].editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				app.chooseImage(function(data){
+					editorFormdata[idx] = data[0];
+					// console.log(editorFormdata)
+					that.allbuydata[bid].editorFormdata = editorFormdata
+					that.test = Math.random();
+				})
+			},editorBindPickerChange:function(e){
+				var that = this;
+				var bid = e.currentTarget.dataset.bid;
+				var idx = e.currentTarget.dataset.idx;
+				var val = e.detail.value;
+				var editorFormdata = that.allbuydata[bid].editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				editorFormdata[idx] = val;
+				// console.log(editorFormdata)
+				that.allbuydata[bid].editorFormdata = editorFormdata;
+				that.test = Math.random();
+			},
+			//选择服务方式
+			selectFwtype: function(e) {
+				var that = this;
+				var index = e.currentTarget.dataset.index;
+				that.sindex = index
+			},
+			inputLinkman: function (e) {
+				this.linkman = e.detail.value
+			},
+			inputTel: function (e) {
+				this.tel = e.detail.value
+			},
+		}
+	}
+</script>
+
+<style>
+	.redBg{color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx; width: auto; display: inline-block; margin-top: 4rpx;}
+.address-add {width: 94%;margin: 20rpx 3%;background: #fff;border-radius: 20rpx;padding: 20rpx 3%;min-height: 140rpx;}
+.address-add .f1 {margin-right: 20rpx}
+.address-add .f1 .img {width: 66rpx;height: 66rpx;}
+.address-add .f2 {color: #666;}
+.address-add .f3 {width: 26rpx;height: 26rpx;}
+.linkitem {width: 100%;padding: 1px 0;background: #fff;display: flex;align-items: center}.cf3 {width: 200rpx;height: 26rpx;display: block;
+    text-align: right;}
+.linkitem .f1 {width: 160rpx;color: #111111}
+.linkitem .input {height: 50rpx;padding-left: 10rpx;color: #222222;font-weight: bold;font-size: 28rpx;flex: 1}
+.buydata {width: 94%;margin: 0 3%;margin-bottom: 20rpx;}
+.btitle {width: 100%;padding: 20rpx 20rpx;display: flex;align-items: center;color: #111111;font-weight: bold;font-size: 30rpx}
+.btitle .img {width: 34rpx;height: 34rpx;margin-right: 10rpx}
+.btitle2 {width: 100%; padding-top:20rpx;display: flex;align-items: center;color: #111111;font-weight: bold;font-size: 30rpx}
+.btitle2 .img {width: 34rpx;height: 34rpx;margin-right: 10rpx}
+
+.bcontent {width: 100%;padding: 0 20rpx;background: #fff;border-radius: 20rpx;}
+.bcontent2 {width: 100%;padding: 0 30rpx; margin-top: 30rpx;background: #fff;border-radius: 20rpx;}
+.product {width: 100%;border-bottom: 1px solid #f4f4f4}
+.product .item {width: 100%;padding: 20rpx 0;background: #fff;border-bottom: 1px #ededed dashed;}
+.product .item:last-child {border: none}
+.product .info {padding-left: 20rpx;}
+.product .info .f1 {color: #222222;font-weight: bold;font-size: 26rpx;line-height: 36rpx;margin-bottom: 10rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+.product .info .f2 {color: #999999;font-size: 24rpx}
+.product .info .f3 {color: #FF4C4C;font-size: 28rpx;display: flex;align-items: center;margin-top: 10rpx}
+.product image {width: 140rpx;height: 140rpx}
+.freight {width: 100%;padding: 20rpx 0;background: #fff;display: flex;flex-direction: column;}
+.freight .f1 {color: #333;margin-bottom: 10rpx}
+.freight .f2 {color: #111111;text-align: right;flex: 1}
+.freight .f3 {width: 24rpx;height: 28rpx;}
+.freighttips {color: red;font-size: 24rpx;}
+.freight-ul {width: 100%;display: flex;}
+.freight-li {flex-shrink: 0;display: flex;background: #F5F6F8;border-radius: 24rpx;color: #6C737F;font-size: 24rpx;text-align: center;height: 48rpx;line-height: 48rpx;padding: 0 28rpx;margin: 12rpx 10rpx 12rpx 0}
+
+.price {width: 100%;padding: 20rpx 0;background: #fff;display: flex;align-items: center}
+.price .f1 {color: #333}
+.price .f2 {color: #111;font-weight: bold;text-align: right;flex: 1}
+.price .f3 {width: 24rpx;height: 24rpx;}
+.scoredk {width: 94%;margin: 0 3%;margin-bottom: 20rpx;border-radius: 20rpx;padding: 24rpx 20rpx;background: #fff;display: flex;align-items: center}
+.scoredk .f1 {color: #333333}
+.scoredk .f2 {color: #999999;text-align: right;flex: 1}
+.remark {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center}
+.remark .f1 {color: #333;width: 200rpx}
+.remark input {border: 0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right}
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 20rpx;display: flex;align-items: center;z-index: 8}
+.footer .text1 {height: 110rpx;line-height: 110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1 text {color: #e94745;font-size: 32rpx;}
+.footer .op {width: 200rpx;height: 80rpx;line-height: 80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius: 44rpx}
+.storeitem {width: 100%;padding: 20rpx 0;display: flex;flex-direction: column;color: #333}
+.storeitem .panel {width: 100%;height: 60rpx;line-height: 60rpx;font-size: 28rpx;color: #333;margin-bottom: 10rpx;display: flex}
+.storeitem .panel .f1 {color: #333}
+.storeitem .panel .f2 {color: #111;font-weight: bold;text-align: right;flex: 1}
+.storeitem .radio-item {display: flex;width: 100%;color: #000;align-items: center;background: #fff;border-bottom: 0 solid #eee;padding: 8rpx 20rpx;}
+.storeitem .radio-item:last-child {border: 0}
+.storeitem .radio-item .f1 {color: #666;flex: 1}
+.storeitem .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left: 30rpx}
+.storeitem .radio .radio-img {width: 100%;height: 100%}
+.pstime-item {display: flex;border-bottom: 1px solid #f5f5f5;padding: 20rpx 30rpx;}
+.pstime-item .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.pstime-item .radio .radio-img {width: 100%;height: 100%}
+.cuxiao-desc {width: 100%}
+.cuxiao-item {display: flex;padding: 0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name {font-size: 28rpx;color: #49aa34;margin-bottom: 10rpx;flex: 1}
+.cuxiao-item .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.cuxiao-item .radio .radio-img {width: 100%;height: 100%}
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.member_search{width:100%;padding:0 40rpx;display:flex;align-items:center}
+.searchMemberButton{height:60rpx;background-color: #007AFF;border-radius: 10rpx;width: 160rpx;line-height: 60rpx;color: #fff;text-align: center;font-size: 28rpx;display: block;}
+.memberlist{width:100%;padding:0 40rpx;height: auto;margin:20rpx auto;}
+.memberitem{display:flex;align-items:center;border-bottom:1px solid #f5f5f5;padding:20rpx 0}
+.memberitem image{display: block;height:100rpx;width:100rpx;margin-right:20rpx;}
+.memberitem .t1{color:#333;font-weight:bold}
+.memberitem .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.memberitem .radio .radio-img {width: 100%;height: 100%}
+
+.checkMem{ display: inline-block; }
+.checkMem p{ height: 30px; width: 100%; display: inline-block; }
+.placeholder{  font-size: 26rpx;line-height: 80rpx;}
+.selected-item span{ font-size: 26rpx !important;}
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+</style>
diff --git a/activity/yuyue/comment.vue b/activity/yuyue/comment.vue
new file mode 100644
index 0000000..f081ede
--- /dev/null
+++ b/activity/yuyue/comment.vue
@@ -0,0 +1,203 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form-content">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="order.propic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{order.proname}}</view>
+						<view class="f2">{{order.ggname}}</view>
+						<view class="f3">￥{{order.product_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul +'/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul +'/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+
+		order:{},
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var oid = that.opt.oid;
+			that.loading = true;
+			app.get('ApiYuyue/comment', {oid: oid}, function (res) {
+				that.loading = false;
+				that.order = res.order;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var oid = that.opt.oid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiYuyue/comment', {oid: oid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/commentdp.vue b/activity/yuyue/commentdp.vue
new file mode 100644
index 0000000..0e24c01
--- /dev/null
+++ b/activity/yuyue/commentdp.vue
@@ -0,0 +1,186 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价店铺</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul +'/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul +'/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiOrder/commentdp', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiOrder/commentdp', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/commentlist.vue b/activity/yuyue/commentlist.vue
new file mode 100644
index 0000000..25bf34e
--- /dev/null
+++ b/activity/yuyue/commentlist.vue
@@ -0,0 +1,127 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+				<text class="t3">规格：{{item.ggname}}</text>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiYuyue/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/commentps.vue b/activity/yuyue/commentps.vue
new file mode 100644
index 0000000..8e1c156
--- /dev/null
+++ b/activity/yuyue/commentps.vue
@@ -0,0 +1,186 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul +'/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul +'/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiYuyue/commentps', {id: id}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var id = that.opt.id;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiYuyue/commentps', {id: id,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/common.css b/activity/yuyue/common.css
new file mode 100644
index 0000000..bdf3c75
--- /dev/null
+++ b/activity/yuyue/common.css
@@ -0,0 +1,12 @@
+.tabbar{height: auto; position: relative;}
+.tabbar-icon {width: 50rpx;height: 50rpx;}
+.tabbar-bar {display: flex;flex-direction: row;width: 100%;height:100rpx;position: fixed;bottom: 0;padding:10rpx 0 0 0;background: #fff;font-size: 24rpx;color: #999;border-top: 1px solid #e5e5e5;z-index: 8;box-sizing:content-box}
+.tabbar-item {flex: 1;text-align: center;overflow: hidden;}
+.tabbar-image-box {height: 54rpx;margin-bottom: 4rpx;}
+.tabbar-text {line-height: 30rpx;font-size: 24rpx;color:#222222}
+.tabbar-text.active{color:#06A051}
+.tabbar-bot{height:110rpx;width:100%;box-sizing:content-box}
+@supports(bottom: env(safe-area-inset-bottom)){
+	.tabbar-bot{padding-bottom:env(safe-area-inset-bottom);}
+	.tabbar-bar{padding-bottom:env(safe-area-inset-bottom);}
+}
\ No newline at end of file
diff --git a/activity/yuyue/dating.vue b/activity/yuyue/dating.vue
new file mode 100644
index 0000000..dd06885
--- /dev/null
+++ b/activity/yuyue/dating.vue
@@ -0,0 +1,320 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view>
+			<view class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<input class="search-text" placeholder="搜索商家" placeholder-style="color:#aaa;font-size:24rpx" @confirm="searchConfirm"/>
+				</view>
+			</view>
+			<block v-for="(item, index) in datalist" :key="item.id">
+			<view class="order-box" @tap="goto" :data-url="'jdorderdetail?id=' + item.id">
+				<view class="head">
+					
+					<view class="f1" v-if="item.leftminute>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">{{item.leftminute}}分钟内</text> 送达</view>
+					<view class="f1" v-else><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>预约时间：{{item.orderinfo.yydate}}<text class="t1" style="margin-left:10rpx"></text></view>
+					<view class="flex1"></view>
+					<view class="f2"><text class="t1">{{item.ticheng}}</text>元</view>
+				</view>
+				<view class="content">
+					<view class="f1">
+						<view class="t1"><text class="x1">{{item.juli}}</text><text class="x2">{{item.juli_unit}}</text></view>
+						<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+						<view class="t3"><text class="x1">{{item.juli2}}</text><text class="x2">{{item.juli2_unit}}</text></view>
+					</view>
+					<view class="f2">
+						<view class="t1">{{item.binfo.name}}</view>
+						<view class="t2">{{item.binfo.address}}</view>
+						<view class="t3">{{item.orderinfo.address}}</view>
+						<view class="t2">{{item.orderinfo.area}}</view>
+					</view>
+					<view class="f3" @tap.stop="daohang" :data-index="index"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+				</view>
+				<view class="op">
+					<view class="flex1"></view>
+					<view class="btn1" @tap.stop="qiangdan" :data-id="item.id">抢单</view>
+				</view>
+			</view>
+			</block>
+		
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+		<!-- <view style="width:100%;height:120rpx"></view> -->
+		<!-- <view class="bottom">
+			<view class="my">
+				<image :src="event_rul +'/static/img/static/img/my.png'" class="img"/>
+				<text>我的</text>
+			</view>
+			<view class="btn1" @tap="setpsst" data-st="1" v-if="psuser.status==0">暂停接单中</view>
+			<view class="btn2" :style="{background:t('color1')}" @tap="setpsst" data-st="0" v-if="psuser.status==1">开启接单中</view>
+		</view> -->
+		
+		<view class="tabbar">
+			<view class="tabbar-bot"></view>
+			<view class="tabbar-bar" style="background-color:#ffffff">
+				<view @tap="goto" data-url="dating" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/home2.png'"></image>
+					</view>
+					<view class="tabbar-text active">大厅</view>
+				</view>
+				<view @tap="goto" data-url="jdorderlist" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/order.png'"></image>
+					</view>
+					<view class="tabbar-text">订单</view>
+				</view>
+				<view @tap="goto" data-url="jdorderlist?st=3" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/orderwc.png'"></image>
+					</view>
+					<view class="tabbar-text">已完成</view>
+				</view>
+				<view @tap="goto" data-url="my" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/my.png'"></image>
+					</view>
+					<view class="tabbar-text">我的</view>
+				</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<view style="display:none">{{timestamp}}</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata: false,
+		interval1:null,
+		timestamp:'',
+		nowtime:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onUnload:function(){
+		clearInterval(this.interval1);
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiYuyueWorker/dating', {st: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				if(res.status==0){
+					app.alert(res.msg);
+					return;
+				}
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+					that.nowtime = res.nowtime
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+					that.updatemylocation(false);
+					clearInterval(that.interval1);
+					that.interval1 = setInterval(function(){
+						that.updatemylocation(true);
+						that.nowtime = that.nowtime + 10;
+					},10000)
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		updatemylocation:function(needload){
+			console.log('updatemylocation');
+			var that = this;
+			app.getLocation(function(res){
+				var longitude = res.longitude;
+				var latitude = res.latitude;
+				var datalist = that.datalist;
+				for(var i in datalist){
+					var thisdata = datalist[i];
+					var rs = that.getdistance(thisdata.longitude2,thisdata.latitude2,longitude,latitude,1);
+					thisdata.juli2 = rs.juli;
+					thisdata.juli2_unit = rs.unit;
+					thisdata.leftminute = parseInt((thisdata.yujitime - that.nowtime) / 60);
+					datalist[i] = thisdata;
+				}
+				that.datalist = datalist;
+				that.timestamp = parseInt((new Date().getTime())/1000);
+				app.get('ApiYuyueWorker/updatemylocation',{longitude:longitude,latitude:latitude,t:that.timestamp},function(){
+					//if(needload) that.getdata();
+				});
+			});
+		},
+		getdistance: function (lng1, lat1, lng2, lat2) {
+			if(!lat1 || !lng1 || !lat2 || !lng2) return '';
+			var rad1 = lat1 * Math.PI / 180.0;
+			var rad2 = lat2 * Math.PI / 180.0;
+			var a = rad1 - rad2;
+			var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+			var r = 6378137;
+			var juli = r * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(rad1) * Math.cos(rad2) * Math.pow(Math.sin(b / 2), 2)));
+			var unit = 'm';
+			if(juli> 1000){
+				juli = juli/1000;
+				unit = 'km';
+			}
+			juli = juli.toFixed(1);
+			return {juli:juli,unit:unit}
+		},
+    qiangdan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要接单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiYuyueWorker/qiangdan', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		daohang:function(e){
+			var that = this;
+			var index = e.currentTarget.dataset.index;
+			var datainfo = that.datalist[index];
+			uni.showActionSheet({
+        itemList: ['导航到商家', '导航到用户'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) {
+							var longitude = datainfo.longitude
+							var latitude = datainfo.latitude
+							var name = datainfo.binfo.name
+							var address = datainfo.binfo.address
+						}else{
+							var longitude = datainfo.longitude2
+							var latitude = datainfo.latitude2
+							var name = datainfo.orderinfo.address
+							var address = datainfo.orderinfo.address
+						}
+						uni.openLocation({
+							latitude:parseFloat(latitude),
+							longitude:parseFloat(longitude),
+							name:name,
+							address:address,
+							scale: 13,
+							success: function () {
+                console.log('success');
+							},
+							fail:function(res){
+								console.log(res);
+							}
+						})
+					}
+				}
+			});
+		},
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.getdata();
+    },
+    receiveMessage: function (data) {
+			var that = this;
+			if(data.type == 'peisong' || data.type == 'peisong_jiedan') {
+				that.getdata();
+			}
+			return false;
+		}
+  }
+};
+</script>
+<style>
+@import "./common.css";
+.container{ width:100%;display:flex;flex-direction:column}
+.search-container {width: 100%;height:100rpx;padding: 20rpx 23rpx 20rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#222;width: 100%;}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{flex:1;padding:0 20rpx}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.order-box .op{display:flex;justify-content:flex-end;align-items:center;width:100%; padding:20rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op .btn1{width:100%;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);;height:88rpx;line-height:88rpx;color:#fff;border-radius:10rpx;text-align:center;font-size:32rpx}
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/hexiao.vue b/activity/yuyue/hexiao.vue
new file mode 100644
index 0000000..ead44b7
--- /dev/null
+++ b/activity/yuyue/hexiao.vue
@@ -0,0 +1,254 @@
+<template>
+<view>
+<block v-if="isload">
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1">{{order.linkman}} {{order.tel}}</text>
+				<text class="t2" v-if="order.freight_type!=1 && order.freight_type!=3">地址：{{order.area}}{{order.address}}</text>
+				<text class="t2" v-if="order.freight_type==1" @tap="openLocation" :data-address="order.storeinfo.address" :data-latitude="order.storeinfo.latitude" :data-longitude="order.storeinfo.longitude">取货地点：{{order.storeinfo.name}} - {{order.storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+		
+			<view>
+				<image :src="order.propic"></image>
+			</view>
+			<view class="detail">
+				<text class="t1">{{order.proname}}</text>
+				<text class="t2">{{order.ggname}}</text>
+				<view class="t3"><text class="x1 flex1">￥{{order.product_price}}</text><text class="x2">×{{order.num}}</text></view>
+			</view>
+	
+		</view>
+		
+		<view class="orderinfo" v-if="(order.status==3 || order.status==2) && (order.freight_type==3 || order.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{order.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="order.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{order.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{order.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="order.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2">{{order.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{order.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{order.createtime}}</text>
+			</view>
+			<view class="item" v-if="order.status>0 && order.paytype!='货到付款' && order.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{order.paytime}}</text>
+			</view>
+			<view class="item" v-if="order.status>0 && order.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{order.paytype == '货到付款' ? codtxt : order.paytype}}</text>
+			</view>
+			<view class="item" v-if="order.status>1 && order.send_time">
+				<text class="t1">派单时间</text>
+				<text class="t2">{{order.send_time}}</text>
+			</view>
+			<view class="item" v-if="order.status==3 && order.collect_time">
+				<text class="t1">完成时间</text>
+				<text class="t2">{{order.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{order.product_price}}</text>
+			</view>
+			<view class="item" v-if="order.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{order.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="order.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{order.manjian_money}}</text>
+			</view>
+			<view class="item" v-if="order.freight_type==1 && order.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{order.freight_price}}</text>
+			</view>
+			<view class="item" v-if="order.freight_time">
+				<text class="t1">{{order.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{order.freight_time}}</text>
+			</view>
+			<view class="item" v-if="order.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{order.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="order.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{order.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{order.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="order.status==0">未付款</text>
+				<text class="t2" v-if="order.status==1">已付款</text>
+				<text class="t2" v-if="order.status==2">已派单</text>
+				<text class="t2" v-if="order.status==3">已完成</text>
+				<text class="t2" v-if="order.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="order.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="order.refund_status==1">审核中,¥{{order.refund_money}}</text>
+				<text class="t2 red" v-if="order.refund_status==2">已退款,¥{{order.refund_money}}</text>
+				<text class="t2 red" v-if="order.refund_status==3">已驳回,¥{{order.refund_money}}</text>
+			</view>
+			<view class="item" v-if="order.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{order.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="order.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{order.refund_checkremark}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{order.message ? order.message : '无'}}</text>
+			</view>
+			<view class="item" v-if="order.field1">
+				<text class="t1">{{order.field1data[0]}}</text>
+				<text class="t2 red">{{order.field1data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field2">
+				<text class="t1">{{order.field2data[0]}}</text>
+				<text class="t2 red">{{order.field2data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field3">
+				<text class="t1">{{order.field3data[0]}}</text>
+				<text class="t2 red">{{order.field3data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field4">
+				<text class="t1">{{order.field4data[0]}}</text>
+				<text class="t2 red">{{order.field4data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field5">
+				<text class="t1">{{order.field5data[0]}}</text>
+				<text class="t2 red">{{order.field5data[1]}}</text>
+			</view>
+		</view>
+	<view style="height:140rpx"></view>
+	<view class="btn-add" :style="{background:t('color1')}" @tap="hexiao">立即核销</view>
+</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		type:'',
+		order:{},
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+    getdata: function () {
+      var that = this;
+			that.loading = true;
+      app.post('ApiYuyue/hexiao',{type:that.type,co:that.opt.co}, function (res) {
+				that.loading = false;
+				that.order = res.order
+				that.loaded(); 
+      });
+    },
+		hexiao:function(){
+      var that = this;
+			app.confirm('确定要核销吗?',function(){
+				app.showLoading('核销中');
+				app.post('ApiYuyue/hexiao',{op:'confirm',type:that.type,co:that.opt.co}, function (res) {
+					app.showLoading(false);
+					if(res.status == 0){
+						app.alert(res.msg);return;
+					}
+				})
+			})
+		}
+  }
+};
+</script>
+<style>
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+.orderinfo .topitem{display:flex;padding:60rpx 40rpx;align-items:center;border-bottom:2px dashed #E5E5E5;position:relative}
+.orderinfo .topitem .f1{font-size:50rpx;font-weight:bold;}
+.orderinfo .topitem .f1 .t1{font-size:60rpx;}
+.orderinfo .topitem .f1 .t2{font-size:40rpx;}
+.orderinfo .topitem .f2{margin-left:40rpx}
+.orderinfo .topitem .f2 .t1{font-size:36rpx;color:#2B2B2B;font-weight:bold;height:50rpx;line-height:50rpx}
+.orderinfo .topitem .f2 .t2{font-size:24rpx;color:#999999;height:50rpx;line-height:50rpx}
+
+.btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/jdorderdetail.vue b/activity/yuyue/jdorderdetail.vue
new file mode 100644
index 0000000..1955244
--- /dev/null
+++ b/activity/yuyue/jdorderdetail.vue
@@ -0,0 +1,317 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+
+		<map v-if="psorder.status!=4" class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:worker.latitude,
+			longitude:worker.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_qishou.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+		<map v-else class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+
+		<view class="order-box">
+			<view class="head">
+				<view v-if="psorder.fwtype==1">
+					<view class="f1" v-if="psorder.status==3"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已完成</view>
+					<view class="f1" v-if="psorder.status==1"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/> {{orderinfo.yydate}}<text class="t1">预计上门时间</text> </view>
+					<view class="f1" v-if="psorder.status==2"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1" style="margin-left:10rpx">服务中</text></view>
+				</view>
+				<view v-else-if="psorder.fwtype==2">
+						<view class="f1" v-if="psorder.status==3"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已完成</view>
+						<view class="f1" v-else-if="psorder.status==1"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>期望上门时间<text class="t1">{{orderinfo.yydate}}</text> </view>
+						<view class="f1" v-else-if="psorder.status==2"  ><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已到达，服务中</view>
+				</view>
+				<view class="flex1"></view>
+				<view class="f2"><text class="t1">{{psorder.ticheng}}</text>元</view>
+			</view>
+			<view class="content" style="border-bottom:0">
+				<view class="f1">
+					<view class="t1"><text class="x1">{{psorder.juli}}</text><text class="x2">{{psorder.juli_unit}}</text></view>
+					<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+					<view class="t3"><text class="x1">{{psorder.juli2}}</text><text class="x2">{{psorder.juli2_unit}}</text></view>
+				</view>
+				<view class="f2">
+					<view class="t1">{{binfo.name}}</view>
+					<view class="t2">{{binfo.address}}</view>
+					<view class="t3">{{orderinfo.address}}</view>
+						<view class="t2">{{orderinfo.area}}</view>
+				</view>
+				<view class="f3" @tap.stop="daohang"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">商品清单({{orderinfo.procount}})</view>
+			<view v-for="(item, idx) in prolist" :key="idx" class="item">
+				<text class="t1 flex1">{{item.name}} {{item.ggname}}</text>
+				<text class="t2 flex0">￥{{item.sell_price}} ×{{item.num}} </text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="psorder.status!=0">
+			<view class="box-title">服务信息</view>
+			<view class="item">
+				<text class="t1">预约时间</text>
+				<text class="t2">{{orderinfo.yydate}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">接单时间</text>
+				<text class="t2">{{date(psorder.starttime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.daodiantime">
+				<text class="t1">到店时间</text>
+				<text class="t2">{{date(psorder.daodiantime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.endtime">
+				<text class="t1">完成时间</text>
+				<text class="t2">{{date(psorder.endtime)}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{date(orderinfo.createtime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{date(orderinfo.paytime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{orderinfo.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{orderinfo.product_price}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{orderinfo.totalprice}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{orderinfo.message ? orderinfo.message : '无'}}</text>
+			</view>
+		</view>
+		<view style="width:100%;height:120rpx"></view>
+		<view class="bottom" v-if="psorder.status!=4">
+			<view class="f1" v-if="psorder.status!=0" @tap="call" :data-tel="orderinfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel1.png'" class="img"/>联系顾客</view>
+			<view class="f2" v-if="psorder.status!=0" @tap="call" :data-tel="binfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel2.png'" class="img"/>联系商家</view>
+			<view class="btn1" @tap="qiangdan" :data-id="psorder.id" v-if="psorder.status==0">立即抢单</view>
+			<block v-if="psorder.fwtype==1">
+				<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="2" v-if="psorder.status==1">顾客已到店</view>
+				<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="3" v-if="psorder.status==2">我已完成</view>
+			</block>
+			<block v-if="psorder.fwtype==2">
+				<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="2" v-if="psorder.status==1">我已到达</view>
+				<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="3" v-if="psorder.status==2">我已完成</view>				<view class="btn1" @tap="setst" :data-id="psorder.id" data-st="4" v-if="psorder.status==3">我已完成</view>
+			</block>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		orderinfo: {},
+		prolist: [],
+		worker:{},
+		binfo: {},
+		psorder: {},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			app.get('ApiYuyueWorker/orderdetail', {id: that.opt.id}, function (res) {
+				that.orderinfo = res.orderinfo;
+				that.prolist = res.prolist;
+				that.binfo = res.binfo;
+				that.psorder = res.psorder;
+				that.worker = res.worker;
+				that.loaded();
+			});
+		},
+
+    qiangdan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要接单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiYuyueWorker/qiangdan', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+			if(st == 2){
+				var tips = '确定改为已到店吗?';
+			}if(st == 3){
+				var tips = '确定改为已完成吗?';
+			}
+      app.confirm(tips, function () {
+				app.showLoading('提交中');
+        app.post('ApiYuyueWorker/setst', {id: id,st:st}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+
+		daohang:function(e){
+			var that = this;
+			var datainfo = that.psorder;
+			var binfo = that.binfo
+			var orderinfo = that.orderinfo
+			uni.showActionSheet({
+        itemList: ['导航到商家', '导航到用户'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) {
+							var longitude = datainfo.longitude
+							var latitude = datainfo.latitude
+							var name = binfo.name
+							var address = binfo.address
+						}else{
+							var longitude = datainfo.longitude2
+							var latitude = datainfo.latitude2
+							var name = orderinfo.address
+							var address = orderinfo.address
+						}
+						console.log(longitude);
+						console.log(latitude);
+						console.log(address);
+						uni.openLocation({
+						 latitude:parseFloat(latitude),
+						 longitude:parseFloat(longitude),
+						 name:name,
+						 address:address,
+						 scale: 13
+						})
+					}
+				}
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		}
+  }
+}
+</script>
+<style>
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/jdorderlist.vue b/activity/yuyue/jdorderlist.vue
new file mode 100644
index 0000000..0d169d9
--- /dev/null
+++ b/activity/yuyue/jdorderlist.vue
@@ -0,0 +1,341 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view>
+			<view class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<input class="search-text" placeholder="搜索商家" placeholder-style="color:#aaa;font-size:24rpx" @confirm="searchConfirm"/>
+				</view>
+			</view>
+			<block v-for="(item, index) in datalist" :key="item.id">
+			<view class="order-box" @tap="goto" :data-url="'jdorderdetail?id=' + item.id">
+				<view class="head">
+					<view v-if="item.fwtype==1">
+						<view class="f1" v-if="item.status==3"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已完成</view>
+						<view class="f1" v-if="item.status==1"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">等待客户上门</text> </view>
+						<view class="f1" v-if="item.status==2"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1" style="margin-left:10rpx">服务中</text></view>
+					</view>
+					<view v-else-if="item.fwtype==2">
+						<view class="f1" v-if="item.status==3"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已完成</view>
+						<view class="f1" v-else-if="item.status==1"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>期望上门时间<text class="t1">{{item.orderinfo.yydate}}</text> </view>
+						<view class="f1" v-else-if="item.status==2"  ><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已到达，服务中</view>
+					</view>
+					<view class="flex1"></view>
+					<view class="f2"><text class="t1">{{item.ticheng}}</text>元</view>
+				</view>
+				<view class="content">
+					<view class="f1">
+						<view class="t1"><text class="x1">{{item.juli}}</text><text class="x2">{{item.juli_unit}}</text></view>
+						<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+						<view class="t3"><text class="x1">{{item.juli2}}</text><text class="x2">{{item.juli2_unit}}</text></view>
+					</view>
+					<view class="f2">
+						<view class="t1">{{item.binfo.name}}</view>
+						<view class="t2">{{item.binfo.address}}</view>
+						<view class="t3">{{item.orderinfo.address}}</view>
+						<view class="t2">{{item.orderinfo.area}}</view>
+					</view>
+					<view class="f3" @tap.stop="daohang" :data-index="index"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+				</view>
+				<view v-if="item.fwtype==1" class="op">
+					<view class="t1" v-if="item.status==1">已接单，待顾客上门</view>
+					<view class="t1" v-if="item.status==2">顾客已到达</view>
+					<view class="t1" v-if="item.status==3">已完成</view>
+					<view class="flex1"></view>
+					<view class="btn1" @tap.stop="setst" :data-id="item.id" data-st="2" v-if="item.status==1">顾客已到达</view>
+					<view class="btn1" @tap.stop="setst" :data-id="item.id" data-st="3" v-if="item.status==2">我已完成</view>
+				</view>
+				<view v-else-if="item.fwtype==2" class="op">
+					<view class="t1" v-if="item.status==1">已接单，等待上门</view>
+					<view class="t1" v-if="item.status==2">已到达，共用时{{item.useminute}}分钟</view>
+					<view class="t1" v-if="item.status==3">已完成</view>
+					<view class="flex1"></view>
+					<view class="btn1" @tap.stop="setst" :data-id="item.id" data-st="2" v-if="item.status==1">我已到达</view>
+					<view class="btn1" @tap.stop="setst" :data-id="item.id" data-st="3" v-if="item.status==2">我已完成</view>
+				</view>
+			
+			</view>
+			</block>
+		
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+		</view>
+		<!-- <view style="width:100%;height:120rpx"></view> -->
+		<!-- <view class="bottom">
+			<view class="my">
+				<image :src="event_rul +'/static/img/static/img/my.png'" class="img"/>
+				<text>我的</text>
+			</view>
+			<view class="btn1" @tap="setpsst" data-st="1" v-if="psuser.status==0">暂停接单中</view>
+			<view class="btn2" :style="{background:t('color1')}" @tap="setpsst" data-st="0" v-if="psuser.status==1">开启接单中</view>
+		</view> -->
+		
+		<view class="tabbar">
+			<view class="tabbar-bot"></view>
+			<view class="tabbar-bar" style="background-color:#ffffff">
+				<view @tap="goto" data-url="dating" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/home.png'"></image>
+					</view>
+					<view class="tabbar-text">大厅</view>
+				</view>
+				<view @tap="goto" data-url="jdorderlist" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/order'+(st!=3?'2':'')+'.png'"></image>
+					</view>
+					<view class="tabbar-text" :class="st!=3?'active':''">订单</view>
+				</view>
+				<view @tap="goto" data-url="jdorderlist?st=3" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/orderwc'+(st==3?'2':'')+'.png'"></image>
+					</view>
+					<view class="tabbar-text" :class="st==3?'active':''">已完成</view>
+				</view>
+				<view @tap="goto" data-url="my" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/my.png'"></image>
+					</view>
+					<view class="tabbar-text">我的</view>
+				</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<view style="display:none">{{timestamp}}</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: '11',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata: false,
+		keyword:'',
+		interval1:null,
+		timestamp:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || '11';
+		this.getdata();
+  },
+	onUnload:function(){
+		clearInterval(this.interval1);
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiYuyueWorker/orderlist', {st: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				if(res.status==0){
+					app.alert(res.msg);
+					return;
+				}
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+					that.nowtime = res.nowtime
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+					that.updatemylocation();
+					clearInterval(that.interval1);
+					that.interval1 = setInterval(function(){
+						that.updatemylocation(true);
+						that.nowtime = that.nowtime + 10;
+					},10000)
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		updatemylocation:function(){
+			var that = this;
+			console.log('updatemylocation');
+			app.getLocation(function(res){
+				var longitude = res.longitude;
+				var latitude = res.latitude;
+				var datalist = that.datalist;
+				for(var i in datalist){
+					var thisdata = datalist[i];
+					var rs = that.getdistance(thisdata.longitude2,thisdata.latitude2,longitude,latitude,1);
+					thisdata.juli2 = rs.juli;
+					thisdata.juli2_unit = rs.unit;
+					thisdata.leftminute = parseInt((thisdata.yujitime - that.nowtime) / 60);
+					datalist[i] = thisdata;
+				}
+				that.datalist = datalist;
+				that.timestamp = parseInt((new Date().getTime())/1000);
+				app.get('ApiPeisong/updatemylocation',{longitude:longitude,latitude:latitude,t:that.timestamp},function(){
+				//	if(needload) that.getdata();
+				});
+			});
+		},
+		getdistance: function (lng1, lat1, lng2, lat2) {
+			if(!lat1 || !lng1 || !lat2 || !lng2) return '';
+			var rad1 = lat1 * Math.PI / 180.0;
+			var rad2 = lat2 * Math.PI / 180.0;
+			var a = rad1 - rad2;
+			var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+			var r = 6378137;
+			var juli = r * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(rad1) * Math.cos(rad2) * Math.pow(Math.sin(b / 2), 2)));
+			var unit = 'm';
+			if(juli> 1000){
+				juli = juli/1000;
+				unit = 'km';
+			}
+			juli = juli.toFixed(1);
+			return {juli:juli,unit:unit}
+		},
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+			if(st == 2){
+				var tips = '确定改为已到达吗?';
+			}if(st == 3){
+				var tips = '确定改为已完成吗?';
+			}
+      app.confirm(tips, function () {
+				app.showLoading('提交中');
+        app.post('ApiYuyueWorker/setst', {id: id,st:st}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		daohang:function(e){
+			var that = this;
+			var index = e.currentTarget.dataset.index;
+			var datainfo = that.datalist[index];
+			uni.showActionSheet({
+        itemList: ['导航到商家', '导航到用户'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) {
+							var longitude = datainfo.longitude
+							var latitude = datainfo.latitude
+							var name = datainfo.binfo.name
+							var address = datainfo.binfo.address
+						}else{
+							var longitude = datainfo.longitude2
+							var latitude = datainfo.latitude2
+							var name = datainfo.orderinfo.address
+							var address = datainfo.orderinfo.address
+						}
+						uni.openLocation({
+							latitude:parseFloat(latitude),
+							longitude:parseFloat(longitude),
+							name:name,
+							address:address,
+							scale: 13,
+							success: function () {
+                console.log('success');
+							},
+							fail:function(res){
+								console.log(res);
+							}
+						})
+					}
+				}
+			});
+		},
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.getdata();
+    },
+  }
+};
+</script>
+<style>
+@import "./common.css";
+.container{ width:100%;display:flex;flex-direction:column}
+.search-container {width: 100%;height:100rpx;padding: 20rpx 23rpx 20rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#222;width: 100%;}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{flex:1;padding:0 20rpx}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.order-box .op{display:flex;justify-content:flex-end;align-items:center;width:100%; padding:20rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op .t1{color:#06A051;font-weight:bold}
+.order-box .op .btn1{width:200rpx;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);;height:88rpx;line-height:88rpx;color:#fff;border-radius:10rpx;text-align:center;font-size:32rpx}
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/login.vue b/activity/yuyue/login.vue
new file mode 100644
index 0000000..861b691
--- /dev/null
+++ b/activity/yuyue/login.vue
@@ -0,0 +1,116 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="title">服务人员登录</view>
+		<view class="loginform">
+			<view class="form-item">
+				<image :src="event_rul + '/static/img/static/img/reg-tel.png'" class="img"/>
+				<input type="text" class="input" placeholder="请输入登录账号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="username" value=""/>
+			</view>
+			<view class="form-item">
+				<image :src="event_rul + '/static/img/static/img/reg-pwd.png'" class="img"/>
+				<input type="text" class="input" placeholder="请输入密码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="password" value="" :password="true"/>
+			</view>
+			<view class="form-item">
+					<image :src="event_rul + '/static/img/static/img/reg-code.png'" class="img"/>
+					<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="captcha" value=""/>
+					<image @tap="regetcaptcha" :src="pre_url+'/?s=/ApiIndex/captcha&aid='+aid+'&session_id='+session_id+'&t='+randt" style="width:240rpx;height:80rpx"/>
+				</view>
+			<button class="form-btn" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" form-type="submit">登录</button>
+		</view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+		aid:app.globalData.aid,
+		session_id:app.globalData.session_id,
+		captcha_src:'',
+		randt:'',
+
+		event_rul: app.globalData.event_url,
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get("ApiYuyueWorker/login", {}, function (res) {
+				that.loading = false;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+			var that = this;
+      var formdata = e.detail.value;
+      if (formdata.username == ''){
+        app.alert('请输入账号');
+        return;
+      }
+			if (formdata.password == '') {
+				app.alert('请输入密码');
+				return;
+			}
+			if (formdata.captcha == '') {
+				app.alert('请输入验证码');
+				return;
+			}
+			
+			app.showLoading('提交中');
+      app.post("ApiYuyueWorker/login", {username:formdata.username,password:formdata.password,captcha:formdata.captcha}, function (res) {
+				app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('my');
+          }, 1000);
+        } else {
+          app.error(res.msg);
+					if(res.status==2){
+						that.randt = that.randt+'1';
+					}
+        }
+      });
+    },
+		regetcaptcha:function(){
+			this.randt = this.randt+'1';
+		}
+  }
+};
+</script>
+
+<style>
+page{background:#ffffff}
+.container{width:100%;}
+.title{margin:70rpx 50rpx 50rpx 40rpx;height:60rpx;line-height:60rpx;font-size: 48rpx;font-weight: bold;color: #000000;}
+.loginform{ width:100%;padding:0 50rpx;border-radius:5px;background: #FFF;}
+.loginform .form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:88rpx;line-height:88rpx;border-bottom:1px solid #F0F3F6;margin-top:20rpx}
+.loginform .form-item:last-child{border:0}
+.loginform .form-item .img{width:44rpx;height:44rpx;margin-right:30rpx}
+.loginform .form-item .input{flex:1;color: #000;}
+.loginform .form-item .code{font-size:30rpx}
+.loginform .form-btn{margin-top:60rpx;width:100%;height:96rpx;line-height:96rpx;color:#fff;font-size:30rpx;border-radius: 48rpx;}
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/logistics.vue b/activity/yuyue/logistics.vue
new file mode 100644
index 0000000..2e33220
--- /dev/null
+++ b/activity/yuyue/logistics.vue
@@ -0,0 +1,259 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<map v-if="worker_order.status!=0 && worker_order.status!=4" class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul + '/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul + '/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:worker.latitude,
+			longitude:worker.longitude,
+			iconPath: event_rul + '/static/img/static/peisong/marker_qishou.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+		<map v-else class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul + '/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul + '/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+
+		<view class="order-box">
+			<view class="head">
+				<view class="f1" v-if="worker_order.status==3"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已完成</view>
+				<view class="f1" v-if="worker_order.status==1"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已接单</view>
+				<view class="f1" v-if="worker_order.status==2"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>服务中</view>
+				<view class="flex1"></view>
+			</view>
+			<view class="content" style="border-bottom:0">
+				<view class="f1">
+					<view class="t1"><text class="x1">{{worker_order.juli}}</text><text class="x2">{{worker_order.juli_unit}}</text></view>
+					<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+					<view class="t3"><text class="x1">{{worker_order.juli2}}</text><text class="x2">{{worker_order.juli2_unit}}</text></view>
+				</view>
+				<view class="f2">
+					<view class="t1">{{binfo.name}}</view>
+					<view class="t2">{{binfo.address}}</view>
+					<view class="t3">{{orderinfo.address}}</view>
+				</view>
+				<view class="f3" @tap.stop="daohang"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img'"/></view>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">购买清单({{orderinfo.procount}})</view>
+			<view v-for="(item, idx) in prolist" :key="idx" class="item">
+				<text class="t1 flex1">{{item.name}} {{item.ggname}}</text>
+				<text class="t2 flex0">￥{{item.sell_price}} ×{{item.num}} </text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="worker_order.status!=0">
+			<view class="box-title">服务信息</view>
+			<view class="item" v-if="worker.realname">
+				<text class="t1">服务人员</text>
+				<text class="t2"><text style="font-weight:bold">{{worker.realname}}</text>({{worker.tel}})</text>
+			</view>
+			<view class="item">
+				<text class="t1">接单时间</text>
+				<text class="t2">{{date(worker_order.starttime)}}</text>
+			</view>
+			<view class="item" v-if="worker_order.daodiantime">
+				<text class="t1">到达时间</text>
+				<text class="t2">{{date(worker_order.daodiantime)}}</text>
+			</view>
+			<view class="item" v-if="worker_order.endtime">
+				<text class="t1">完成时间</text>
+				<text class="t2">{{date(worker_order.endtime)}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{date(orderinfo.createtime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{date(orderinfo.paytime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{orderinfo.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{orderinfo.product_price}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{orderinfo.totalprice}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{orderinfo.message ? orderinfo.message : '无'}}</text>
+			</view>
+		</view>
+		<view style="width:100%;height:120rpx"></view>
+		<view class="bottom">
+			<view class="f1" v-if="worker_order.status!=0 && worker.tel" @tap="call" :data-tel="worker.tel"><image :src="event_rul +'/static/img/static/peisong/tel1.png'" class="img"/>联系服务人员</view>
+			<view class="f2" v-if="worker_order.status!=0" @tap="call" :data-tel="binfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel2.png'" class="img"/>联系商家</view>
+			<view class="btn1" @tap="goto" :data-url="'commentps?id='+worker_order.id" v-if="worker_order.worker_id>0 && worker_order.status==3">评价服务人员</view>
+		</view>
+	
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		nodata:false,
+		express_com: '',
+		express_no: '',
+		datalist: [],
+
+		orderinfo: {},
+		prolist: [],
+		binfo: {},
+		worker: {},
+		worker_order: {},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.express_no = that.opt.express_no;
+			that.loading = true;
+			app.get('ApiYuyue/logistics', { express_no: that.express_no}, function (res) {
+				that.loading = false;
+				that.orderinfo = res.orderinfo;
+				that.prolist = res.prolist;
+				that.binfo = res.binfo;
+				that.worker = res.worker;
+				that.worker_order = res.worker_order;
+				that.set = res.set;
+				that.loaded();
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		}
+  }
+}
+</script>
+<style>
+.expressinfo .head { width:100%;background: #fff; margin:20rpx 0;padding: 20rpx 20rpx;display:flex;align-items:center}
+.expressinfo .head .f1{ width:120rpx;height:120rpx;margin-right:20rpx}
+.expressinfo .head .f1 image{width:100%;height:100%}
+.expressinfo .head .f2{display:flex;flex-direction:column;flex:auto;font-size:30rpx;color:#999999}
+.expressinfo .head .f2 .t1{margin-bottom:8rpx}
+.expressinfo .content{ width: 100%;  background: #fff;display:flex;flex-direction:column;color: #979797;padding:20rpx 40rpx}
+.expressinfo .content .on{color: #23aa5e;}
+.expressinfo .content .item{display:flex;width: 96%;  margin: 0 2%;border-left: 1px #dadada solid;padding:10rpx 0}
+.expressinfo .content .item .f1{ width:40rpx;flex-shrink:0;position:relative}
+.expressinfo .content image{width: 30rpx; height: 30rpx; position: absolute; left: -16rpx; top: 22rpx;}
+/*.content .on image{ top:-1rpx}*/
+.expressinfo .content .item .f1 image{ width: 30rpx; height: 30rpx;}
+
+.expressinfo .content .item .f2{display:flex;flex-direction:column;flex:auto;}
+.expressinfo .content .item .f2 .t1{font-size: 30rpx;}
+.expressinfo .content .item .f2 .t1{font-size: 26rpx;}
+
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;align-items:center;height:100rpx;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/moneylog.vue b/activity/yuyue/moneylog.vue
new file mode 100644
index 0000000..b4bae85
--- /dev/null
+++ b/activity/yuyue/moneylog.vue
@@ -0,0 +1,140 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['余额明细','提现记录']" :itemst="['0','2']" :st="st" :isfixed="true" @changetab="changetab" color1="#06A051"></dd-tab>
+		<view class="content">
+			<block v-if="st==0">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+						<text class="t3">变更后余额: {{item.after}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t2" v-else>{{item.money}}</text>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==2">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			canwithdraw:false,
+			textset:{},
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+			nodata:false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata(true);
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiYuyueWorker/moneylog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.textset = app.globalData.textset;
+					that.canwithdraw = res.canwithdraw;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx;display:flex;flex-direction:column}
+.content{ width:94%;margin:0 3% 20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:20rpx 20rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/my.vue b/activity/yuyue/my.vue
new file mode 100644
index 0000000..dbe52d8
--- /dev/null
+++ b/activity/yuyue/my.vue
@@ -0,0 +1,223 @@
+<template>
+<view>
+	<block v-if="isload">
+	<view class="banner">
+			<image :src="worker.headimg" background-size="cover"/>
+			<view class="info">
+				 <text class="nickname">{{worker.realname}}</text>
+				 <text>{{worker.tel}}</text>
+			</view>
+	</view>
+	<view class="contentdata">
+		<view class="custom_field">
+			<view class='item' data-url='jdorderlist?st=3' @tap='goto'>
+				<text class="t1">累计服务</text>
+				<text class='t2'>{{worker.totalnum}}次</text>
+			</view>
+			<view class='item'>
+				<text class="t1">总收入</text>
+				<text class='t2'>{{worker.totalmoney}}元</text>
+			</view>
+			<view class='item'>
+				<text class="t1">好评率</text>
+				<text class='t2'>{{worker.comment_haopercent}}%</text>
+			</view>
+		</view>
+
+		<view class="listcontent">
+			<view class="list">
+				<view class="item" @tap="goto" data-url="withdraw">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-qianbao.png'"></image></view>
+					<view class="f2">我的钱包</view>
+					<text class="f3">余额：{{worker.money}}</text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+			<view class="list">
+				<view class="item" @tap="goto" data-url="moneylog">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-zhangdan.png'"></image></view>
+					<view class="f2">账单明细</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+			<!-- <view class="list">
+				<view class="item" @tap="goto" data-url="moneylog">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-order.png'"></image></view>
+					<view class="f2">配送记录</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view> -->
+			<view class="list">
+				<view class="item">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-jiedan.png'"></image></view>
+					<view class="f2">接单状态</view>
+					<view class="f3"><switch value="1" :checked="worker.status==1?true:false" @change="switchchange"></switch></view>
+				</view>
+			</view>
+			<view class="list">
+				<view class="item" @tap="goto" data-url="setinfo">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-shenfen.png'"></image></view>
+					<view class="f2">提现设置</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+			<view class="list">
+				<view class="item" @tap="goto" data-url="setpwd">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-shenfen.png'"></image></view>
+					<view class="f2">修改密码</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+			<view class="list">
+				<view class="item" @tap="goto" data-url="login">
+					<view class="f1"><image :src="event_rul +'/static/img/static/peisong/ico-logout.png'"></image></view>
+					<view class="f2">退出登录</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<view class="tabbar">
+		<view class="tabbar-bot"></view>
+		<view class="tabbar-bar" style="background-color:#ffffff">
+			<view @tap="goto" data-url="dating" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/home.png'"></image>
+				</view>
+				<view class="tabbar-text">大厅</view>
+			</view>
+			<view @tap="goto" data-url="jdorderlist" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/order.png'"></image>
+				</view>
+				<view class="tabbar-text">订单</view>
+			</view>
+			<view @tap="goto" data-url="jdorderlist?st=3" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/orderwc.png'"></image>
+				</view>
+				<view class="tabbar-text">已完成</view>
+			</view>
+			<view @tap="goto" data-url="my" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/peisong/my2.png'"></image>
+				</view>
+				<view class="tabbar-text active">我的</view>
+			</view>
+		</view>
+	</view>
+	</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+			pre_url:app.globalData.pre_url,
+			set:{},
+			worker:{},
+			checked:'',
+			
+			event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			app.get('ApiYuyueWorker/my', {}, function (res) {
+				that.worker = res.worker;
+				that.loaded();
+			});
+		},
+    switchchange: function (e) {
+      console.log(e);
+      var value = e.detail.value ? 1 : 0;
+      app.post('ApiYuyueWorker/setpsst', {st: value}, function (data) {});
+    },
+    saoyisao: function (d) {
+      var that = this;
+			if(app.globalData.platform == 'h5'){
+				app.alert('请使用微信扫一扫功能扫码核销');return;
+			}else if(app.globalData.platform == 'mp'){
+				var jweixin = require('jweixin-module');
+				jweixin.ready(function () {   //需在用户可能点击分享按钮前就先调用
+					jweixin.scanQRCode({
+						needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+						scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+						success: function (res) {
+							var content = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+							var params = content.split('?')[1];
+							app.goto('/admin/hexiao/hexiao?'+params);
+							//if(content.length == 18 && (/^\d+$/.test(content))){ //是十八位数字 付款码
+							//	location.href = "{:url('shoukuan')}/aid/{$aid}/auth_code/"+content
+							//}else{
+							//	location.href = content;
+							//}
+						}
+					});
+				});
+			}else{
+				uni.scanCode({
+					success: function (res) {
+						console.log(res);
+						var content = res.result;
+						var params = content.split('?')[1];
+						app.goto('/admin/hexiao/hexiao?'+params);
+					}
+				});
+			}
+    }
+  }
+};
+</script>
+<style>
+@import "./common.css";
+.banner{ display:flex;width:100%;height:322rpx;padding:80rpx 32rpx 40rpx 32rpx;color:#fff;position:relative;
+background: linear-gradient(-45deg, #06A051 0%, #03B269 100%);}
+.banner image{ width:120rpx;height:120rpx;border-radius:50%;margin-right:20rpx}
+.banner .info{display:flex;flex:auto;flex-direction:column;padding-top:10rpx}
+.banner .info .nickname{font-size:32rpx;font-weight:bold;padding-bottom:12rpx}
+.banner .set{ width:70rpx;height:100rpx;line-height:100rpx;font-size:40rpx;text-align:center}
+.banner .set image{width:50rpx;height:50rpx;border-radius:0}
+
+.contentdata{display:flex;flex-direction:column;width:100%;padding:0 30rpx;margin-top:-100rpx;position:relative;margin-bottom:20rpx}
+
+.custom_field{display:flex;width:100%;align-items:center;padding:30rpx 8rpx;background:#fff;border-radius:16rpx}
+.custom_field .item{flex:1;display:flex;flex-direction:column;justify-content:center;align-items:center}
+.custom_field .item .t1{color:#666;font-size:26rpx;margin-top:10rpx}
+.custom_field .item .t2{color:#111;font-weight:bold;font-size:36rpx;margin-top:20rpx}
+
+.score{ display:flex;width:100%;align-items:center;padding:10rpx 20rpx;background:#fff;border-top:1px dotted #eee}
+.score .f1 .t2{color:#ff3300}
+
+.list{ width: 100%;background: #fff;margin-top:20rpx;padding:0 20rpx;font-size:30rpx;margin-bottom:20rpx;border-radius:16rpx}
+.list .item{ height:100rpx;display:flex;align-items:center;border-bottom:1px solid #eee}
+.list .item:last-child{border-bottom:0;margin-bottom:20rpx}
+.list .f1{width:50rpx;height:50rpx;line-height:50rpx;display:flex;align-items:center}
+.list .f1 image{ width:44rpx;height:44rpx;}
+.list .f1 span{ width:40rpx;height:40rpx;font-size:40rpx}
+.list .f2{color:#222;font-weight:bold;margin-left:10rpx}
+.list .f3{ color:#06A051;font-size:26rpx;text-align:right;flex:1}
+.list .f4{ width: 40rpx; height: 40rpx;}
+
+switch{transform:scale(.7);}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/orderdetail.vue b/activity/yuyue/orderdetail.vue
new file mode 100644
index 0000000..fbb65d5
--- /dev/null
+++ b/activity/yuyue/orderdetail.vue
@@ -0,0 +1,444 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop flex" :style="'background:url('+pre_url+'/static/img/orderbg.png);background-size:100%'">
+			<view class="f1 " v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>				
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.refund_status==0">
+				<block v-if="!detail.worker_id">
+					<view class="t2">我们会尽快为您派单</view>
+				</block>
+				<block v-else>
+					<view class="t2">订单已接单</view>
+				</block>
+			</view>
+			
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单服务中</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+			<view class="orderx"><image :src="event_rul + '/static/img/static/img/orderx.png'"></view>
+			
+		</view>
+		
+		<view class="orderinfo orderinfotop">
+			<view class="title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">预约时间</text>
+				<text class="t2">{{detail.yy_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+		
+		<!-- <view class="btitle flex-y-center" v-if="detail.bid>0" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;"></image>
+			<view class="flex1" decode="true" space="true" style="padding-left:16rpx">{{detail.binfo.name}}</view>
+		</view> -->
+		<view class="product">
+			<view class="title">服务信息</view>
+			<view class="content">
+				<view @tap="goto" :data-url="'product?id=' + prolist.proid">
+					<image :src="prolist.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{prolist.proname}}</text>
+					<text class="t2">{{prolist.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{prolist.product_price}}</text><text class="" style="color: #939393;">×{{prolist.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && prolist.iscomment==0" @tap.stop="goto" :data-url="'comment?oid=' + prolist.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && prolist.iscomment==1" @tap.stop="goto" :data-url="'comment?oid=' + prolist.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+
+		<view class="orderinfo">
+
+			<view class="item">
+				<text class="t1">应付金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.leveldk_money > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.manjian_money > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.coupon_money > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+	
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">服务中</text>
+				<text class="t2" v-if="detail.status==3">已完成</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+				<text class="" v-if="detail.refundCount" style="margin-left: 8rpx;">有退款({{detail.refundCount}})</text>
+			</view>
+			<view class="item" v-if="detail.refundingMoneyTotal>0">
+				<text class="t1">退款中</text>
+				<text class="t2 red" @tap="goto" :data-url="'refundlist?orderid='+ detail.id">¥{{detail.refundingMoneyTotal}}</text>
+				<text class="t3 iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+			</view>
+			<view class="item" v-if="detail.refundedMoneyTotal>0">
+				<text class="t1">已退款</text>
+				<text class="t2 red" @tap="goto" :data-url="'refundlist?orderid='+ detail.id">¥{{detail.refundedMoneyTotal}}</text>
+				<text class="t3 iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回</text>
+			</view>
+			
+			<view class="item" v-if="detail.balance_price>0">
+				<text class="t1">尾款</text>
+				<text class="t2 red">¥{{detail.balance_price}}</text>
+			</view>
+			<view class="item" v-if="detail.balance_price>0">
+				<text class="t1">尾款状态</text>
+				<text class="t2" v-if="detail.balance_pay_status==1">已支付</text>
+				<text class="t2" v-if="detail.balance_pay_status==0">未支付</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytypeid!='4' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.paytypeid">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytypeid == '4' ? codtxt : detail.paytype}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">派单时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">完成时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="title">顾客信息</view>
+			<view class="item">
+				<text class="t1">姓名</text>
+				<text class="t2">{{detail.linkman}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">手机号</text>
+				<text class="t2">{{detail.tel}}</text>
+			</view>
+			<view class="item" v-if="detail.fwtype==2">
+				<text class="t1">上门地址</text>
+				<text class="t2">{{detail.address}}</text>
+			</view>
+		</view>
+		
+			
+		
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<block v-if="detail.isworkorder==1">
+					<view class="btn2" @tap="goto" :data-url="'/activity/workorder/index?type=2&id='+detail.id" :data-id="detail.id">发起工单</view>
+			</block>
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" v-if="detail.paytypeid != 5" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+				<view class="btn1" v-if="detail.paytypeid == 5" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/transfer?id=' + detail.payorderid">上传付款凭证</view>
+			</block>
+			<block v-if="detail.status==1">
+				<block v-if="detail.paytypeid!='4' && detail.refund_status==0 || detail.refund_status==3">
+					<view class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id">退款</view>
+				</block>
+				
+			</block>
+			<block v-if="detail.status==2 || detail.status==3 || detail.worker_orderid>0">
+				<view class="btn2" @tap="logistics" :data-express_com="detail.express_com" :data-express_no="detail.worker_orderid"  >查看进度</view>
+			</block>
+			<!--<block v-if="([1,2,3]).includes(detail.status) && invoice">
+				<view class="btn2" @tap="goto" :data-url="'invoice?type=yuyue&orderid=' + detail.id">发票</view>
+			</block>0-->
+			<block v-if="detail.status==2">
+				<view class="btn2" v-if="detail.paytypeid=='4'">{{codtxt}}</view>
+				<view v-if="detail.balance_pay_status == 0 && detail.balance_price > 0" class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + detail.balance_pay_orderid">支付尾款</view>
+			</block>
+
+			<block v-if="detail.status==3 || detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+			<block v-if="detail.bid>0 && detail.status==3">
+				<view v-if="iscommentdp==1" class="btn2" @tap="goto" :data-url="'commentdp?orderid=' + detail.id">查看评价</view>
+			</block>
+		</view>
+		
+	
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		prodata: '',
+		djs: '',
+		iscommentdp: "",
+		detail: "",
+		payorder:{},
+		prolist: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		pay_transfer_info:{},
+		invoice:0,
+		selectExpressShow:false,
+		express_content:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiYuyue/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.iscommentdp = res.iscommentdp,
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				that.pay_transfer_info =  res.pay_transfer_info;
+				that.payorder = res.payorder;
+				that.invoice = res.invoice;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiYuyue/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiYuyue/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定已完成服务吗?', function () {
+				app.showLoading('确认中');
+        app.post('ApiYuyue/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openLocation:function(e){
+			var latitude = parseFloat(e.currentTarget.dataset.latitude);
+			var longitude = parseFloat(e.currentTarget.dataset.longitude);
+			var address = e.currentTarget.dataset.address;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		logistics:function(e){
+			var express_com = e.currentTarget.dataset.express_com
+			var express_no = e.currentTarget.dataset.express_no
+			app.goto('/activity/yuyue/logistics?express_no=' + express_no);
+		},
+		hideSelectExpressDialog:function(){
+			this.$refs.dialogSelectExpress.close();
+		}
+  }
+};
+</script>
+<style>
+	.text-min { font-size: 24rpx; color: #999;}
+.ordertop{width:100%;height:452rpx;padding:50rpx 0 0 70rpx; justify-content: space-between;}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:40rpx;height:60rpx;line-height:60rpx;}
+.ordertop .f1 .t2{font-size:26rpx; margin-top: 20rpx;}
+
+.container .orderinfotop{ position: relative; margin-top: -200rpx;}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .title,.product .title{ font-weight: bold; font-size: 30rpx; line-height: 60rpx; margin-bottom: 15rpx;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .t3{ margin-top: 3rpx;}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;min-width:160rpx;padding: 0 20rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center;}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center;}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+.orderx image{ width:124rpx ; height: 124rpx; margin-right: 60rpx;}
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/orderlist.vue b/activity/yuyue/orderlist.vue
new file mode 100644
index 0000000..a076711
--- /dev/null
+++ b/activity/yuyue/orderlist.vue
@@ -0,0 +1,232 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','派单中','待确认','已完成','已取消']" :itemst="['all','0','1','2','3','4']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap.stop="goto" :data-url="'orderdetail?id=' + item.id">
+					<view class="head">
+						<view class="f1" v-if="item.bid!=0" @tap.stop="goto" :data-url="'/pages/business/index?id=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+						<view v-else>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						
+						<block v-if="item.status==1 && item.refund_status==0 && item.worker_orderid">
+							<text v-if="item.worker.status==0" class="st1">待接单</text>
+							<text v-if="item.worker.status==1" class="st1">已接单</text>
+							<text v-if="item.worker.status==2" class="st2">服务中</text>
+						</block>
+						<block v-else-if="item.status==1 && item.refund_status==0">
+							<text class="st1">派单中</text>
+						</block>	
+						<text v-if="item.status==1 && item.refund_status==1" class="st1">退款审核中</text>
+						<text v-if="item.status==2" class="st2">服务中</text>
+						<text v-if="item.status==3 && item.isconmement==0" class="st3">待评价</text>
+						<text v-if="item.status==3" class="st4">已完成</text>
+						<text v-if="item.status==4" class="st4">订单已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view v-if="item.paidan_type==3" >
+							<image :src="item.propic" ></image>
+						</view>
+						<view v-else @tap.stop="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic">
+						</view>	
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+		
+							<text class="t1">预约日期：{{item.yy_time}}</text>
+						
+							<view class="t3" v-if="item.balance_price>0"><text class="x1 flex1">实付金额：￥{{item.totalprice}}</text><text class="x1 flex1" v-if="item.balance_price>0">尾款：￥{{item.balance_price}}</text></view>
+							<view class="t3" v-else><text class="x1 flex1">实付金额：￥{{item.totalprice}}</text><text class="x1 flex1" >含跑腿费：￥{{item.paidan_money}}</text></view>
+						</view>
+					</view>
+					<view class="bottom"  v-if="item.send_time>0">
+						<text>派单时间：{{item.senddate}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+						<block v-if="item.status==0">
+							<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+						</block>
+						<block v-if="item.status==1 && item.totalprice>0" >
+							<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+						</block>
+						<block v-if="item.status==2">
+							<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+							<view class="btn2" @tap.stop="goto" :data-url="'logistics?express_no=' + item.worker_orderid" v-if="item.freight_type!=3">查看进度</view>
+							<view v-if="item.balance_pay_status == 0 && item.balance_price > 0" class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.balance_pay_orderid">支付尾款</view>
+						</block>
+						<block v-if="item.status==3 || item.status==4">
+							<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		codtxt: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiYuyue/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiYuyue/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiYuyue/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定已完成吗?', function () {
+        app.post('ApiYuyue/orderCollect', {orderid: orderid}, function (data) {
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+/*.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px; font-size: 14px; position: absolute; bottom: 10px; right: 10px; background: #fff; }*/
+.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px;}
+
+.zan-tex{clear:both; display: block; width: 100%; color: #565656; font-size: 12px; height: 30px; line-height: 30px; text-align: center;  }
+.ind-bot{ width: 100%; float: left; text-align: center; height: 50px; line-height: 50px; font-size: 13px; color: #ccc; background:#F2F2F2}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/peodetail.vue b/activity/yuyue/peodetail.vue
new file mode 100644
index 0000000..3684fe0
--- /dev/null
+++ b/activity/yuyue/peodetail.vue
@@ -0,0 +1,229 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view class="top flex">
+				<view class="headimg"><image :src="data.headimg"> </view>
+				<view class="f1">
+					<view class="t1">{{data.realname}}</view>
+					<view class="t2">{{data.jineng}}</view>
+					<view class="t3">
+						<text class="t11"><text class="bold">{{data.totalnum}}</text> 次服务</text>
+						<text class="t11"><text class="bold">{{data.comment_score}}</text> 评价</text>
+					</view>
+				</view>
+			</view>
+			<view class="desc" v-if="data.desc">
+				{{data.desc}}
+			</view>
+			<view class="list">
+				<view class="tab">
+					<view :class="'item ' + (curTopIndex == 0 ? 'on' : '') " @tap="switchTopTab" :data-index="0">服务 {{data.count}}<view class="after" :style="{background:t('color1')}"></view></view>
+					<view :class="'item ' + (curTopIndex == 1 ? 'on' : '') " @tap="switchTopTab" :data-index="1">评价 {{data.comment_score}}<view class="after" :style="{background:t('color1')}"></view></view>
+				</view>
+				<view v-if="curTopIndex==0" v-for="(item, index) in datalist" :key="index" class="content2 flex" :data-id="item.id">
+					<view class="f1" @click="goto" :data-url="'product?id='+item.id" >
+						<view class="headimg"><image :src="item.pic" /></view>
+						<view class="text1">	
+							<text class="t1">{{item.name}} </text>
+							<view class="text2">服务时长：{{item.fwlong}}分钟</view>
+							<view class="text3">
+								<text class="t4">￥<text class="price"> {{item.sell_price}}</text> </text> <text class="t5">已售 <text>{{item.sales}}</text></text>
+							</view>
+				
+						</view>	
+					</view>
+					<view>
+						<view class="yuyue"  @click="goto" :data-url="'product?id='+item.id">预约</view>
+					</view>
+				</view>
+				<view class="comment" v-if="curTopIndex==1">
+					<view v-for="(item, index) in datalist" :key="index" class="item">
+						<view class="f1">
+							<image class="t1" :src="item.headimg"/>
+							<view class="t2">{{item.nickname}}</view>
+							<view class="flex1"></view>
+							<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+						</view>
+						<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+						<view class="f2">
+							<text class="t1">{{item.content}}</text>
+							<view class="t2">
+								<block v-if="item.content_pic!=''">
+									<block v-for="(itemp, index) in item.content_pic" :key="index">
+										<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+											<image :src="itemp" mode="widthFix"/>
+										</view>
+									</block>
+								</block>
+							</view>
+						
+						</view>
+						<view class="f3" v-if="item.reply_content">
+							<view class="arrow"></view>
+							<view class="t1">商家回复：{{item.reply_content}}</view>
+						</view>
+					</view>
+				</view>
+			
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<view style="height:140rpx"></view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		data:[],
+		datalist: [],
+		type: "",
+		keyword:'',
+		nodata:false,
+		curTopIndex:0,
+		event_rul: app.globalData.event_url,
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			that.nodata = false;
+			var that = this;
+			var id = this.opt.id || 0;
+			app.get('ApiYuyue/peodetail', {id:id}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				that.data = data
+				that.loaded();
+				that.getdatalist();
+			});
+		},
+		switchTopTab: function (e) {
+		  var that = this;
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  this.curTopIndex = index;
+		  this.datalist = [];
+		  this.getdatalist(true);
+		},   
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var id = that.opt.id ? that.opt.id : '';
+			var order = that.order;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			app.post('ApiYuyue/getdlist', {curTopIndex:that.curTopIndex,pagenum: pagenum,field: field,order: order,id:id}, function (res) { 
+				that.loading = false;
+				uni.stopPullDownRefresh();
+				var data = res.data;
+				console.log(data.length);
+				if (data.length == 0) {
+					console.log(pagenum);
+					if(pagenum == 1){
+						that.nodata = true;
+						console.log(222);
+					}else{
+						that.nomore = true;
+					}
+				}
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+			});
+		 
+		},
+		scrolltolower: function () {
+		     
+			if (!this.nomore) {
+		   
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+		 
+			}
+		 
+		},
+  }
+};
+</script>
+<style>
+.container{ background: #fff; padding: 40rpx;}
+.headimg{ width: 160rpx; height: 160rpx;margin-right: 20rpx;}
+.headimg image{ width: 160rpx; height: 160rpx; border-radius: 50%; }
+.f1 .t1{ color:#323232;  font-size: 32rpx; font-weight: bold;}
+.f1 .t2{ color:#999;  font-size: 24rpx; }
+.f1 .t3{ margin-top: 30rpx;color:#999;font-size: 0.24rpx;}
+.f1 .t3 .bold{ font-size: 36rpx; color: #323232; font-weight: bold;margin-left: 4rpx;}
+.f1 .t11{ margin-right: 30rpx; font-size: 24rpx;}
+.desc{ color: #6d6e74; font-size: 26rpx; margin-top: 60rpx;}
+.tab{ margin-top: 80rpx; display: flex; }
+.tab .item{ padding-right:20rpx; color: #323232;font-size: 28rpx;  margin-right: 40rpx; line-height: 60rpx; overflow: hidden;position:relative; }
+.tab .after{display:none;position:absolute;left:45%;margin-left:-20rpx;bottom:0rpx;height:6rpx;border-radius:1.5px;width:40rpx}
+.tab .on .after{display:block}
+
+
+.content2{width:100%;background:#fff;border-radius:5px; justify-content: space-between; margin-top: 40rpx; border-bottom: 1px solid #EEEEEE;}
+.content2 .f1{display:flex;align-items:center}
+.content2 .f1 image{ width: 140rpx; height: 140rpx; border-radius: 10rpx;}
+.content2 .f1 .t1{color:#2B2B2B;font-weight:bold;font-size:32rpx;margin-left:10rpx;}
+.content2 .f1 .t2{color:#999999;font-size:28rpx; background: #E8E8F7;color:#7A83EC; margin-left: 10rpx; padding:3rpx 20rpx; font-size: 20rpx; border-radius: 18rpx;}
+.content2 .f1 .t3{ margin-left:10rpx;display: block; height: 40rpx;line-height: 40rpx;}
+.content2 .f2{color:#2b2b2b;font-size:26rpx;line-height:42rpx;padding-bottom:20rpx;}
+.content2 .f3{height:96rpx;display:flex;align-items:center}
+.content2 .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;}
+.content2 .radio .radio-img{width:100%;height:100%}
+.content2 .mrtxt{color:#2B2B2B;font-size:26rpx;margin-left:10rpx}
+.text2{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 10rpx;}
+.text3{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 10rpx;}
+.text3 .t5{ margin-left: 20rpx;}
+.text3 .t5 text{ color:#7A83EC}
+.text3 .t4 text{ color:#FF5347}
+.text3 .t4 { color:#FF5347}
+.text3 .t4 .price{ font-weight: bold;font-size: 30rpx;}
+.yuyue{ background: #7A83EC; width:136rpx;height: 60rpx; line-height: 60rpx; padding: 0 10rpx; color:#fff; border-radius:28rpx; ; font-size: 20rpx; text-align: center; margin-top: 20rpx;}
+
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/peodetail2.vue b/activity/yuyue/peodetail2.vue
new file mode 100644
index 0000000..78abbff
--- /dev/null
+++ b/activity/yuyue/peodetail2.vue
@@ -0,0 +1,203 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view class="top flex">
+				<view class="headimg"><image :src="data.avatar"> </view>
+				<view class="right">
+					<view class="t1"><text  class="bold">{{data.name}}</text><text>{{data.juli}}km</text></view>
+					<view class="t3">
+						<view class="t11"><text>服务单量：{{data.recentOrderTotalDesc}}</text></view>
+						<view class="t11">服务状态：<text class="statusdesc">{{data.statusDesc}}</text></view>
+						<view class="t11">最后上线时间：{{data.lastOnlineTime}} </view>
+					</view>
+				</view>
+			</view>
+			<view class="desc" v-if="data.desc">
+				{{data.desc}}
+			</view>
+			<view class="list">
+				<view class="tab">
+					<view :class="'item ' + (curTopIndex == 0 ? 'on' : '') " @tap="switchTopTab" :data-index="0">服务项目 <view class="after" :style="{background:t('color1')}"></view></view>
+				</view>
+				<view v-if="curTopIndex==0 && item.price>0" v-for="(item, index) in datalist" :key="index" class="content2 flex" :data-id="item.id">
+					<view class="f1" @click="goto"  :data-url="'product2?skillid='+item.skillId+'&masterid='+data.id" >
+						<view class="headimg2"><image :src="set.pic" /></view>
+						<view class="text1">	
+							<view class="text2 flex">
+									<text class="t1">{{item.firstCategoryName}} {{item.secondCategoryName}} </text>
+									<view class="text3">
+										<text class="t4"><text class="price">{{item.price}}{{item.unit}}</text> </text>
+									</view>
+							</view>	
+							<view  class="textdesc"><text>{{set.desc}}</text></view>
+							<view class="flex" style="justify-content: space-between;">
+								<view style="font-size: 24rpx; margin: 20rpx 30rpx; ">服务类型：{{item.serviceType}}</view>
+								<view class="yuyue" :style="{background:t('color1')}"  @click="goto" :data-url="'product2?skillid='+item.skillId+'&masterid='+data.id+'&masterName='">预约</view>
+							</view>
+						</view>	
+					</view>				
+				</view>	
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<view style="height:140rpx"></view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+
+			datalist: [],
+			type: "",
+			keyword:'',
+			nodata:false,
+			curTopIndex:0,
+			data:[],
+			set:[]
+			
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type || '';
+		this.getdata();
+		var that = this;
+		//if(that.latitude=='' && that.longitude==''){
+			app.getLocation(function (res) {
+				console.log(res)
+				that.latitude = res.latitude;
+				that.longitude = res.longitude;
+				that.getdata();
+			});
+		//}
+  },
+	onPullDownRefresh: function () {
+
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			that.nodata = false;
+			var that = this;
+			var id = this.opt.id || 0;
+			var subid = this.opt.subid || 0;
+
+			app.get('ApiYuyue2/peodetail', {id:id,subid:subid,longitude: that.longitude,latitude: that.latitude}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				that.data = data
+				that.set = res.set
+				that.datalist = data.skillApiVOList
+				that.loaded();
+			});
+		},
+		switchTopTab: function (e) {
+		  var that = this;
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  this.curTopIndex = index;
+		  this.datalist = [];
+		  this.getdatalist(true);
+		},   
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var id = that.opt.id ? that.opt.id : '';
+			var order = that.order;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			app.post('ApiYuyue/getdlist', {curTopIndex:that.curTopIndex,pagenum: pagenum,field: field,order: order,id:id}, function (res) { 
+				that.loading = false;
+				uni.stopPullDownRefresh();
+				var data = res.data;
+				if (data.length == 0) {
+					console.log(pagenum);
+					if(pagenum == 1){
+						that.nodata = true;
+					}else{
+						that.nomore = true;
+					}
+				}
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+			});
+		 
+		},
+		scrolltolower: function () {
+		     
+			if (!this.nomore) {
+		   
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+		 
+			}
+		 
+		},
+  }
+};
+</script>
+<style>
+.container{ background: #fff; padding: 30rpx;}
+.headimg{ width: 240rpx; height: 240rpx;margin-right: 20rpx;}
+.headimg image{ width: 240rpx; height: 240rpx;border-radius: 10rpx ; }
+.content .top { width: 100%; } 
+.content .top .fl{ width: 100%; }
+.right{ width: 100%;}
+.right .t1{ display: flex; color:#323232;  font-size: 36rpx; font-weight: bold; justify-content: space-between; margin-top: 10rpx; }
+.right .t2{ color:#999;  font-size: 24rpx; }
+.right .t3{ margin-top: 20rpx;color:#999;font-size: 24rpx; background: #F8FBFF; border-radius: 10rpx; line-height: 40rpx; padding: 20rpx;}
+.right .t3 .bold{ font-size: 36rpx; color: #323232; font-weight: bold;margin-left: 4rpx;}
+.right .t11{ font-size: 26rpx;}
+.statusdesc{ color:#06A051; }
+
+.desc{ color: #6d6e74; font-size: 26rpx; margin-top: 60rpx;}
+.list .headimg2{ width: 220rpx; height: 220rpx;border-radius: 10rpx ; }
+.tab{ margin-top: 80rpx; display: flex; }
+.tab .item{ padding-right:20rpx; color: #323232;font-size: 28rpx; font-weight:bold; margin-right: 40rpx; line-height: 60rpx; overflow: hidden;position:relative; }
+.tab .after{display:none;position:absolute;left:25%;margin-left:-20rpx;bottom:0rpx;height:6rpx;border-radius:1.5px;width:80rpx}
+.tab .on .after{display:block}
+
+
+.content2{width:100%;background:#fff;border-radius:5px; justify-content: space-between; margin-top: 40rpx; border-bottom: 1px solid #EEEEEE;}
+.content2 .f1{display:flex;align-items:center; flex-wrap: wrap;}
+.content2 .f1 image{ width: 210rpx; height: 210rpx; border-radius: 10rpx;}
+.content2 .f1 .t1{color:#2B2B2B;font-weight:bold;font-size:28rpx;margin-left:10rpx; margin-top: 5rpx; }
+.content2 .f1 .t2{color:#999999;font-size:28rpx; background: #E8E8F7;color:#7A83EC; margin-left: 10rpx; padding:3rpx 20rpx; font-size: 20rpx; border-radius: 18rpx;}
+.content2 .f1 .t3{ margin-left:10rpx;display: block; height: 40rpx;line-height: 40rpx;}
+.content2 .f2{color:#2b2b2b;font-size:26rpx;line-height:42rpx;padding-bottom:20rpx;}
+.content2 .f3{height:96rpx;display:flex;align-items:center}
+.content2 .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;}
+.content2 .radio .radio-img{width:100%;height:100%}
+.content2 .mrtxt{color:#2B2B2B;font-size:26rpx;margin-left:10rpx}
+.list .text1{ width: 67%;}
+.text2{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 10rpx; margin-bottom: 10rpx; justify-content: space-between; margin-right: 20rpx;}
+.text3{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 10rpx;}
+.text3 .t5{ margin-left: 20rpx;}
+.text3 .t5 text{ color:#7A83EC}
+.text3 .t4 text{ color:#FF5347}
+.text3 .t4 { color:#FF5347}
+.textdesc{ font-size: 20rpx; padding: 10rpx 20rpx; background:#F8FBFF; margin: 0 20rpx;}
+.text3 .t4 .price{ font-weight: bold;font-size: 32rpx; line-height: 0rpx;}
+.yuyue{ background: #7A83EC; width:126rpx;height: 50rpx; line-height: 50rpx; margin-top: 10rpx;; padding: 0 10rpx; color:#fff; 
+border-radius:28rpx; ; font-size: 20rpx; text-align: center;  margin-bottom: 10rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/peolist.vue b/activity/yuyue/peolist.vue
new file mode 100644
index 0000000..4ec33d0
--- /dev/null
+++ b/activity/yuyue/peolist.vue
@@ -0,0 +1,229 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入姓名/手机号搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="order-tab">
+			<view class="order-tab2">
+				<view :class="'item ' + (curTopIndex == -1 ? 'on' : '')" @tap="switchTopTab" :data-index="-1" :data-id="0">全部<view class="after" :style="{background:t('color1')}"></view></view>
+				<block v-for="(item, index) in clist" :key="index">
+					<view :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id">{{item.name}}<view class="after" :style="{background:t('color1')}"></view></view>
+				</block>
+			</view>
+		</view>
+	
+		<view v-for="(item, index) in datalist" :key="index" class="content flex" :data-id="item.id">
+			<view class="f1" @click="goto" :data-url="'peodetail?id='+item.id" >
+				<view class="headimg"><image :src="item.headimg" /></view>
+				<view class="text1">	
+					<text class="t1">{{item.realname}} </text>
+					<text class="t2" v-if="item.typename" >{{item.typename}} </text>
+					<view class="text2">{{item.jineng}}</view>
+					<view class="text3">
+						<text class="t4">服务<text> {{item.totalnum}}</text> 次</text> <text class="t5">评分 <text>{{item.comment_score}}</text></text>
+					</view>
+
+				</view>	
+			</view>
+			<view>
+				<view class="yuyue"  @click="goto" :data-url="'/activity/yuyue/peodetail?id='+item.id" :style="{background:t('color1')}">预约</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		keyword: '',
+		datalist: [],
+		type: "",
+		keyword:'',
+		nodata:false,
+		curTopIndex: -1,
+		index:0,
+		curCid:0,
+
+		event_rul: app.globalData.event_url,
+		 
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			var nowcid = that.opt.cid;
+			var bid = that.opt.bid || 0;
+			if (!nowcid) nowcid = '';
+			that.loading = true;
+			app.get('ApiYuyue/peocategory', {cid: nowcid,bid:bid}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				that.clist = data;
+				//that.curCid = data[0]['id'];
+				if (nowcid) {
+					for (var i = 0; i < data.length; i++) {
+						if (data[i]['id'] == nowcid) {
+							that.curTopIndex = i;
+							that.curCid = nowcid;
+							break;
+						}
+						var downcdata = data[i]['child'];
+						var isget = 0;
+						for (var j = 0; j < downcdata; j++) {
+							if (downcdata[j]['id'] == nowcid) {
+								that.curIndex = i;
+								that.curIndex2 = j;
+								that.curCid = nowcid;
+								isget = 1;
+								break;
+							}
+						}
+						if (isget) break;
+					}
+				}
+				that.loaded();
+				that.getdatalist();
+			});
+			
+		},
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+		
+			var that = this;
+		     
+			var pagenum = that.pagenum;
+		   
+			var cid = that.curCid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var order = that.order;
+		    var keyword = that.keyword;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			app.post('ApiYuyue/selectpeople', {pagenum: pagenum,keyword: keyword,field: field,order: order,cid: cid,bid:bid,type:'list'}, function (res) { 
+				that.loading = false;
+		
+				uni.stopPullDownRefresh();
+		
+				var data = res.data;
+				if (data.length == 0) {
+					if(pagenum == 1){
+						that.nodata = true;
+					}else{
+						that.nomore = true;
+					}
+				}
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+			});
+		 
+		},
+		   
+		scrolltolower: function () {
+		     
+			if (!this.nomore) {
+		   
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+		 
+			}
+		 
+		},
+		 switchTopTab: function (e) {
+		   var that = this;
+		   var id = e.currentTarget.dataset.id;
+		   var index = parseInt(e.currentTarget.dataset.index);
+		   this.curTopIndex = index;
+		   this.curIndex = -1;
+		   this.curIndex2 = -1;
+		   this.prolist = [];
+		   this.nopro = 0;
+		   this.curCid = id;
+		   this.getdatalist();
+		 }, 
+		searchChange: function (e) {
+		  this.keyword = e.detail.value;
+		},
+		searchConfirm: function (e) {
+		  var that = this;
+		  var keyword = e.detail.value;
+		  that.keyword = keyword;
+		  that.getdata();
+		}
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+
+.order-tab{display:flex;width:100%;overflow-x:scroll;border-bottom: 1px #f5f5f5 solid;background: #fff;padding:0 10rpx}
+.order-tab2{display:flex;width:auto;min-width:100%}
+.order-tab2 .item{width:20%;padding:0 20rpx;font-size:28rpx;font-weight:bold;text-align: center; color:#999999; height:80rpx; line-height:80rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.order-tab2 .on{color:#222222;}
+.order-tab2 .after{display:none;position:absolute;left:50%;margin-left:-20rpx;bottom:10rpx;height:6rpx;border-radius:1.5px;width:40rpx}
+.order-tab2 .on .after{display:block}
+
+
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:20rpx 40rpx; justify-content: space-between;}
+.content .f1{display:flex;align-items:center}
+.content .f1 image{ width: 140rpx; height: 140rpx; border-radius: 10rpx;}
+.content .f1 .t1{color:#2B2B2B;font-weight:bold;font-size:32rpx;margin-left:10rpx;}
+.content .f1 .t2{color:#999999;font-size:28rpx; background: #E8E8F7;color:#7A83EC; margin-left: 10rpx; padding:3rpx 20rpx; font-size: 20rpx; border-radius: 18rpx;}
+.content .f1 .t3{ margin-left:10rpx;display: block; height: 40rpx;line-height: 40rpx;}
+.content .f2{color:#2b2b2b;font-size:26rpx;line-height:42rpx;padding-bottom:20rpx;}
+.content .f3{height:96rpx;display:flex;align-items:center}
+.content .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;}
+.content .radio .radio-img{width:100%;height:100%}
+.content .mrtxt{color:#2B2B2B;font-size:26rpx;margin-left:10rpx}
+
+
+.text2{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 10rpx;}
+.text3{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 10rpx;}
+.text3 .t5{ margin-left: 20rpx;}
+.text3 .t5 text{ color:#7A83EC}
+.text3 .t4 text{ color:#7A83EC}
+.yuyue{ background: #7A83EC; height: 40rpx; line-height: 40rpx; padding: 0 10rpx; color:#fff; border-radius:28rpx; width: 80rpx; font-size: 20rpx; text-align: center; margin-top: 20rpx;}
+.text1{ margin-left: 10rpx;}
+.container .btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/peolist2.vue b/activity/yuyue/peolist2.vue
new file mode 100644
index 0000000..69c45b4
--- /dev/null
+++ b/activity/yuyue/peolist2.vue
@@ -0,0 +1,292 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topbox">
+			<view class="order-tab">
+				<view class="order-tab2">
+						<view :class="'item ' + (curIndex == -1 ? 'on' : '')" @tap="switchTopTab" data-index="-1" data-id="0">全部<view class="after" :style="{background:t('color1')}"></view></view>
+					<block v-for="(item, index) in clist" :key="index">
+						<view :class="'item ' + (curIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.appid">{{item.name}}<view class="after" :style="{background:t('color1')}"></view></view>
+					</block>
+				</view>
+			</view>
+			<view class="classify-ul" v-if="curIndex!='-1'">
+				<view class="libox flex" style="width:100%;">
+				 <block v-for="(item, idx2) in clist[curIndex].child" :key="idx2">
+				 <view class="classify-li" :style="curIndex2==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeCTab" :data-id="item.appid" :data-index="idx2">{{item.name}}</view>
+				 </block>
+				</view>
+			</view>
+		</view>
+		
+		<view class="content flex" :style="curIndex==-1?'top: 100rpx;':'top:200rpx'">
+			<view  v-for="(item, index) in datalist" :key="index"  class="f1" @click="goto" :data-url="'peodetail2?id='+item.id" >
+				<view class="headimg"><image :src="item.avatar" /></view>
+				<view class="text1 flex">	
+					<text class="t1">{{item.name}} </text>
+					<text class="t3">{{item.distanceDesc}} </text>
+				</view>
+				<view class="text3 flex">
+						<text class="t3" v-if="curIndex==-1">接单量:{{item.acceptOrderTotal}}  <text class="statusdesc">{{item.statusDesc}}</text></text>
+						<text class="t3" v-else>{{item.priceDesc}} </text>
+						<view class="yuyue"  @click="goto" :data-url="'/activity/yuyue/peodetail2?id='+item.id" :style="{background:t('color1')}">预约</view>
+				</view>	
+			</view>
+
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+      keyword: '',
+      datalist: [],
+      type: "",
+			keyword:'',
+			nodata:false,
+			index:0,
+			curCid:0,
+			curIndex: -1,
+			curIndex2:0,
+			cursubCid:0,
+			latitude:'',
+			longitude:'',
+			clist:[]
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdatalist();
+	},
+	onReachBottom: function () {
+	  if (!this.nodata && !this.nomore) {
+	    this.pagenum = this.pagenum + 1;
+	    this.getdatalist(true);
+	  }
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			var nowcid = that.opt.cid;
+			var bid = that.opt.bid || 0;
+			if (!nowcid) nowcid = '';
+			that.loading = true;
+			app.get('ApiYuyue2/peocategory', {cid: nowcid,bid:bid}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				that.clist = data;
+				that.curCid = data[0]['appid'];
+				//that.cursubCid = data[0]['child'][0]['appid'];
+				console.log(nowcid);
+				if (nowcid) {
+					for (var i = 0; i < data.length; i++) {
+						if (data[i]['id'] == nowcid) {
+							that.curIndex = i;
+							that.curCid = nowcid;
+							break;
+						}
+						var downcdata = data[i]['child'];
+						var isget = 0;
+						that.cursubCid = downcdata[0]['appid'];
+						for (var j = 0; j < downcdata; j++) {
+							if (downcdata[j]['id'] == nowcid) {
+								that.curIndex = i;
+								that.curIndex2 = j;
+								that.cursubCid = nowcid;
+								isget = 1;
+								break;
+							}
+						}
+						if (isget) break;
+					}
+				}
+				that.loaded();
+				if(app.globalData.platform=='h5'){
+					that.getdatalist();
+				}else{
+					app.getLocation(function (res) {
+						that.latitude = res.latitude;
+						that.longitude = res.longitude;
+						that.getdatalist();
+					});
+				}
+			});
+			
+		},
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;  
+			var cid = that.curCid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var order = that.order;
+		    var keyword = that.keyword;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			var st = 0;
+			if(this.curIndex=='-1'){
+					var st='all';
+			}
+			app.post('ApiYuyue2/selectpeople', {st:st,pagenum: pagenum,keyword: keyword,field: field,order: order,cid: cid,subCid:that.cursubCid,bid:bid,type:'list',latitude:that.latitude,longitude:that.longitude}, function (res) { 
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+					that.datalist = data;
+				  if (data.length == 0) {
+				    that.nodata = true;
+				  }
+					that.loaded();
+				}else{
+				  if (data.length == 0) {
+				    that.nomore = true;
+				  } else {
+				    var datalist = that.datalist;
+				    var newdata = datalist.concat(data);
+				    that.datalist = newdata;
+				  }
+				}
+			
+			});
+		},
+		scrolltolower: function () {
+			if (!this.nomore) {
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+		 
+			}
+		 
+		},
+		//事件处理函数
+		 switchTopTab: function (e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id; 
+				var index = parseInt(e.currentTarget.dataset.index); 
+				this.curIndex = index;
+				if(index!='-1'){
+					this.curIndex2 = 0;
+					this.nodata = false;
+					this.curCid = id	;
+					//console.log(this.clist);
+					this.cursubCid = this.clist[index]['child'][0]['appid'];
+				}
+				this.pagenum = 1; 
+				this.datalist = [];
+				this.nomore = false;
+				this.getdatalist();
+		},
+	changeCTab: function (e) {
+		var that = this;
+		var id = e.currentTarget.dataset.id;
+		var index = parseInt(e.currentTarget.dataset.index);
+		this.curIndex2 = index;
+		this.nodata = false;
+		this.cursubCid = id;
+		this.pagenum = 1;
+		this.datalist = [];
+		this.nomore = false;
+		this.getdatalist();
+	},
+	
+		selectzuobiao: function () {
+			console.log('selectzuobiao')
+		  var that = this;
+		  uni.chooseLocation({
+		    success: function (res) {
+		      console.log(res);
+		      that.area = res.address;
+		      that.address = res.name;
+		      that.latitude = res.latitude;
+		      that.longitude = res.longitude;
+		    },
+		    fail: function (res) {
+					console.log(res)
+		      if (res.errMsg == 'chooseLocation:fail auth deny') {
+		        //$.error('获取位置失败，请在设置中开启位置信息');
+		        app.confirm('获取位置失败，请在设置中开启位置信息', function () {
+		          uni.openSetting({});
+		        });
+		      }
+		    }
+		  });
+		},
+  },
+	
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.topbox{ position: fixed; top: 0; z-index: 1000;} 
+
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+
+.order-tab{display:flex;width:100%;overflow-x:scroll;border-bottom: 1px #f5f5f5 solid;background: #fff;padding:0 10rpx}
+.order-tab2{display:flex;width:auto;min-width:100%}
+.order-tab2 .item{width:20%;padding:0 20rpx;font-size:28rpx;font-weight:bold;text-align: center; color:#999999; height:80rpx; line-height:80rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.order-tab2 .on{color:#222222;}
+.order-tab2 .after{display:none;position:absolute;left:50%;margin-left:-20rpx;bottom:10rpx;height:6rpx;border-radius:1.5px;width:40rpx}
+.order-tab2 .on .after{display:block}
+
+
+.content{width:100%;margin:20rpx 0; padding:0 20rpx;justify-content: space-between;  flex-wrap: wrap; position: absolute;}
+.content .f1{align-items:center;width:48%;background:#fff;padding: 20rpx;border-radius:10rpx; margin-bottom: 20rpx;}
+.content .f1 image{ width: 310rpx; height:  310rpx; border-radius: 10rpx;}
+.content .f1 .t1{color:#2B2B2B;font-weight:bold;font-size:32rpx;margin-left:10rpx;}
+.content .f1 .t2{color:#999999;font-size:24rpx; background: #E8E8F7;color:#7A83EC; margin-left: 10rpx; padding:3rpx 20rpx; font-size: 20rpx; border-radius: 18rpx;}
+.content .f2{color:#2b2b2b;font-size:26rpx;line-height:42rpx;padding-bottom:20rpx;}
+.content .f3{height:96rpx;display:flex;align-items:center}
+.content .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;}
+.content .radio .radio-img{width:100%;height:100%}
+.content .mrtxt{color:#2B2B2B;font-size:26rpx;margin-left:10rpx}
+
+.text1 .t3{ color:red}
+.text2{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 10rpx;}
+.text3{ margin-left: 10rpx; color:#999999; font-size: 20rpx;margin-top: 20rpx;justify-content: space-between; line-height: 40rpx;}
+.text3 .t5{ margin-left: 20rpx;}
+.text3 .t5 text{ color:#7A83EC}
+.text3 .t4 text{ color:#7A83EC}
+.text3 .t3{ line-height: 60rpx;}
+.yuyue{ background: #7A83EC; height: 40rpx; line-height: 40rpx; padding: 0 10rpx; color:#fff; border-radius:28rpx; width: 80rpx; font-size: 20rpx; text-align: center; margin-top: 10rpx;}
+.text1{ margin-left: 10rpx; justify-content: space-between; margin-top: 10rpx;}
+.container .btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:20rpx;}
+
+.classify-ul{width:100%;padding:10rpx; background: #fff;}
+.libox{flex-wrap: wrap;}
+.classify-li{background:#F5F6F8;border-radius:22rpx;color:#6C737F;font-size:20rpx;text-align: center;height:44rpx; line-height:44rpx;padding:0 28rpx;
+margin:15rpx 10rpx 24rpx 0}
+.statusdesc{ color:#06A051; margin-left: 10rpx; }
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/product.vue b/activity/yuyue/product.vue
new file mode 100644
index 0000000..6784f42
--- /dev/null
+++ b/activity/yuyue/product.vue
@@ -0,0 +1,797 @@
+<template>
+<view>
+	<block v-if="isload">
+		<block v-if="sysset.showgzts">
+			<view style="width:100%;height:88rpx"> </view>
+			<view class="follow_topbar">
+				<view class="headimg"><image :src="sysset.logo"/></view>
+				<view class="info">
+					<view class="i">欢迎进入 <text :style="{color:t('color1')}">{{sysset.name}}</text></view>
+					<view class="i">关注公众号享更多专属服务</view>
+				</view>
+				<view class="sub" @tap="showsubqrcode" :style="{'background-color':t('color1')}">立即关注</view>
+			</view>
+			<uni-popup id="qrcodeDialog" ref="qrcodeDialog" type="dialog">
+				<view class="qrcodebox">
+					<image :src="sysset.qrcode" @tap="previewImage" :data-url="sysset.qrcode" class="img"/>
+					<view class="txt">长按识别二维码关注</view>
+					<view class="close" @tap="closesubqrcode">
+						<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+					</view>
+				</view>
+			</uni-popup>
+		</block>
+
+		<view style="position:fixed;top:15vh;left:20rpx;z-index:9;background:rgba(0,0,0,0.6);border-radius:20rpx;color:#fff;padding:0 10rpx" v-if="bboglist.length>0">
+			<swiper style="position:relative;height:54rpx;width:350rpx;" :autoplay="true" :interval="5000" :vertical="true">
+				<swiper-item v-for="(item, index) in bboglist" :key="index" @tap="goto" :data-url="'/activity/yuyue/product?id=' + item.proid" class="flex-y-center">
+					<image :src="item.headimg" style="width:40rpx;height:40rpx;border:1px solid rgba(255,255,255,0.7);border-radius:50%;margin-right:4px"/>
+					<view style="width:300rpx;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;font-size:22rpx">{{item.nickname}} {{item.showtime}}购买了该商品</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<!-- <view class="topbox"><image :src="event_rul +'/static/img/static/img/goback.png'" class="goback" /></view> -->
+		<view class="swiper-container" v-if="isplay==0" >
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="500000" @change="swiperChange">
+				<block v-for="(item, index) in product.pics" :key="index">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+					</swiper-item>
+				</block>
+			</swiper>
+			<view class="imageCount" v-if="(product.pics).length > 1">{{current+1}}/{{(product.pics).length}}</view>
+			<view v-if="product.video" class="provideo" @tap="payvideo"><image :src="event_rul +'/static/img/static/img/video.png'"/><view class="txt">{{product.video_duration}}</view></view>
+		</view>
+	
+		<view class="header"> 
+			<view class="price_share">
+				<view class="title">{{product.name}}</view>
+				<view class="share" @tap="shareClick"><image class="img" :src="event_rul +'/static/img/static/img/share.png'"/><text class="txt">分享</text></view>
+			</view>
+			<view class="pricebox flex">
+				<view class="price">
+					<view class="f1" :style="{color:t('color1')}">
+						{{product.min_price}}<text v-if="product.max_price!=product.min_price">-{{product.max_price}}</text><text style="font-size:24rpx;font-weight:normal;padding-left:6rpx">元/{{product.danwei}}</text>
+					</view>
+					<view class="f2" v-if="product.market_price*1 > product.sell_price*1">￥{{product.market_price}}<text v-if="product.max_price!=product.min_price">起</text></view>
+				</view>
+				<view class="sales_stock">
+					<view class="f1" >已售：{{product.sales}} </view>
+				</view>
+				
+			</view>
+			
+			<view class="sellpoint" v-if="product.sellpoint">{{product.sellpoint}}</view>
+		
+			<view style="margin:20rpx 0;color:red;font-size:22rpx" v-if="product.balance_price > 0">定金金额：{{product.advance_price}}元，尾款金额：{{product.balance_price}}元</view>
+			
+			<view class="cuxiaodiv" v-if="fuwulist.length>0">
+				<view class="fuwupoint" v-if="fuwulist.length>0">
+					<view class="f1" @tap="showfuwudetail">
+						<view class="t" v-for="(item, index) in fuwulist" :key="index">{{item.name}}</view>
+					</view>
+					<view class="f2" @tap="showfuwudetail">
+						<image :src="event_rul +'/static/img/static/img/arrow-point.png'" mode="widthFix"/>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="cuxiaopoint" v-if="couponlist.length>0">
+			<view class="f0">优惠</view>
+			<view class="f1" @tap="showcuxiaodetail">
+				<view v-for="(item, index) in couponlist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0" style="padding:0 6px">券</text><text class="t1">{{item.name}}</text></view>
+			</view>
+			<view class="f2" @tap="showcuxiaodetail">
+				<image :src="event_rul +'/static/img/static/img/arrow-point.png'" mode="widthFix"/>
+			</view>
+		</view>
+		
+		<view class="choosebox">
+			<view class="choose" @tap="buydialogChange" data-btntype="2">
+				<view class="f0">选择服务</view>
+				<view class="f1 flex1">{{ggname}} <text v-if="num">× {{num}}</text></view>
+				<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="choosedate" @tap="chooseTime"  >
+				<view class="f0">服务时间</view>
+				<view class="f1 flex1">{{days}} {{selectDates}}</view>
+				<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+		
+		<view class="commentbox" v-if="commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评率 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul +'/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul+'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"/></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">服务详情</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+
+		<view style="width:100%;height:140rpx;"></view>
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':''" v-if="product.status==1">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="'prolist?bid=' + product.bid" >
+					<image class="img" :src="event_rul +'/static/img/static/img/shou.png'"/>
+					<view class="t1">首页</view>
+				</view>
+				<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+				<view class="item" @tap="addfavorite">
+					<image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'"/>
+					<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+				</view>
+			</view>
+			<view class="op">
+				<view class="tobuy flex-x-center flex-y-center" @tap="tobuy" :style="{background:t('color1')}" >立即预约</view>
+			</view>
+		</view>
+		<yybuydialog v-if="buydialogShow" :proid="product.id" :btntype="btntype"  @currgg="currgg" @buydialogChange="buydialogChange" :menuindex="menuindex" @addcart="addcart"></yybuydialog>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view v-if="timeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidetimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+						@tap.stop="hidetimeDialog" />
+				</view>
+				<view class="order-tab">
+					<view class="order-tab2">
+						<block v-for="(item, index) in datelist" :key="index">
+							<view  :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id" >
+								<view class="datetext">{{item.weeks}}</view>
+								<view class="datetext2">{{item.date}}</view>
+								<view class="after"  :style="{background:t('color1')}"></view>
+							</view>			
+						</block>
+				
+					</view>
+				</view>
+				<view class="flex daydate">
+					<block v-for="(item,index2) in timelist" :key="index2">
+						<view :class="'date ' + ((timeindex==index2 && item.status==1) ? 'on' : '') + (item.status==0 ?'hui' : '') "  @tap="switchDateTab" :data-index2="index2" :data-status="item.status" :data-time="item.timeint"> {{item.time}}</view>						
+					</block>
+				</view>
+				<view class="op">
+					<button class="tobuy on" :style="{backgroundColor:t('color1')}" @tap="selectDate" >确 定</button>
+				</view>
+			</view>
+		</view>
+		
+		<view v-if="showfuwudialog" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidefuwudetail"></view>
+			<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">服务</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidefuwudetail"/>
+					</view>
+					<view class="popup__content">
+						<view v-for="(item, index) in fuwulist" :key="index" class="service-item">
+							<view class="fuwudialog-content">
+								<view class="f1">{{item.name}}</view>
+								<text class="f2">{{item.desc}}</text>
+							</view>
+						</view>
+					</view>
+			</view>
+		</view>
+		
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+			textset:{},
+			isload:false,
+			buydialogShow: false,
+			btntype:1,
+			isfavorite: false,
+			current: 0,
+			isplay: 0,
+			showcuxiaodialog: false,
+			showfuwudialog:false,
+			business: "",
+			product: [],
+			cartnum: "",
+			commentlist: "",
+			commentcount: "",
+			cuxiaolist: "",
+			couponlist: "",
+			fuwulist: [],
+			pagecontent: "",
+			shopset: {},
+			sysset:{},
+			title: "",
+			bboglist: "",
+			sharepic: "",
+			sharetypevisible: false,
+			showposter: false,
+			posterpic: "",
+			scrolltopshow: false,
+			kfurl:'',
+			ggname:'请选择服务',
+			timeDialogShow: false,
+			datelist:[],
+			daydate:[],
+			curTopIndex: 0,
+			index:0,
+			day: -1,
+			days:'请选择服务时间',
+			dates:'',
+			num:0,
+			timeindex:-1,
+			startTime:0,
+			selectDates:'',
+			timelist:[],
+			
+			event_rul: app.globalData.event_url,
+		};
+	},
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		console.log(sharewxdata)
+		console.log(query)
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+	onUnload: function () {
+		clearInterval(interval);
+	},
+
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.loading = true;
+			app.get('ApiYuyue/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.textset = app.globalData.textset;
+				var product = res.product;
+				var pagecontent = JSON.parse(product.detail);
+				that.business = res.business;
+				that.product = product;
+				that.cartnum = res.cartnum;
+				that.commentlist = res.commentlist;
+				that.commentcount = res.commentcount;
+				that.pagecontent = pagecontent;
+				that.shopset = res.shopset;
+				that.sysset = res.sysset;
+				that.title = product.name;
+				that.isfavorite = res.isfavorite;
+				that.fuwulist = res.fuwulist2;
+				that.sharepic = product.pics[0];
+				//that.couponlist = res.couponlist
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+				that.datelist = res.datelist;
+				that.daydate = res.daydate;
+				that.kfurl = '/pages/kefu/index?bid='+product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:product.name,pic:product.pic});
+			});
+		},
+		swiperChange: function (e) {
+			var that = this;
+			that.current = e.detail.current
+		},
+		payvideo: function () {
+			this.isplay = 1;
+			uni.createVideoContext('video').play();
+		},
+		parsevideo: function () {
+			this.isplay = 0;
+			uni.createVideoContext('video').stop();
+		},
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.btntype = e.currentTarget.dataset.btntype;
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+		currgg: function (e) {
+			console.log(e);
+			var that = this
+			this.ggname = e.ggname;
+			that.ggid = e.ggid
+			that.proid = e.proid
+			that.num = e.num
+		},
+		switchTopTab: function (e) {
+		  var that = this;
+		  var id = e.currentTarget.dataset.id;
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  this.curTopIndex = index;
+		  that.days = that.datelist[index].year+that.datelist[index].date
+		  that.nowdate = that.datelist[index].nowdate
+		   // if(!that.dates ){ that.dates = that.daydate[0] }
+		  this.curIndex = -1;
+		  this.curIndex2 = -1;
+		  //检测预约时间是否可预约
+		  that.loading = true;
+		  app.get('ApiYuyue/isgetTime', { date: that.days,proid:this.opt.id}, function (res) {
+			  that.loading = false;
+			  that.timelist = res.data;
+		  })
+			
+		},
+		switchDateTab: function (e) {
+		  var that = this;
+		  var index2 = parseInt(e.currentTarget.dataset.index2);
+		  var timeint = e.currentTarget.dataset.time
+		  var status = e.currentTarget.dataset.status
+		  if(status==0){
+				app.error('此时间不可选择');return;	
+		  }
+		  that.timeint = timeint
+		  that.timeindex = index2
+			//console.log(that.timelist);
+		  that.starttime1 = that.timelist[index2].time
+		  if(!that.days || that.days=='请选择服务时间'){ that.days = that.datelist[0].year + that.datelist[0].date }
+		  that.selectDates = that.starttime1;
+		},
+		selectDate:function(e){
+			var that=this
+			if(that.timeindex >= 0 && that.timelist[that.timeindex].status==0){
+					that.starttime1='';
+			}
+			if(!that.starttime1){
+				app.error('请选择预约时间');return;
+			}
+			 this.timeDialogShow = false;
+		},
+		//收藏操作
+		addfavorite: function () {
+			var that = this;
+			var proid = that.product.id;
+			app.post('ApiYuyue/addfavorite', {proid: proid,type: 'yuyue'}, function (data) {
+				if (data.status == 1) {
+					that.isfavorite = !that.isfavorite;
+				}
+				app.success(data.msg);
+			});
+		},
+		shareClick: function () {
+			this.sharetypevisible = true;
+		},
+		handleClickMask: function () {
+			this.sharetypevisible = false
+		},
+		showPoster: function () {
+			var that = this;
+			that.showposter = true;
+			that.sharetypevisible = false;
+			app.showLoading('生成海报中');
+			app.post('ApiYuyue/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+				if (data.status == 0) {
+					app.alert(data.msg);
+				} else {
+					that.posterpic = data.poster;
+				}
+			});
+		},
+		
+		posterDialogClose: function () {
+			this.showposter = false;
+		},
+		showfuwudetail: function () {
+			this.showfuwudialog = true;
+		},
+		hidefuwudetail: function () {
+			this.showfuwudialog = false
+		},
+		showcuxiaodetail: function () {
+			this.showcuxiaodialog = true;
+		},
+		hidecuxiaodetail: function () {
+			this.showcuxiaodialog = false
+		},
+		getcoupon:function(){
+			this.showcuxiaodialog = false;
+			this.getdata();
+		},
+		onPageScroll: function (e) {
+			var that = this;
+			var scrollY = e.scrollTop;     
+			if (scrollY > 200) {
+				that.scrolltopshow = true;
+			}
+			if(scrollY < 150) {
+				that.scrolltopshow = false
+			}
+		},	
+		
+		//选择时间 
+		chooseTime: function(e) {
+			var that = this;
+			that.timeDialogShow = true;
+			that.timeIndex = -1;
+			var curTopIndex = that.datelist[0];
+			that.nowdate = that.datelist[that.curTopIndex].year+that.datelist[that.curTopIndex].date;
+			that.loading = true;
+			app.get('ApiYuyue/isgetTime', { date: that.nowdate,proid:this.opt.id}, function (res) {
+			  that.loading = false;
+			  that.timelist = res.data;
+			})
+			
+		},	
+		hidetimeDialog: function() {
+			this.timeDialogShow = false;
+		},
+		
+		showfuwudetail: function () {
+			this.showfuwudialog = true;
+		},
+		hidefuwudetail: function () {
+			this.showfuwudialog = false
+		},
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			that.sharetypevisible = false;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/yuyue/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/yuyue/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		},
+		showsubqrcode:function(){
+			this.$refs.qrcodeDialog.open();
+		},
+		closesubqrcode:function(){
+			this.$refs.qrcodeDialog.close();
+		},
+		tobuy: function (e) {
+			var that = this;
+			var ks = that.ks;
+			var proid = that.product.id;
+			var ggid = that.ggid;
+			var num = that.num;
+			var yydate = that.days+' '+that.selectDates
+
+			var prodata = proid + ',' + ggid + ',' + num;
+			if(!ggid || ggid==undefined){ app.error('请选择服务'); return;}
+			if(!yydate || yydate=='请选择服务时间 ' ){ app.error('请选择服务时间'); return;}
+			app.goto('/activity/yuyue/buy?prodata=' + prodata +'&yydate='+yydate);
+		},
+		
+	}
+
+};
+</script>
+<style>
+.follow_topbar {height:88rpx; width:100%;max-width:640px; background:rgba(0,0,0,0.8); position:fixed; top:0; z-index:13;}
+.follow_topbar .headimg {height:64rpx; width:64rpx; margin:6px; float:left;}
+.follow_topbar .headimg image {height:64rpx; width:64rpx;}
+.follow_topbar .info {height:56rpx; padding:16rpx 0;}
+.follow_topbar .info .i {height:28rpx; line-height:28rpx; color:#ccc; font-size:24rpx;}
+.follow_topbar .info {height:80rpx; float:left;}
+.follow_topbar .sub {height:48rpx; width:auto; background:#FC4343; padding:0 20rpx; margin:20rpx 16rpx 20rpx 0; float:right; font-size:24rpx; color:#fff; line-height:52rpx; border-radius:6rpx;}
+.qrcodebox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.qrcodebox .img{width:400rpx;height:400rpx}
+.qrcodebox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.qrcodebox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+.goback{ position: absolute; top:0 ;width:64rpx ; height: 64rpx;z-index: 10000; margin: 30rpx;}
+.goback img{ width:64rpx ; height: 64rpx;}
+
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:80rpx;}
+
+.provideo{background:rgba(255,255,255,0.7);width:160rpx;height:54rpx;padding:0 20rpx 0 4rpx;border-radius:27rpx;position:absolute;bottom:30rpx;left:50%;margin-left:-80rpx;display:flex;align-items:center;justify-content:space-between}
+.provideo image{width:50rpx;height:50rpx;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+
+.videobox{width:100%;height:750rpx;text-align:center;background:#000}
+.videobox .video{width:100%;height:650rpx;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx;}
+
+.header {padding: 20rpx 3%;background: #fff; width: 94%; border-radius:10rpx; margin: auto; margin-bottom: 20rpx; margin-top: -60rpx; position: relative;}
+.header .pricebox{ width: 100%;border:1px solid #fff; justify-content: space-between;}
+.header .pricebox .price{display:flex;align-items:flex-end}
+.header .pricebox .price .f1{font-size:36rpx;color:#51B539;font-weight:bold}
+.header .pricebox .price .f2{font-size:26rpx;color:#C2C2C2;text-decoration:line-through;margin-left:30rpx;padding-bottom:5px}
+.header .price_share{width:100%;height:100rpx;display:flex;align-items:center;justify-content:space-between}
+.header .price_share .share{display:flex;flex-direction:column;align-items:center;justify-content:center}
+.header .price_share .share .img{width:32rpx;height:32rpx;margin-bottom:2px}
+.header .price_share .share .txt{color:#333333;font-size:20rpx}
+.header .title {color:#000000;font-size:32rpx;line-height:42rpx;font-weight:bold;}
+.header .sellpoint{font-size:28rpx;color: #666;padding-top:20rpx;}
+.header .sales_stock{height:60rpx;line-height:60rpx;font-size:24rpx;color:#777777; }
+.header .commission{display:inline-block;margin-top:20rpx;margin-bottom:10rpx;border-radius:10rpx;font-size:20rpx;height:44rpx;line-height:44rpx;padding:0 20rpx}
+
+.choosebox{margin: auto;width: 94%; border-radius:10rpx; background: #fff;  }
+
+.choose{ display:flex;align-items:center;justify-content: center; margin: auto; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; border-bottom:1px solid #eee }
+.choose .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:30rpx;display:flex;justify-content:center;align-items:center}
+.choose .f2{ width: 32rpx; height: 32rpx;}
+
+
+.choosedate{ display:flex;align-items:center;ustify-content: center;   margin:auto; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; }
+.choosedate .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:30rpx;display:flex;justify-content:center;align-items:center}
+.choosedate .f2{ width: 32rpx; height: 32rpx;}
+
+.cuxiaodiv{background:#fff;margin-top:20rpx;}
+
+.fuwupoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.fuwupoint .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:30rpx;display:flex;justify-content:center;align-items:center}
+.fuwupoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.fuwupoint .f1 .t{ padding:4rpx 20rpx 4rpx 0;color:#777;flex-shrink:0}
+.fuwupoint .f1 .t:before{content: "";display: inline-block;vertical-align: middle;	margin-top: -4rpx;margin-right: 10rpx;	width: 24rpx;	height: 24rpx;	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;background-size: 24rpx auto;}
+.fuwupoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.fuwupoint .f2 .img{width:32rpx;height:32rpx;}
+.fuwudialog-content{font-size:24rpx}
+.fuwudialog-content .f1{color:#333;height:80rpx;line-height:80rpx;font-weight:bold}
+.fuwudialog-content .f1:before{content: "";display: inline-block;vertical-align: middle;	margin-top: -4rpx;margin-right: 10rpx;	width: 24rpx;	height: 24rpx;	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;background-size: 24rpx auto;}
+.fuwudialog-content .f2{color:#777}
+
+.cuxiaopoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.cuxiaopoint .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:20rpx;display:flex;justify-content:center;align-items:center}
+.cuxiaopoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.cuxiaopoint .f1 .t{margin-left:10rpx;border-radius:3px;font-size:24rpx;height:40rpx;line-height:40rpx;padding-right:10rpx;flex-shrink:0;overflow:hidden}
+.cuxiaopoint .f1 .t0{display:inline-block;padding:0 5px;}
+.cuxiaopoint .f1 .t1{padding:0 4px}
+.cuxiaopoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.cuxiaopoint .f2 .img{width:32rpx;height:32rpx;}
+.cuxiaodiv .cuxiaopoint{border-bottom:1px solid #E6E6E6;}
+.cuxiaodiv .cuxiaopoint:last-child{border-bottom:0}
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+.service-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.service-item .prefix{padding-top: 2px;}
+.service-item .suffix{padding-left: 10rpx;}
+.service-item .suffix .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx; width: 94%; margin: auto; border-radius: 10rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:40rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:90%;background:#fff;padding:0 3%;border-radius:10rpx;margin: auto;margin-top:20rpx; }
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{ width: 100%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:100rpx;padding:0 30rpx 0 10rpx;align-items:center;}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:50%;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tocart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold; background: #FD4A46; border-top-right-radius:20rpx;border-bottom-left-radius:20rpx;}
+.bottombar .cartnum{position:absolute;right:4rpx;top:-4rpx;color:#fff;border-radius:50%;width:32rpx;height:32rpx;line-height:32rpx;text-align:center;font-size:22rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+
+/*时间范围*/
+.datetab{ display: flex; border:1px solid red; width: 200rpx; text-align: center;}
+.order-tab{ }
+.order-tab2{display:flex;width:auto;min-width:100%}
+.order-tab2 .item{width:auto;font-size:28rpx;font-weight:bold;text-align: center; color:#999999;overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.order-tab2 .item .datetext{ line-height: 60rpx; height:60rpx;}
+.order-tab2 .item .datetext2{ line-height: 60rpx; height:60rpx;font-size: 22rpx;}
+.order-tab2 .on{color:#222222;}
+.order-tab2 .after{display:none;position:absolute;left:30%;margin-left:-10rpx;bottom:5rpx;height:6rpx;border-radius:1.5px;width:70rpx}
+.order-tab2 .on .after{display:block}
+.daydate{ padding:20rpx; flex-wrap: wrap; overflow-y: scroll; height:400rpx; }
+.daydate .date{ width:20%;text-align: center;line-height: 60rpx;height: 60rpx; margin-top: 30rpx;}
+.daydate .on{ background:red; color:#fff;}
+.daydate .hui{ border:1px solid #f0f0f0; background:#f0f0f0;border-radius: 5rpx;}
+.tobuy{flex:1;height: 72rpx; line-height: 72rpx; color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold;width:90%;margin:20rpx 5%;border-radius:36rpx;}
+
+.cuxiaopoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.cuxiaopoint .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:20rpx;display:flex;justify-content:center;align-items:center}
+.cuxiaopoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.cuxiaopoint .f1 .t{margin-left:10rpx;border-radius:3px;font-size:24rpx;height:40rpx;line-height:40rpx;padding-right:10rpx;flex-shrink:0;overflow:hidden}
+.cuxiaopoint .f1 .t0{display:inline-block;padding:0 5px;}
+.cuxiaopoint .f1 .t1{padding:0 4px}
+.cuxiaopoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.cuxiaopoint .f2 .img{width:32rpx;height:32rpx;}
+.cuxiaodiv .cuxiaopoint{border-bottom:1px solid #E6E6E6;}
+.cuxiaodiv .cuxiaopoint:last-child{border-bottom:0}
+
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/product2.vue b/activity/yuyue/product2.vue
new file mode 100644
index 0000000..80e80a2
--- /dev/null
+++ b/activity/yuyue/product2.vue
@@ -0,0 +1,621 @@
+<template>
+<view>
+	<block v-if="isload">
+		<block v-if="sysset.showgzts">
+			<view style="width:100%;height:88rpx"> </view>
+			<view class="follow_topbar">
+				<view class="headimg"><image :src="sysset.logo"/></view>
+				<view class="info">
+					<view class="i">欢迎进入 <text :style="{color:t('color1')}">{{sysset.name}}</text></view>
+					<view class="i">关注公众号享更多专属服务</view>
+				</view>
+				<view class="sub" @tap="showsubqrcode" :style="{'background-color':t('color1')}">立即关注</view>
+			</view>
+			<uni-popup id="qrcodeDialog" ref="qrcodeDialog" type="dialog">
+				<view class="qrcodebox">
+					<image :src="sysset.qrcode" @tap="previewImage" :data-url="sysset.qrcode" class="img"/>
+					<view class="txt">长按识别二维码关注</view>
+					<view class="close" @tap="closesubqrcode">
+						<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+					</view>
+				</view>
+			</uni-popup>
+		</block>
+
+		<!-- <view class="topbox"><image :src="event_rul +'/static/img/static/img/goback.png'" class="goback" /></view> -->
+		<view class="swiper-container" v-if="isplay==0" >
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="500000" @change="swiperChange">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="sysset.pic" mode="widthFix"/></view>
+					</swiper-item>
+			</swiper>
+		</view>
+	
+		<view class="header"> 
+			<view class="price_share">
+				<view class="title">{{product.name}}</view>
+				<view class="share" @tap="shareClick"><image class="img" :src="event_rul +'/static/img/static/img/share.png'"/><text class="txt">分享</text></view>
+			</view>
+			<view class="pricebox flex">
+				<view class="price">
+					<view class="f1" :style="{color:t('color1')}">
+						<text>{{product.price}}{{product.unit}}</text></text>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<view class="choosebox">
+			<view class="choosedate" @tap="chooseTime"  >
+				<view class="f0">服务时间</view>
+				<view class="f1 flex1">{{days}} {{selectDates}}</view>
+				<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="choosedate" @tap="chooseTime"  >
+				<view class="f0">服务时长</view>
+				<view class="f1 flex1">	<slider @change="sliderChange"  @changing="sliderChanging" class="slider" block-size="10"  :min="1" :max="10"  :value="currentnum" activeColor="#595959"  />
+				<text>{{currentnum}} {{product.unit}}</text></view>
+				<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+		
+		
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">服务详情</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+					<image  :src="sysset.detailpic" mode="widthFix"/>
+		</view>
+
+		<view style="width:100%;height:140rpx;"></view>
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':''">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="'prolist?bid=' + product.bid" >
+					<image class="img" :src="event_rul +'/static/img/static/img/shou.png'"/>
+					<view class="t1">首页</view>
+				</view>
+				<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+			
+			</view>
+			<view class="op">
+				<view class="tobuy flex-x-center flex-y-center" @tap="tobuy" :style="{background:t('color1')}" >立即预约</view>
+			</view>
+		</view>
+		<yybuydialog v-if="buydialogShow" :proid="product.id" :btntype="btntype"  @currgg="currgg" @buydialogChange="buydialogChange" :menuindex="menuindex" @addcart="addcart"></yybuydialog>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view v-if="timeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidetimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+						@tap.stop="hidetimeDialog" />
+				</view>
+				<view class="order-tab">
+					<view class="order-tab2">
+						<block v-for="(item, index) in datelist" :key="index">
+							<view  :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id" >
+								<view class="datetext">{{item.weeks}}</view>
+								<view class="datetext2">{{item.date}}</view>
+								<view class="after"  :style="{background:t('color1')}"></view>
+							</view>			
+						</block>
+				
+					</view>
+				</view>
+				<view class="flex daydate">
+					<block v-for="(item,index2) in timelist" :key="index2">
+						<view :class="'date ' + ((timeindex==index2 && item.status==1) ? 'on' : '') + (item.status==0 ?'hui' : '') "  @tap="switchDateTab" :data-index2="index2" :data-status="item.status" :data-time="item.timeint"> {{item.time}}</view>						
+					</block>
+				</view>
+				<view class="op">
+					<button class="tobuy on" :style="{backgroundColor:t('color1')}" @tap="selectDate" >确 定</button>
+				</view>
+			</view>
+		</view>
+	
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+			textset:{},
+			isload:false,
+			buydialogShow: false,
+			btntype:1,
+			isfavorite: false,
+			current: 0,
+			isplay: 0,
+			product: [],
+			pagecontent: "",
+			shopset: {},
+			sysset:{},
+			title: "",
+			sharepic: "",
+			sharetypevisible: false,
+			showposter: false,
+			posterpic: "",
+			scrolltopshow: false,
+			kfurl:'',
+			timeDialogShow: false,
+			datelist:[],
+			daydate:[],
+			curTopIndex: 0,
+			index:0,
+			day: -1,
+			days:'请选择服务时间',
+			dates:'',
+			timeindex:-1,
+			startTime:0,
+			selectDates:'',
+			timelist:[],
+			currenttime:'',
+			currentnum:1,
+			num:'',
+			
+			event_rul: app.globalData.event_url,
+		};
+	},
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.product.name,pic:this.product.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+	onUnload: function () {
+		clearInterval(interval);
+	},
+
+	methods: {
+		getdata:function(){
+			var that = this;
+			var skillid = this.opt.skillid || 0;
+			var masterid = this.opt.masterid || 0;
+			that.masterid = masterid
+			that.skillid = skillid
+			that.loading = true;
+			app.get('ApiYuyue2/product', {skillid: skillid,masterid:masterid}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+		
+				that.textset = app.globalData.textset;
+				var product = res.product;
+				that.product = product;
+				var sysset = res.sysset;
+				that.sysset = sysset;
+				that.title = product.name;
+				that.sharepic = sysset.pic;
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+				that.datelist = res.datelist;
+				that.daydate = res.daydate;
+				that.kfurl = '/pages/kefu/index?bid='+product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+
+				that.loaded({title:product.name,pic:sysset.pic});
+			});
+		},
+		swiperChange: function (e) {
+			var that = this;
+			that.current = e.detail.current
+		},
+		payvideo: function () {
+			this.isplay = 1;
+			uni.createVideoContext('video').play();
+		},
+		parsevideo: function () {
+			this.isplay = 0;
+			uni.createVideoContext('video').stop();
+		},
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.btntype = e.currentTarget.dataset.btntype;
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+		switchTopTab: function (e) {
+		  var that = this;
+		  var id = e.currentTarget.dataset.id;
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  this.curTopIndex = index;
+		  that.days = that.datelist[index].date
+		  that.nowdate = that.datelist[index].nowdate
+		   // if(!that.dates ){ that.dates = that.daydate[0] }
+		  this.curIndex = -1;
+		  this.curIndex2 = -1;
+		  //检测预约时间是否可预约
+		  that.loading = true;
+		  app.get('ApiYuyue2/isgetTime', { date: that.days}, function (res) {
+			  that.loading = false;
+			  that.timelist = res.data;
+		  })
+			
+		},
+		switchDateTab: function (e) {
+		  var that = this;
+		  var index2 = parseInt(e.currentTarget.dataset.index2);
+		  var timeint = e.currentTarget.dataset.time
+		  var status = e.currentTarget.dataset.status
+		  if(status==0){
+			app.error('此时间不可选择');return;	
+		  }
+		  that.timeint = timeint
+		  that.timeindex = index2
+			//console.log(that.timelist);
+		  that.starttime1 = that.timelist[index2].time
+		  if(!that.days || that.days=='请选择服务时间'){ that.days = that.datelist[0].date }
+		  that.selectDates = that.starttime1;
+		},
+		selectDate:function(e){
+			var that=this
+			//console.log(that.starttime1);
+			if(that.timelist[that.timeindex].status==0){
+					that.starttime1='';
+			}
+			if(!that.starttime1){
+				app.error('请选择预约时间');return;
+			}
+			 this.timeDialogShow = false;
+		},
+		shareClick: function () {
+			this.sharetypevisible = true;
+		},
+		handleClickMask: function () {
+			this.sharetypevisible = false
+		},
+		showPoster: function () {
+			var that = this;
+			that.showposter = true;
+			that.sharetypevisible = false;
+			app.showLoading('生成海报中');
+			app.post('ApiYuyue2/getposter', {proid: that.product.id}, function (data) {
+				app.showLoading(false);
+				if (data.status == 0) {
+					app.alert(data.msg);
+				} else {
+					that.posterpic = data.poster;
+				}
+			});
+		},
+		
+		posterDialogClose: function () {
+			this.showposter = false;
+		},
+		onPageScroll: function (e) {
+			var that = this;
+			var scrollY = e.scrollTop;     
+			if (scrollY > 200) {
+				that.scrolltopshow = true;
+			}
+			if(scrollY < 150) {
+				that.scrolltopshow = false
+			}
+		},	
+		
+		//选择时间 
+		chooseTime: function(e) {
+			var that = this;
+			that.timeDialogShow = true;
+			that.timeIndex = -1;
+			var curTopIndex = that.datelist[0];
+			that.nowdate = that.datelist[that.curTopIndex].date;
+			that.loading = true;
+			app.get('ApiYuyue2/isgetTime', { date: that.nowdate,proid:this.opt.id}, function (res) {
+			  that.loading = false;
+			  that.timelist = res.data;
+			})
+			
+		},	
+		hidetimeDialog: function() {
+			this.timeDialogShow = false;
+		},
+		
+		showfuwudetail: function () {
+			this.showfuwudialog = true;
+		},
+		hidefuwudetail: function () {
+			this.showfuwudialog = false
+		},
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			that.sharetypevisible = false;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/activity/yuyue/product2?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/activity/yuyue/product2'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		},
+		// 拖动进度条
+		sliderChange(data) {
+			var that=this;
+			that.currentnum = data.detail.value;
+		},
+		//拖动中
+		sliderChanging(data) {	
+			this.currentnum = data.detail.value	
+			console.log(this.currentnum);	
+		},
+		showsubqrcode:function(){
+			this.$refs.qrcodeDialog.open();
+		},
+		closesubqrcode:function(){
+			this.$refs.qrcodeDialog.close();
+		},
+		tobuy: function (e) {
+			var that = this;
+			var ks = that.ks;
+			var id = that.product.firstCategoryId;
+			var subid = that.product.secondCategoryId;
+			var num = that.currentnum;
+			var yydate = that.days+' '+that.selectDates
+			var prodata = that.skillid + ',' + that.masterid + ',' + num;
+			if(!yydate || yydate=='请选择服务时间 ' ){ app.error('请选择服务时间'); return;}
+			app.goto('/activity/yuyue/buy2?prodata=' + prodata +'&yydate='+yydate);
+		},
+		
+	}
+
+};
+</script>
+<style>
+.follow_topbar {height:88rpx; width:100%;max-width:640px; background:rgba(0,0,0,0.8); position:fixed; top:0; z-index:13;}
+.follow_topbar .headimg {height:64rpx; width:64rpx; margin:6px; float:left;}
+.follow_topbar .headimg image {height:64rpx; width:64rpx;}
+.follow_topbar .info {height:56rpx; padding:16rpx 0;}
+.follow_topbar .info .i {height:28rpx; line-height:28rpx; color:#ccc; font-size:24rpx;}
+.follow_topbar .info {height:80rpx; float:left;}
+.follow_topbar .sub {height:48rpx; width:auto; background:#FC4343; padding:0 20rpx; margin:20rpx 16rpx 20rpx 0; float:right; font-size:24rpx; color:#fff; line-height:52rpx; border-radius:6rpx;}
+.qrcodebox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.qrcodebox .img{width:400rpx;height:400rpx}
+.qrcodebox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.qrcodebox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+.goback{ position: absolute; top:0 ;width:64rpx ; height: 64rpx;z-index: 10000; margin: 30rpx;}
+.goback img{ width:64rpx ; height: 64rpx;}
+
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:80rpx;}
+
+.provideo{background:rgba(255,255,255,0.7);width:160rpx;height:54rpx;padding:0 20rpx 0 4rpx;border-radius:27rpx;position:absolute;bottom:30rpx;left:50%;margin-left:-80rpx;display:flex;align-items:center;justify-content:space-between}
+.provideo image{width:50rpx;height:50rpx;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+
+.videobox{width:100%;height:750rpx;text-align:center;background:#000}
+.videobox .video{width:100%;height:650rpx;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx;}
+
+.header {padding: 20rpx 3%;background: #fff; width: 94%; border-radius:10rpx; margin: auto; margin-bottom: 20rpx; margin-top: -60rpx; position: relative;}
+.header .pricebox{ width: 100%;border:1px solid #fff; justify-content: space-between;}
+.header .pricebox .price{display:flex;align-items:flex-end}
+.header .pricebox .price .f1{font-size:36rpx;color:#51B539;font-weight:bold}
+.header .pricebox .price .f2{font-size:26rpx;color:#C2C2C2;text-decoration:line-through;margin-left:30rpx;padding-bottom:5px}
+.header .price_share{width:100%;height:100rpx;display:flex;align-items:center;justify-content:space-between}
+.header .price_share .share{display:flex;flex-direction:column;align-items:center;justify-content:center}
+.header .price_share .share .img{width:32rpx;height:32rpx;margin-bottom:2px}
+.header .price_share .share .txt{color:#333333;font-size:20rpx}
+.header .title {color:#000000;font-size:32rpx;line-height:42rpx;font-weight:bold;}
+.header .sellpoint{font-size:28rpx;color: #666;padding-top:20rpx;}
+.header .sales_stock{height:60rpx;line-height:60rpx;font-size:24rpx;color:#777777; }
+.header .commission{display:inline-block;margin-top:20rpx;margin-bottom:10rpx;border-radius:10rpx;font-size:20rpx;height:44rpx;line-height:44rpx;padding:0 20rpx}
+
+.choosebox{margin: auto;width: 94%; border-radius:10rpx; background: #fff;  }
+
+.choose{ display:flex;align-items:center;justify-content: center; margin: auto; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; border-bottom:1px solid #eee }
+.choose .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:30rpx;display:flex;justify-content:center;align-items:center}
+.choose .f2{ width: 32rpx; height: 32rpx;}
+
+
+.choosedate{ display:flex;align-items:center;ustify-content: center;   margin:auto; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; }
+.choosedate .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:30rpx;display:flex;justify-content:center;align-items:center}
+.choosedate .f2{ width: 32rpx; height: 32rpx;}
+
+.cuxiaodiv{background:#fff;margin-top:20rpx;}
+
+.fuwupoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.fuwupoint .f0{color:#555;font-weight:bold;height:32rpx;font-size:24rpx;padding-right:30rpx;display:flex;justify-content:center;align-items:center}
+.fuwupoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.fuwupoint .f1 .t{ padding:4rpx 20rpx 4rpx 0;color:#777;flex-shrink:0}
+.fuwupoint .f1 .t:before{content: "";display: inline-block;vertical-align: middle;	margin-top: -4rpx;margin-right: 10rpx;	width: 24rpx;	height: 24rpx;	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;background-size: 24rpx auto;}
+.fuwupoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.fuwupoint .f2 .img{width:32rpx;height:32rpx;}
+.fuwudialog-content{font-size:24rpx}
+.fuwudialog-content .f1{color:#333;height:80rpx;line-height:80rpx;font-weight:bold}
+.fuwudialog-content .f1:before{content: "";display: inline-block;vertical-align: middle;	margin-top: -4rpx;margin-right: 10rpx;	width: 24rpx;	height: 24rpx;	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;background-size: 24rpx auto;}
+.fuwudialog-content .f2{color:#777}
+
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+.service-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.service-item .prefix{padding-top: 2px;}
+.service-item .suffix{padding-left: 10rpx;}
+.service-item .suffix .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx; width: 94%; margin: auto; border-radius: 10rpx;}
+.detail image{ width: 100%; height: 100%;}
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:40rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+
+.bottombar{ width: 100%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:100rpx;padding:0 30rpx 0 10rpx;align-items:center;}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:50%;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tocart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold; background: #FD4A46; border-top-right-radius:20rpx;border-bottom-left-radius:20rpx;}
+.bottombar .cartnum{position:absolute;right:4rpx;top:-4rpx;color:#fff;border-radius:50%;width:32rpx;height:32rpx;line-height:32rpx;text-align:center;font-size:22rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+
+/*时间范围*/
+.datetab{ display: flex; border:1px solid red; width: 200rpx; text-align: center;}
+.order-tab{ }
+.order-tab2{display:flex;width:auto;min-width:100%}
+.order-tab2 .item{width:auto;font-size:28rpx;font-weight:bold;text-align: center; color:#999999;overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.order-tab2 .item .datetext{ line-height: 60rpx; height:60rpx;}
+.order-tab2 .item .datetext2{ line-height: 60rpx; height:60rpx;font-size: 22rpx;}
+.order-tab2 .on{color:#222222;}
+.order-tab2 .after{display:none;position:absolute;left:30%;margin-left:-10rpx;bottom:5rpx;height:6rpx;border-radius:1.5px;width:70rpx}
+.order-tab2 .on .after{display:block}
+.daydate{ padding:20rpx; flex-wrap: wrap; overflow-y: scroll; height:400rpx; }
+.daydate .date{ width:20%;text-align: center;line-height: 60rpx;height: 60rpx; margin-top: 30rpx;}
+.daydate .on{ background:red; color:#fff;}
+.daydate .hui{ border:1px solid #f0f0f0; background:#f0f0f0;border-radius: 5rpx;}
+.tobuy{flex:1;height: 72rpx; line-height: 72rpx; color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold;width:90%;margin:20rpx 5%;border-radius:36rpx;}
+
+.slider{  width: 340rpx; position: relative; margin-top: 25rpx;  color: black; float: left;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/prolist.vue b/activity/yuyue/prolist.vue
new file mode 100644
index 0000000..95c21e7
--- /dev/null
+++ b/activity/yuyue/prolist.vue
@@ -0,0 +1,312 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view @tap.stop="goto" data-url="search" class="search-container">
+			<view class="search-box">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<view class="search-text">搜索感兴趣的商品</view>
+			</view>
+		</view>
+		<view class="content-container">
+			<view class="nav_left">
+				<view :class="'nav_left_items ' + (curIndex == -1 ? 'active' : '')" @tap="switchRightTab" data-index="-1" data-id="0"><view class="before" :style="{background:t('color1')}"></view>全部</view>
+				<block v-for="(item, index) in clist" :key="index">
+					<view :class="'nav_left_items ' + (curIndex == index ? 'active' : '')" @tap="switchRightTab" :data-index="index" :data-id="item.id"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+				</block>
+			</view>
+			<view class="nav_right">
+				<view class="nav_right-content">
+					<view class="classify-ul" v-if="curIndex>-1 && clist[curIndex].child.length>0">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <view class="classify-li" :style="curIndex2==-1?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeCTab" :data-id="clist[curIndex].id" data-index="-1">全部</view>
+						 <block v-for="(item, idx2) in clist[curIndex].child" :key="idx2">
+						 <view class="classify-li" :style="curIndex2==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeCTab" :data-id="item.id" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<scroll-view class="classify-box" scroll-y="true" @scrolltolower="scrolltolower">
+						<view class="product-itemlist">
+							<view class="item" v-for="(item,index) in datalist" :key="item.id" @click="goto" :data-url="'product?id='+item.id">
+								<view class="product-pic">
+									<image class="image" :src="item.pic" mode="widthFix"/>
+								</view>
+								<view class="product-info">
+									<view class="p1"><text>{{item.name}}</text></view>
+									<view class="p2">
+										<text class="t1" :style="{color:t('color1')}">{{item.sell_price}}<text style="font-size:24rpx;padding-left:2px">元/{{item.danwei}}</text></text>
+										<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+									</view>
+									<view class="p3">
+										<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+									</view>
+							
+								</view>
+							</view>
+						</view>
+						<nomore text="没有更多商品了" v-if="nomore"></nomore>
+						<nodata text="暂无相关商品" v-if="nodata"></nodata>
+						<view style="width:100%;height:100rpx"></view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+	</block>
+	<loading v-if="loading" loadstyle="left:62.5%"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+
+
+			pagenum: 1,
+
+			nomore: false,
+			nodata: false,
+
+			order: '',
+
+			field: '',
+
+			clist: [],
+
+			curIndex: -1,
+
+			curIndex2: -1,
+
+			datalist: [],
+
+			nodata: false,
+
+			curCid: 0,
+			proid:0,
+
+			buydialogShow: false,
+
+			event_rul: app.globalData.event_url,
+
+		};
+
+	},
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			var nowcid = that.opt.cid;
+			if (!nowcid) nowcid = '';
+			var bid = that.opt.bid ? that.opt.bid : '';
+			that.pagenum = 1;
+			that.datalist = [];
+			app.get('ApiYuyue/classify', {cid:nowcid,bid:bid}, function (res) {
+			  var clist = res.data;
+			  that.clist = clist;
+			  if (nowcid) {
+			    for (var i = 0; i < clist.length; i++) {
+			      if (clist[i]['id'] == nowcid) {
+			        that.curIndex = i;
+			        that.curCid = nowcid;
+			      }
+			      var downcdata = clist[i]['child'];
+			      var isget = 0;
+			      for (var j = 0; j < downcdata; j++) {
+			        if (downcdata[j]['id'] == nowcid) {
+			          that.curIndex = i;
+			          that.curIndex2 = j;
+			          that.curCid = nowcid;
+			          isget = 1;
+			          break;
+			        }
+			      }
+			      if (isget) break;
+			    }
+			  }
+				that.loaded();
+				that.getdatalist();
+			});
+		},
+ 
+		getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+
+			var that = this;
+     
+			var pagenum = that.pagenum;
+   
+			var cid = that.curCid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var order = that.order;
+    
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			app.post('ApiYuyue/getprolist', {pagenum: pagenum,field: field,order: order,cid: cid,bid:bid}, function (res) { 
+				that.loading = false;
+
+				uni.stopPullDownRefresh();
+
+				var data = res.data;
+				if (data.length == 0) {
+					if(pagenum == 1){
+						that.nodata = true;
+					}else{
+						that.nomore = true;
+					}
+				}
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+			});
+ 
+		},
+   
+		scrolltolower: function () {
+     
+			if (!this.nomore) {
+   
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+ 
+			}
+ 
+		},
+    
+		//改变子分类
+    
+		changeCTab: function (e) {
+    
+			var that = this;
+
+			var id = e.currentTarget.dataset.id;
+			var index = parseInt(e.currentTarget.dataset.index);
+
+			this.curIndex2 = index;
+			this.nodata = false;
+
+			this.curCid = id;
+
+			this.pagenum = 1;
+
+			this.datalist = [];
+
+			this.nomore = false;
+
+			this.getdatalist();
+
+		},
+    
+		//改变排序规则
+
+		changeOrder: function (e) {
+    
+			var t = e.currentTarget.dataset;
+  
+			this.field = t.field; 
+			this.order = t.order;
+ 
+			this.pagenum = 1;
+			this.datalist = []; 
+			this.nomore = false;
+			
+this.getdatalist();
+  
+		},
+   
+		//事件处理函数
+ 
+		switchRightTab: function (e) {
+  
+			var that = this;
+    
+			var id = e.currentTarget.dataset.id;
+   
+			var index = parseInt(e.currentTarget.dataset.index);
+  
+			this.curIndex = index;
+			this.curIndex2 = -1;
+			this.nodata = false;
+			this.curCid = id
+;
+			this.pagenum = 1; 
+			this.datalist = [];
+			this.nomore = false;
+  
+			this.getdatalist();
+ 
+		}
+,
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+	}
+
+};
+</script>
+<style>
+page {height:100%;}
+.container{width: 100%;height:100%;max-width:640px;background-color: #fff;color: #939393;display: flex;flex-direction:column}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.content-container{flex:1;height:100%;display:flex;overflow: hidden;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 0 20rpx}
+.nav_right-content{background: #ffffff;padding:0 20rpx;height:100%}
+.nav-pai{ width: 100%;display:flex;align-items:center;justify-content:center;}
+.nav-paili{flex:1; text-align:center;color:#323232; font-size:28rpx;font-weight:bold;position: relative;height:80rpx;line-height:80rpx;}
+.nav-paili .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.nav-paili .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+
+.classify-ul{width:100%;height:100rpx;padding:0 10rpx;}
+.classify-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:22rpx;color:#6C737F;font-size:20rpx;text-align: center;height:44rpx; line-height:44rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+.classify-box{padding: 0 0 20rpx 0;width: 100%;height:calc(100% - 60rpx);overflow-y: scroll; border-top:1px solid #F5F6F8;}
+.classify-box .nav_right_items{ width:100%;border-bottom:1px #f4f4f4 solid;  padding:16rpx 0;  box-sizing:border-box;  position:relative; }
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:14rpx 0;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:60rpx}
+.product-itemlist .product-info .p2{margin-top:10rpx;height:36rpx;line-height:36rpx;overflow:hidden;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/refund.vue b/activity/yuyue/refund.vue
new file mode 100644
index 0000000..03de7bb
--- /dev/null
+++ b/activity/yuyue/refund.vue
@@ -0,0 +1,85 @@
+<template>
+<view class="container">
+	<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-item">
+			<text class="label">退款原因</text>
+			<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+		</view>
+		<view class="form-item">
+			<text class="label">退款金额(元)</text>
+			<view class="flex"><input name="money" type="number" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+		</view>
+		<button class="ref-btn" form-type="submit" :style="{background:t('color1')}">确定</button>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: '',
+      totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+		var that = this;
+		that.orderid = that.opt.orderid;
+		that.totalprice = that.opt.price;
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+
+  methods: {
+    formSubmit: function (e) {
+      //console.log(e);return;
+      var that = this;
+      var orderid = that.orderid;
+	  console.log(orderid);
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+
+      if (money <= 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiYuyue/refund', {orderid: orderid,reason: reason,money: money}, function (data) {
+				app.showLoading(false);
+        app.alert(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 1000);
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-item{ width:100%;background: #fff; padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #eee solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.ref-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; text-align: center; color: #fff; font-size: 16px; border-radius: 8px;border: none; background: #ff8758; }
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/search.vue b/activity/yuyue/search.vue
new file mode 100644
index 0000000..3b72a91
--- /dev/null
+++ b/activity/yuyue/search.vue
@@ -0,0 +1,286 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container" :style="history_show?'height:100%;':''">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<text class="iconfont icon-search"></text>
+					<input :value="keyword" placeholder="商品搜索..." placeholder-style="font-size:24rpx;color:#FFFFFF" @confirm="searchConfirm" @input="searchChange" />
+				</view>
+				<view class="search-btn" @tap="searchbtn">
+					<text class="iconfont icon-pailie" v-if="!history_show && productlisttype=='itemlist'"></text>
+					<text class="iconfont icon-shipailie" v-if="!history_show && productlisttype=='item2'"></text>
+					<text v-if="history_show">搜索</text>
+				</view>
+			</view>
+			<view class="search-history" v-show="history_show">
+				<view>
+					<text class="search-history-title">最近搜索</text>
+					<view class="delete-search-history" @tap="deleteSearchHistory">
+						<image :src="event_rul +'/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+					</view>
+				</view>
+				<view class="search-history-list">
+					<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+					</view>
+					<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul +'/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+				</view>
+			</view>
+		</view>
+		<view class="product-container">
+			<block v-if="datalist && datalist.length>0">
+				<dp-yuyue-item v-if="productlisttype=='item2'" :data="datalist"></dp-yuyue-item>
+				<dp-yuyue-itemlist v-if="productlisttype=='itemlist'" :data="datalist"></dp-yuyue-itemlist>
+			</block>
+			<nomore text="没有更多商品了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: true,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: true,
+		order: '',
+		field:'',
+		oldcid: "",
+		catchecid: "",
+		catchegid: "",
+		cid: "",
+		gid: '',
+		clist: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		this.keyword = this.opt.keyword || '';
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用商品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list');
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getprolist();
+    }
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			app.get('ApiYuyue/prolist', {cid: cid,gid: gid}, function (res) {
+			  that.clist = res.clist;
+			  that.glist = res.glist;
+				that.loaded();
+				console.log(that.keyword)
+				if(that.keyword){
+					//that.getprolist();
+				}
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiYuyue/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cpid:cpid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    }
+  }
+};
+</script>
+<style lang="scss">
+.container {background: #F5F5F5;height: 100vh;}
+.search-container {position: fixed;width: 100%;z-index:9;top:var(--window-top);background: #0A5D3B;}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height: 80rpx;border-radius: 40rpx;border: 0;background: rgba(255,255,255,.3);flex:1;padding: 0 28rpx;}
+.topsearch .f1 .icon-search{font-size: 40rpx;margin-right: 16rpx;color:#FFFFFF;}
+.topsearch .f1 input{height: 100%;flex: 1;font-size: 28rpx;color:#FFFFFF;}
+.topsearch .search-btn{
+	display:flex;align-items:center;color:#FFFFFF;text-align:center;margin-left:20rpx;
+	.iconfont {font-size:40rpx;}
+}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.product-container {width: 100%;font-size:26rpx;padding:145rpx 24rpx 0;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/selectpeople.vue b/activity/yuyue/selectpeople.vue
new file mode 100644
index 0000000..d69ff12
--- /dev/null
+++ b/activity/yuyue/selectpeople.vue
@@ -0,0 +1,102 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view v-for="(item, index) in datalist" :key="index" class="content flex" @tap.stop="setdefault" :data-id="item.id" :data-yystatus='item.yystatus'>
+			<view class="f1">
+				<view class="headimg"><image :src="item.headimg" /></view>
+				<view class="text1">	
+					<text class="t1">{{item.realname}} </text>
+					<text class="t2">{{item.typename}}</text>
+					<view class="text2">{{item.jineng}}</view>
+				</view>
+				
+			</view>
+			<view :class="'yuyue '+ (item.yystatus==-1?'hui':'')" >预约</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<view style="height:140rpx"></view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      datalist: [],
+      type: "",
+			keyword:'',
+			nodata:false,
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.yydate = opt.yydate
+		this.prodata = opt.prodata;
+		this.type = this.opt.type || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			that.nodata = false;
+			app.get('ApiYuyue/selectpeople', {yydate:that.yydate,keyword:that.keyword,prodata:that.prodata}, function (res) {
+				that.loading = false;
+				var datalist = res.data;
+				that.datalist = datalist;
+				if (datalist.length == 0) {
+					that.nodata = true;
+				}
+				that.loaded();
+			});
+		},
+    //选择人员
+    setdefault: function (e) {
+      var that = this;
+      var fromPage = this.opt.fromPage;
+      var Id = e.currentTarget.dataset.id;
+	  if(e.currentTarget.dataset.yystatus==-1){
+			app.error('此时间不可预约');return
+	  }
+      app.goto('/activity/yuyue/buy?prodata='+that.prodata+'&yydate='+that.yydate+'&worker_id=' + Id);
+    },
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:20rpx 40rpx; justify-content: space-between;}
+.content .f1{display:flex;align-items:center}
+.content .f1 image{ width: 80rpx; height: 80rpx;}
+.content .f1 .t1{color:#2B2B2B;font-weight:bold;font-size:30rpx;margin-left:10rpx;}
+.content .f1 .t2{color:#999999;font-size:28rpx; background: #E8E8F7;color:#7A83EC; margin-left: 10rpx; padding:3rpx 20rpx; font-size: 20rpx; border-radius: 18rpx;}
+.content .f1 .t3{ margin-left:10rpx;display: block; height: 40rpx;line-height: 40rpx}
+.content .f2{color:#2b2b2b;font-size:26rpx;line-height:42rpx;padding-bottom:20rpx;}
+.content .f3{height:96rpx;display:flex;align-items:center}
+.content .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;}
+.content .radio .radio-img{width:100%;height:100%}
+.content .mrtxt{color:#2B2B2B;font-size:26rpx;margin-left:10rpx}
+
+
+.text2{ margin-left: 10rpx; color:#999999; font-size: 20rpx;}
+.yuyue{ background: #7A83EC; height: 40rpx; line-height: 40rpx; padding: 0 10rpx; color:#fff; border-radius:28rpx; width: 80rpx; font-size: 20rpx; text-align: center; margin-top: 20rpx;}
+.yuyue.hui{  background: #bbb; }
+.container .btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/setaliaccount.vue b/activity/yuyue/setaliaccount.vue
new file mode 100644
index 0000000..01ce7ce
--- /dev/null
+++ b/activity/yuyue/setaliaccount.vue
@@ -0,0 +1,73 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入支付宝账号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="aliaccount" value=""></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+		//this.getdata();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var aliaccount = formdata.aliaccount
+      if (aliaccount == '') {
+        app.alert('请输入支付宝账号');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {aliaccount:aliaccount}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/setinfo.vue b/activity/yuyue/setinfo.vue
new file mode 100644
index 0000000..9f0bc1c
--- /dev/null
+++ b/activity/yuyue/setinfo.vue
@@ -0,0 +1,159 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<text class="label">微信号</text>
+				<input type="text" class="input" placeholder="请输入微信号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="weixin" :value="userinfo.weixin"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">支付宝账号</text>
+				<input type="text" class="input" placeholder="请输入支付宝账号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="aliaccount" :value="userinfo.aliaccount"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+					<text class="label">开户行</text>
+					<picker class="picker" mode="selector" name="bankname" value="0" :range="banklist" @change="bindBanknameChange">
+						<view v-if="bankname">{{bankname}}</view>
+						<view v-else>请选择开户行</view>
+					</picker>
+			</view>
+			<view class="form-item">
+					<text class="label">持卡人姓名</text>
+					<input type="text" class="input" placeholder="请输入持卡人姓名" name="bankcarduser" :value="userinfo.bankcarduser" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+			<view class="form-item">
+					<text class="label">银行卡号</text>
+					<input type="text" class="input" placeholder="请输入银行卡号" name="bankcardnum" :value="userinfo.bankcardnum" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">短信验证码</text>
+				<input type="text" class="input" placeholder="请输入短信验证码" placeholder-style="color:#BBBBBB;font-size:28rpx" name="code" value=""/>
+				<view class="code" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			smsdjs:'',
+      banklist: ['工商银行', '农业银行', '中国银行', '建设银行', '招商银行', '邮储银行', '交通银行', '浦发银行', '民生银行', '兴业银行', '平安银行', '中信银行', '华夏银行', '广发银行', '光大银行', '北京银行', '宁波银行'],
+      bankname: '',
+			userinfo:{},
+			textset:{},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.isload = true
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiYuyueWorker/set', {}, function (data) {
+				that.loading = false;
+				that.userinfo = data.userinfo;
+				that.bankname = data.userinfo.bankname;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var bankname = this.bankname
+			var bankcarduser = formdata.bankcarduser
+			var bankcardnum = formdata.bankcardnum
+			var weixin = formdata.weixin
+			var aliaccount = formdata.aliaccount
+			var code = formdata.code || ''
+      if (bankname == '') {
+        app.alert('请选择开户行');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiYuyueWorker/set", {bankname:bankname,bankcarduser:bankcarduser,bankcardnum:bankcardnum,weixin:weixin,aliaccount:aliaccount,code:code}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    bindBanknameChange: function (e) {
+      this.bankname = this.banklist[e.detail.value];
+    },
+    smscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var tel = that.userinfo.tel;
+      if (tel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(tel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: tel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);
+        }
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 0;flex:1;color: #000;}
+.form-item .code{color:#06A051}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%)}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/setpwd.vue b/activity/yuyue/setpwd.vue
new file mode 100644
index 0000000..8054538
--- /dev/null
+++ b/activity/yuyue/setpwd.vue
@@ -0,0 +1,110 @@
+<template>
+<view class="addressadd">
+	<block v-if="isload">
+	<form id="setform" @submit="confirm">
+		<view class="form">
+			<view class="form-item">
+				<label class="label">登录账户</label>
+				<view class="f2 flex flex1">{{user.un}}</view>
+			</view>
+			<view class="form-item">
+				<label class="label">原 密 码</label>
+				<view class="f2 flex flex1">
+					<input type="text" password="true" name="oldpwd" value="" placeholder="请输入原密码" placeholder-style="font-size:28rpx" autocomplete="off"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<label class="label">新 密 码</label>
+				<view class="f2 flex flex1">
+					<input type="text" password="true" name="pwd" value="" placeholder="请输入新密码" placeholder-style="font-size:28rpx" autocomplete="off"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<label class="label">确认密码</label>
+				<view class="f2 flex flex1">
+					<input type="text" password="true" name="repwd" value="" placeholder="请再次输入密码" placeholder-style="font-size:28rpx" autocomplete="off"></input>
+				</view>
+			</view>
+		</view>
+		<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">确定修改</button>
+	</form>
+	</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+
+      user: [],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiYuyueWorker/setpwd', {}, function (res) {
+				that.loading = false;
+				that.user = res.user;
+				that.loaded();
+			});
+		},
+    confirm: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+      var oldpwd = formdata.oldpwd;
+      var pwd = formdata.pwd;
+      var repwd = formdata.repwd;
+
+      if(!oldpwd){
+        app.error('请输入原密码');
+        return;
+      }
+      if(!pwd){
+        app.error('请输入新密码');
+        return;
+      }
+      if(!repwd){
+        app.error('请再次输入新密码');
+        return;
+      }
+      if(pwd != repwd){
+        app.error('两次新密码输入不一致');
+        return;
+      }
+			app.showLoading('修改中');
+      app.post('ApiYuyueWorker/setpwd',{oldpwd: oldpwd,pwd: pwd,repwd: repwd},function(res){
+				app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('my');
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{ color:#8B8B8B;font-weight:bold;height: 60rpx; line-height: 60rpx; text-align:left;width:200rpx;padding-right:20rpx}
+.form-item .input{ flex:1;height: 60rpx; line-height: 60rpx;text-align:right}
+
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/setweixin.vue b/activity/yuyue/setweixin.vue
new file mode 100644
index 0000000..dac5c5a
--- /dev/null
+++ b/activity/yuyue/setweixin.vue
@@ -0,0 +1,72 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入微信号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="weixin" value=""></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+		//this.getdata();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var weixin = formdata.weixin
+      if (weixin == '') {
+        app.alert('请输入微信号');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {weixin:weixin}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/activity/yuyue/withdraw.vue b/activity/yuyue/withdraw.vue
new file mode 100644
index 0000000..580e7d5
--- /dev/null
+++ b/activity/yuyue/withdraw.vue
@@ -0,0 +1,193 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		<view class="mymoney" :style="{background:'#06A051'}">
+			<view class="f1">可提现余额</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.money}}</view>
+			<view class="f3" @tap="goto" data-url="moneylog?st=2"><text>提现记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">提现金额(元)</view></view>
+			<view class="item3"><view class="f1">￥</view><view class="f2"><input class="input" type="digit" name="money" value="" placeholder="请输入提现金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput"/></view></view>
+			<view class="item4" v-if="sysset.withdrawfee>0 || sysset.withdrawmin>0">
+				<text v-if="sysset.withdrawmin>0" style="margin-right:10rpx">最低提现金额{{sysset.withdrawmin}}元 </text>
+				<text v-if="sysset.withdrawfee>0">提现手续费{{sysset.withdrawfee}}% </text>
+			</view>
+		</view>
+		<view class="withdrawtype">
+			<view class="f1">选择提现方式：</view>
+			<view class="f2">
+				<view class="item" v-if="sysset.withdraw_weixin==1" @tap.stop="changeradio" data-paytype="微信钱包">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信钱包</view>
+					<view class="radio" :style="paytype=='微信钱包' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</view>
+				<label class="item" v-if="sysset.withdraw_aliaccount==1" @tap.stop="changeradio" data-paytype="支付宝">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝</view>
+					<view class="radio" :style="paytype=='支付宝' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+				<label class="item" v-if="sysset.withdraw_bankcard==1" @tap.stop="changeradio" data-paytype="银行卡">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-cash.png'"/>银行卡</view>
+					<view class="radio" :style="paytype=='银行卡' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:'#06A051'}">立即提现</button>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo: [],
+		sysset: false,
+		paytype: '微信钱包',
+		show: 0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onShow: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiYuyueWorker/withdraw', {}, function (res) {
+				that.loading = false;
+				that.userinfo = res.userinfo;
+				that.sysset = res.sysset;
+				var sysset = res.sysset;
+				var paytype = '微信钱包';
+				if (sysset.withdraw_weixin == 1) {
+					paytype = '微信钱包';
+				}
+				if (!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) {
+					paytype = '支付宝';
+				}
+				if ((!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) && (!sysset.withdraw_aliaccount || sysset.withdraw_aliaccount == 0)) {
+					paytype = '银行卡';
+				}
+				that.paytype = paytype;
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var usermoney = parseFloat(this.userinfo.money);
+      var money = parseFloat(e.detail.value);
+      if (money < 0) {
+        app.error('必须大于0');
+      } else if (money > usermoney) {
+        app.error('可提现' + this.t('余额') + '不足');
+      }
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function (e) {
+      var that = this;
+			console.log(e.detail.value)
+      var usermoney = parseFloat(this.userinfo.money);
+      var withdrawmin = parseFloat(this.sysset.withdrawmin); //var formdata = e.detail.value;
+      var money = parseFloat(e.detail.value.money);
+      var paytype = this.paytype;
+      if (isNaN(money) || money <= 0) {
+        app.error('提现金额必须大于0');
+        return;
+      }
+      if (withdrawmin > 0 && money < withdrawmin) {
+        app.error('提现金额必须大于¥' + withdrawmin);
+        return;
+      }
+      if (money > usermoney) {
+        app.error('余额不足');
+        return;
+      }
+      if (paytype == '支付宝' && !this.userinfo.aliaccount) {
+        app.alert('请先设置支付宝账号', function () {
+          app.goto('setinfo');
+        });
+        return;
+      }
+      if (paytype == '银行卡' && (!this.userinfo.bankname || !this.userinfo.bankcarduser || !this.userinfo.bankcardnum)) {
+        app.alert('请先设置完整银行卡信息', function () {
+          app.goto('setinfo');
+        });
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiYuyueWorker/withdraw', {money: money,paytype: paytype}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        } else {
+          app.success(res.msg);
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goto('my');
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:60rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.withdrawtype{width:94%;margin:20rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.withdrawtype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+
+
+.withdrawtype .f2{padding:0 30rpx}
+.withdrawtype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.withdrawtype .f2 .item:last-child{border-bottom:0}
+.withdrawtype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#333}
+.withdrawtype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.withdrawtype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.withdrawtype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/activity/yx/kouling.vue b/activity/yx/kouling.vue
new file mode 100644
index 0000000..2f145a5
--- /dev/null
+++ b/activity/yx/kouling.vue
@@ -0,0 +1,73 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入口令" placeholder-style="color:#BBBBBB;font-size:28rpx" name="kouling" value=""></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">确 定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var kouling = formdata.kouling
+      if (kouling == '') {
+        app.alert('请输入口令');return;
+      }
+			var select_bid =app.getCache('select_bid');
+			app.showLoading('提交中');
+      app.post("ApiCoupon/kouling", {kouling:kouling,select_bid:select_bid}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/admin/common.css b/admin/common.css
new file mode 100644
index 0000000..13c748b
--- /dev/null
+++ b/admin/common.css
@@ -0,0 +1,12 @@
+.tabbar{height: auto; position: relative;}
+.tabbar-icon {width: 50rpx;height: 50rpx;}
+.tabbar-bar {display: flex;flex-direction: row;width: 100%;height:100rpx;position: fixed;bottom: 0;padding:10rpx 0 0 0;background: #fff;font-size: 24rpx;color: #999;border-top: 1px solid #e5e5e5;z-index: 999999;box-sizing:content-box}
+.tabbar-item {flex: 1;text-align: center;overflow: hidden;}
+.tabbar-image-box {height: 54rpx;margin-bottom: 4rpx;}
+.tabbar-text {line-height: 30rpx;font-size: 24rpx;color:#222222}
+.tabbar-text.active{color:#FC5729}
+.tabbar-bot{height:110rpx;width:100%;box-sizing:content-box}
+@supports(bottom: env(safe-area-inset-bottom)){
+	.tabbar-bot{padding-bottom:env(safe-area-inset-bottom);}
+	.tabbar-bar{padding-bottom:env(safe-area-inset-bottom);}
+}
diff --git a/admin/finance/bmoneylog.vue b/admin/finance/bmoneylog.vue
new file mode 100644
index 0000000..730fa86
--- /dev/null
+++ b/admin/finance/bmoneylog.vue
@@ -0,0 +1,121 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+						<text class="t3">变更后余额: {{item.after}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t2" v-else>{{item.money}}</text>
+				</view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			canwithdraw:false,
+			textset:{},
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+			nodata:false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata(true);
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminFinance/bmoneylog', {pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;display:flex;flex-direction:column}
+.content{ width:94%;margin:0 3% 20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:20rpx 20rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/admin/finance/bwithdraw.vue b/admin/finance/bwithdraw.vue
new file mode 100644
index 0000000..6d71258
--- /dev/null
+++ b/admin/finance/bwithdraw.vue
@@ -0,0 +1,196 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		<view class="mymoney" :style="{background:t('color1')}">
+			<view class="f1">可提现余额</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.money}}</view>
+			<view class="f3" @tap="goto" data-url="bwithdrawlog"><text>提现记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">提现金额(元)</view></view>
+			<view class="item3"><view class="f1">￥</view><view class="f2"><input class="input" type="digit" name="money" value="" placeholder="请输入提现金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput"/></view></view>
+			<view class="item4" v-if="sysset.withdrawfee>0 || sysset.withdrawmin>0">
+				<text v-if="sysset.withdrawmin>0" style="margin-right:10rpx">最低提现金额{{sysset.withdrawmin}}元 </text>
+				<text v-if="sysset.withdrawfee>0">提现手续费{{sysset.withdrawfee}}% </text>
+			</view>
+		</view>
+		<view class="withdrawtype">
+			<view class="f1">选择提现方式：</view>
+			<view class="f2">
+				<view class="item" v-if="sysset.withdraw_weixin==1" @tap.stop="changeradio" data-paytype="微信钱包">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信钱包</view>
+					<view class="radio" :style="paytype=='微信钱包' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</view>
+				<label class="item" v-if="sysset.withdraw_aliaccount==1" @tap.stop="changeradio" data-paytype="支付宝">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>'支付宝</view>
+					<view class="radio" :style="paytype=='支付宝' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+				<label class="item" v-if="sysset.withdraw_bankcard==1" @tap.stop="changeradio" data-paytype="银行卡">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-cash.png'"/>银行卡</view>
+					<view class="radio" :style="paytype=='银行卡' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}">立即提现</button>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo: [],
+		sysset: false,
+		paytype: '微信钱包',
+		show: 0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onShow: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminFinance/bwithdraw', {}, function (res) {
+				that.loading = false;
+				that.userinfo = res.userinfo;
+				that.sysset = res.sysset;
+				that.tmplids = res.tmplids;
+				var sysset = res.sysset;
+				var paytype = '微信钱包';
+				if (sysset.withdraw_weixin == 1) {
+					paytype = '微信钱包';
+				}
+				if (!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) {
+					paytype = '支付宝';
+				}
+				if ((!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) && (!sysset.withdraw_aliaccount || sysset.withdraw_aliaccount == 0)) {
+					paytype = '银行卡';
+				}
+				that.paytype = paytype;
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var usermoney = parseFloat(this.userinfo.money);
+      var money = parseFloat(e.detail.value);
+      if (money < 0) {
+        app.error('必须大于0');
+      } else if (money > usermoney) {
+        app.error('可提现' + this.t('余额') + '不足');
+      }
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function (e) {
+      var that = this;
+			console.log(e.detail.value)
+      var usermoney = parseFloat(this.userinfo.money);
+      var withdrawmin = parseFloat(this.sysset.withdrawmin); //var formdata = e.detail.value;
+      var money = parseFloat(e.detail.value.money);
+      var paytype = this.paytype;
+      if (isNaN(money) || money <= 0) {
+        app.error('提现金额必须大于0');
+        return;
+      }
+      if (withdrawmin > 0 && money < withdrawmin) {
+        app.error('提现金额必须大于¥' + withdrawmin);
+        return;
+      }
+      if (money > usermoney) {
+        app.error('余额不足');
+        return;
+      }
+      if (paytype == '支付宝' && !this.userinfo.aliaccount) {
+        app.alert('请先设置支付宝账号', function () {
+          app.goto('txset');
+        });
+        return;
+      }
+      if (paytype == '银行卡' && (!this.userinfo.bankname || !this.userinfo.bankcarduser || !this.userinfo.bankcardnum)) {
+        app.alert('请先设置完整银行卡信息', function () {
+          app.goto('txset');
+        });
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiAdminFinance/bwithdraw', {money: money,paytype: paytype}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+					app.alert(res.msg, function () {
+						if(res.url) app.goto(res.url);
+					});
+          return;
+        } else {
+          app.success(res.msg);
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goto('index');
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:60rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.withdrawtype{width:94%;margin:20rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.withdrawtype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+
+
+.withdrawtype .f2{padding:0 30rpx}
+.withdrawtype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.withdrawtype .f2 .item:last-child{border-bottom:0}
+.withdrawtype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#333}
+.withdrawtype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.withdrawtype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.withdrawtype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/admin/finance/bwithdrawlog.vue b/admin/finance/bwithdrawlog.vue
new file mode 100644
index 0000000..4b3a42c
--- /dev/null
+++ b/admin/finance/bwithdrawlog.vue
@@ -0,0 +1,122 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{date(item.createtime,'Y-m-d H:i')}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			canwithdraw:false,
+			textset:{},
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+			nodata:false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata(true);
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminFinance/bwithdrawlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;display:flex;flex-direction:column}
+.content{ width:94%;margin:0 3% 20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:20rpx 20rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/admin/finance/commissionlog.vue b/admin/finance/commissionlog.vue
new file mode 100644
index 0000000..688e731
--- /dev/null
+++ b/admin/finance/commissionlog.vue
@@ -0,0 +1,147 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">{{t('佣金')}}明细（共{{count}}条）</text>
+			</view>
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+					<image class="t1" :src="item.headimg"></image>
+					<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" v-if="item.commission>0" style="color:#000">+{{item.commission}}元</text>
+					<text class="t1" v-else>{{item.commission}}元</text>
+					<text class="t2">{{date(item.createtime)}}</text>
+					<text class="t3">备注：{{item.remark}}</text>
+				</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		keyword:'',
+		st: 0,
+		count:0,
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminFinance/commissionlog', {keyword:keyword,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1){
+					uni.setNavigationBarTitle({
+						title: that.t('佣金') + '明细'
+					});
+					that.count = res.count;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding:24rpx 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{ width:100%;padding:20rpx 20rpx;border-top: 1px #f5f5f5 solid;display:flex;align-items:center}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%;margin-left:20rpx}
+.content .item .f1 .t2{color:#666666;text-align:center;width:140rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.content .item .f2{ flex:1;width:200rpx;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;height:40rpx;line-height:40rpx;font-size:36rpx}
+.content .item .f2 .t2{color:#999;height:40rpx;line-height:40rpx;font-size:24rpx}
+.content .item .f2 .t3{color:#aaa;height:40rpx;line-height:40rpx;font-size:24rpx}
+</style>
\ No newline at end of file
diff --git a/admin/finance/comwithdrawdetail.vue b/admin/finance/comwithdrawdetail.vue
new file mode 100644
index 0000000..7e093e6
--- /dev/null
+++ b/admin/finance/comwithdrawdetail.vue
@@ -0,0 +1,190 @@
+<template>
+<view>
+<block v-if="isload">
+  
+	<view class="orderinfo">
+		<view class="item">
+			<text class="t1 flex1">{{t('会员')}}信息</text>
+			<view class="t2 flex-y-center" style="flex:0"><image :src="info.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"></image> {{info.nickname}}</view>
+		</view>
+	</view>
+	<view class="orderinfo">
+		<view class="item">
+			<text class="t1">提现金额</text>
+			<text class="t2">￥{{info.txmoney}}</text>
+		</view>
+		<view class="item">
+			<text class="t1">打款金额</text>
+			<text class="t2">￥{{info.money}}</text>
+		</view>
+		<view class="item">
+			<text class="t1">提现方式</text>
+			<text class="t2">{{info.paytype}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='支付宝'">
+			<text class="t1">支付宝账号</text>
+			<text class="t2">{{info.aliaccount}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">开户行</text>
+			<text class="t2">{{info.bankname}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">持卡人</text>
+			<text class="t2">{{info.bankcarduser}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">卡号</text>
+			<text class="t2">{{info.bankcardnum}}</text>
+		</view>
+
+		<view class="item">
+			<text class="t1">状态</text>
+			<text class="t2" v-if="info.status==0">审核中</text>
+			<text class="t2" v-if="info.status==1">已审核</text>
+			<text class="t2" v-if="info.status==2">已驳回</text>
+			<text class="t2" v-if="info.status==3">已打款</text>
+		</view>
+	</view>
+  <view style="width:100%;height:120rpx"></view>
+
+  <view class="bottom">
+		<view v-if="info.status==0" class="btn" @tap="shenhepass" :data-id="info.id">审核通过</view>
+		<view v-if="info.status==0" class="btn" @tap="shenhenopass" :data-id="info.id">审核驳回</view>
+		<view v-if="info.status==1" class="btn" @tap="setydk" :data-id="info.id">改为已打款</view>
+		<view v-if="info.status==1 && (info.paytype=='微信钱包' || info.paytype=='银行卡')" class="btn" @tap="wxdakuan" :data-id="info.id">微信打款</view>
+  </view>
+	<popmsg ref="popmsg"></popmsg>
+
+</block>
+<!--<import src="/pages/template.wxml"></import>-->
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+
+      info: {},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminFinance/comwithdrawdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+				uni.setNavigationBarTitle({
+					title: that.t('佣金') + '提现详情'
+				});
+				that.loaded();
+			});
+		},
+    shenhenopass: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要驳回提现申请吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/comwidthdrawnopass', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    shenhepass: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要审核通过吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/comwidthdrawpass', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    setydk: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定已打款吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/comwidthdsetydk', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    wxdakuan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要微信打款吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/comwidthdwxdakuan', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+
+.address{ display:flex;align-items:center;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:60rpx}
+.address image{width: 50rpx; height: 50rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{ font-weight:bold}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height: 60rpx;line-height: 30rpx;color: #000;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height: 30rpx;line-height: 30rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.bottom .btn{ border-radius:10rpx; padding:10rpx 16rpx;margin-left: 10px; border: 1px #999 solid;color: #555;}
+.bottom .pay{ border: 1px #ff8758 solid; color: #ff8758;}
+.bottom .del{ border: 1px red solid;color: red;}
+.bottom .coll{ border: 1px #ff4246 solid;color: #ff4246;}
+.bottom .wul{ border: 1px #06aa53 solid; color: #06aa53; }
+.bottom .ref{ border: 1px #999 solid;color: #999;}
+.bottom .det{ border: 1px #555 solid;color: #555;}
+
+</style>
\ No newline at end of file
diff --git a/admin/finance/comwithdrawlog.vue b/admin/finance/comwithdrawlog.vue
new file mode 100644
index 0000000..93bae3f
--- /dev/null
+++ b/admin/finance/comwithdrawlog.vue
@@ -0,0 +1,161 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="tabcontent">
+			<dd-tab :itemdata="['全部','审核中','已审核','已驳回','已打款']" :itemst="['all','0','1','2','3']" :st="st" @changetab="changetab"></dd-tab>
+		</view>
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item" @tap="goto" :data-url="'comwithdrawdetail?id=' + item.id">
+				<view class="f1">
+						<image class="t1" :src="item.headimg"></image>
+						<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+						<text class="t2">提现方式：{{item.paytype}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		keyword:'',
+		st: 'all',
+		count:0,
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+	  
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminFinance/comwithdrawlog', {keyword:keyword,pagenum: pagenum,st:st}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1){
+					uni.setNavigationBarTitle({
+						title: that.t('佣金') + '提现记录'
+					});
+					that.count = res.count;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.tabcontent{width:94%;margin:16rpx 3%;overflow:hidden}
+.content{ width:94%;margin:0 3%;border-radius:16rpx;background:#fff;}
+.content .item{ width:100%;padding:20rpx 20rpx;border-bottom:1px solid #f6f6f6;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%}
+.content .item .f1 .t2{color:#666666;text-align:center}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;font-size:32rpx;height:50rpx;line-height:50rpx}
+.content .item .f2 .t2{color:#999;font-size:28rpx;height:40rpx;line-height:40rpx}
+.content .item .f2 .t3{color:#aaa;font-size:28rpx;height:40rpx;line-height:40rpx}
+.content .item .f3{ font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.team-box2{width: 100%;float: left;padding: 8px;box-sizing: border-box;margin-bottom: 5px;position: relative;min-height: 56px;background: #fff;}
+.team-box3{width: 75%;box-sizing: border-box;float: left;border-right: 1px #eaeaea solid;}
+.team-box4{width: 25%;text-align: right;float: left;box-sizing: border-box;}
+.team-sp1{ display: block;width: 100%;height: 25px;line-height: 25px;overflow: hidden;color: #666;font-size: 16px;}
+.team-sp2{ display: block;width: 100%;height: 20px;line-height: 20px;overflow: hidden;color: #999;}
+.team-sp3{ display: block;width: 100%;height: 45px;line-height: 45px;text-align: center;overflow: hidden;color: red;}
+.team-sp4{ display: block;width: 100%;height: 45px;line-height: 45px;text-align: center;overflow: hidden;color: #ff6801;}
+</style>
\ No newline at end of file
diff --git a/admin/finance/index.vue b/admin/finance/index.vue
new file mode 100644
index 0000000..50fc49d
--- /dev/null
+++ b/admin/finance/index.vue
@@ -0,0 +1,220 @@
+<template>
+<view>
+	<block v-if="isload">
+	<view class="surverycontent">
+		<view class="item">
+				 <text class="t1">累计收款</text>
+				 <text class="t2">￥{{info.wxpayCount}}</text>
+				 <text class="t3">昨日新增：￥{{info.wxpayLastDayCount}}</text>
+				 <text class="t3">本月新增：￥{{info.wxpayThisMonthCount}}</text>
+		 </view>
+		 <view class="item">
+				 <text class="t1">累计退款</text>
+				 <text class="t2">￥{{info.refundCount}}</text>
+				 <text class="t3">昨日新增：￥{{info.refundLastDayCount}}</text>
+				 <text class="t3">本月新增：￥{{info.refundThisMonthCount}}</text>
+		 </view>
+		 <view class="item" v-if="bid == 0">
+				 <text class="t1">累计提现</text>
+				 <text class="t2">￥{{info.withdrawCount}}</text>
+				 <text class="t3">昨日新增：￥{{info.withdrawLastDayCount}}</text>
+				 <text class="t3">本月新增：￥{{info.withdrawThisMonthCount}}</text>
+		 </view>
+		 <view class="item" v-if="bid == 0">
+				 <text class="t1">支出{{t('佣金')}}</text>
+				 <text class="t2">￥{{info.commissiontotal}}</text>
+				 <text class="t3">剩余{{t('佣金')}}：￥{{info.commission}}</text>
+				 <text class="t3">已提现{{t('佣金')}}：￥{{info.commissionwithdraw}}</text>
+		 </view>
+	</view>
+	<block v-if="bid == 0">
+	<view class="listcontent">
+		<view class="list">
+			<view class="item" @tap="goto" data-url="rechargelog">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/rechargelog.png'"></image></view>
+				<view class="f2">充值记录</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+		<view class="list">
+			<view class="item" @tap="goto" data-url="moneylog">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/moneylog.png'"></image></view>
+				<view class="f2">{{t('余额')}}明细</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+        <view class="list"  v-if="showyuebao_moneylog">
+        	<view class="item" @tap="goto" data-url="yuebaolog">
+        		<view class="f1"><image :src="event_rul +'/static/img/static/img/moneylog.png'"></image></view>
+        		<view class="f2">{{t('余额宝')}}明细</view>
+        		<text class="f3"></text>
+        		<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+        	</view>
+        </view>
+		<view class="list">
+			<view class="item" @tap="goto" data-url="commissionlog">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/commissionlog.png'"></image></view>
+				<view class="f2">{{t('佣金')}}明细</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+		<view class="list">
+			<view class="item" @tap="goto" data-url="withdrawlog">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/withdrawlog.png'"></image></view>
+				<view class="f2">{{t('余额')}}提现列表</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+        <view class="list"  v-if="showyuebao_withdrawlog">
+        	<view class="item" @tap="goto" data-url="yuebaowithdrawlog">
+        		<view class="f1"><image :src="event_rul +'/static/img/static/img/withdrawlog.png'"></image></view>
+        		<view class="f2">{{t('余额宝')}}提现列表</view>
+        		<text class="f3"></text>
+        		<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+        	</view>
+        </view>
+		<view class="list">
+			<view class="item" @tap="goto" data-url="comwithdrawlog">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/comwithdrawlog.png'"></image></view>
+				<view class="f2">{{t('佣金')}}提现列表</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+	</view>
+	</block>
+	<block v-if="bid!=0">
+	<view class="listcontent">
+		<view class="list">
+			<view class="item" @tap="goto" data-url="bmoneylog">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/moneylog.png'"></image></view>
+				<view class="f2">余额明细</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+		<view class="list">
+			<view class="item" @tap="goto" data-url="bwithdraw">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/withdrawlog.png'"></image></view>
+				<view class="f2">余额提现</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+		<view class="list">
+			<view class="item" @tap="goto" data-url="bwithdrawlog">
+				<view class="f1"><image :src="event_rul +'/static/img/static/img/comwithdrawlog.png'"></image></view>
+				<view class="f2">提现记录</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+	</view>
+	</block>
+	<view class="tabbar">
+		<view class="tabbar-bot"></view>
+		<view class="tabbar-bar" style="background-color:#ffffff;">
+			<view @tap="goto" data-url="../member/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.member">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/member.png'"></image>
+				</view>
+				<view class="tabbar-text">{{t('会员')}}</view>
+			</view>
+			<view @tap="goto" data-url="../kefu/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.zixun">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/zixun.png'"></image>
+				</view>
+				<view class="tabbar-text">咨询</view>
+			</view>
+			<view @tap="goto" data-url="../finance/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.finance">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/finance2.png'"></image>
+				</view>
+				<view class="tabbar-text active">财务</view>
+			</view>
+			<view @tap="goto" data-url="../index/index" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/my.png'"></image>
+				</view>
+				<view class="tabbar-text">我的</view>
+			</view>
+		</view>
+	</view>
+	<popmsg ref="popmsg"></popmsg>
+	</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		bid:0,
+		info: {},
+		auth_data: {},
+		showyuebao_moneylog:false,
+		showyuebao_withdrawlog:false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this
+			that.loading = true;
+			app.post('ApiAdminFinance/index', {}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.info = res.info;
+				that.bid = res.bid;
+				that.auth_data = res.auth_data;
+                that.showyuebao_moneylog    = res.showyuebao_moneylog;
+                that.showyuebao_withdrawlog = res.showyuebao_withdrawlog;
+				that.loaded();
+			});
+		}
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.surverycontent{width: 100%;padding:0 30rpx;display:flex;flex-wrap:wrap;padding-top:20rpx;}
+.surverycontent .item{width:49%;background:#fff;margin-bottom:16rpx;padding:10rpx 20rpx;display:flex;flex-direction:column;border-radius:16rpx}
+.surverycontent .item:nth-child(odd){margin-right:2%}
+.surverycontent .item .t1{width: 100%;color: #222;font-size:28rpx;height: 50rpx;line-height: 50rpx;overflow: hidden;}
+.surverycontent .item .t2{width: 100%;color: #FC5648;font-size:44rpx;font-weight:bold;height: 70rpx;line-height: 70rpx;overflow: hidden;}
+.surverycontent .item .t3{width: 100%;color: #999;font-size:28rpx;height: 44rpx;line-height: 44rpx;overflow: hidden;}
+.surverycontent .item .t3 .x2{color:#444;font-weight:bold}
+.surverycontent .tips{width: 100%;padding: 30rpx 20rpx;color: #999;}
+
+.listcontent{width: 100%;padding:0 30rpx;}
+.list{ width: 100%;background: #fff;margin-top:20rpx;padding:0 20rpx;font-size:30rpx;margin-bottom:20rpx;border-radius:16rpx}
+.list .item{ height:100rpx;display:flex;align-items:center;border-bottom:1px solid #eee}
+.list .item:last-child{border-bottom:0;margin-bottom:20rpx}
+.list .f1{width:50rpx;height:50rpx;line-height:50rpx;display:flex;align-items:center}
+.list .f1 image{ width:44rpx;height:44rpx;}
+.list .f1 span{ width:40rpx;height:40rpx;font-size:40rpx}
+.list .f2{color:#222}
+.list .f3{ color: #666;text-align:right;flex:1}
+.list .f4{ width: 40rpx; height: 40rpx;}
+</style>
\ No newline at end of file
diff --git a/admin/finance/moneylog.vue b/admin/finance/moneylog.vue
new file mode 100644
index 0000000..00b1331
--- /dev/null
+++ b/admin/finance/moneylog.vue
@@ -0,0 +1,147 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">{{t('余额')}}明细（共{{count}}条）</text>
+			</view>
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+					<image class="t1" :src="item.headimg"></image>
+					<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" v-if="item.money>0" style="color:#000">+{{item.money}}元</text>
+					<text class="t1" v-else>{{item.money}}元</text>
+					<text class="t2">{{date(item.createtime)}}</text>
+					<text class="t3">备注：{{item.remark}}</text>
+				</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		keyword:'',
+		st: 0,
+		count:0,
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminFinance/moneylog', {keyword:keyword,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1){
+					uni.setNavigationBarTitle({
+						title: that.t('余额') + '明细'
+					});
+					that.count = res.count;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding:24rpx 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{ width:100%;padding:20rpx 20rpx;border-top: 1px #f5f5f5 solid;display:flex;align-items:center}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%;margin-left:20rpx}
+.content .item .f1 .t2{color:#666666;text-align:center;width:140rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.content .item .f2{ flex:1;width:200rpx;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;height:40rpx;line-height:40rpx;font-size:36rpx}
+.content .item .f2 .t2{color:#999;height:40rpx;line-height:40rpx;font-size:24rpx}
+.content .item .f2 .t3{color:#aaa;height:40rpx;line-height:40rpx;font-size:24rpx}
+</style>
\ No newline at end of file
diff --git a/admin/finance/rechargelog.vue b/admin/finance/rechargelog.vue
new file mode 100644
index 0000000..0080222
--- /dev/null
+++ b/admin/finance/rechargelog.vue
@@ -0,0 +1,148 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">充值记录（共{{count}}条）</text>
+			</view>
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+					<image class="t1" :src="item.headimg"></image>
+					<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1">充值金额：{{item.money}}元</text>
+					<text class="t2">{{date(item.createtime)}}</text>
+					<text class="t3">支付方式：{{item.paytype}}</text>
+					<text class="t3">单号：{{item.ordernum}}</text>
+				</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		keyword:'',
+		st: 0,
+		count:0,
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminFinance/rechargelog', {keyword:keyword,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1){
+					that.count = res.count;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding:24rpx 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{ width:100%;padding:20rpx 20rpx;border-top: 1px #f5f5f5 solid;display:flex;align-items:center}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%;margin-left:20rpx}
+.content .item .f1 .t2{color:#666666;text-align:center;width:140rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.content .item .f2{ flex:1;width:200rpx;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#999;font-size:24rpx}
+.content .item .f2 .t3{color:#aaa;font-size:24rpx}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+</style>
\ No newline at end of file
diff --git a/admin/finance/txset.vue b/admin/finance/txset.vue
new file mode 100644
index 0000000..a75c623
--- /dev/null
+++ b/admin/finance/txset.vue
@@ -0,0 +1,116 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<text class="label">微信号</text>
+				<input type="text" class="input" placeholder="请输入微信号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="weixin" :value="info.weixin"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">支付宝账号</text>
+				<input type="text" class="input" placeholder="请输入支付宝账号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="aliaccount" :value="info.aliaccount"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+					<text class="label">开户行</text>
+					<input type="text" class="input" placeholder="请输入持卡人姓名" name="bankname" :value="info.bankname" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+			<view class="form-item">
+					<text class="label">持卡人姓名</text>
+					<input type="text" class="input" placeholder="请输入持卡人姓名" name="bankcarduser" :value="info.bankcarduser" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+			<view class="form-item">
+					<text class="label">银行卡号</text>
+					<input type="text" class="input" placeholder="请输入银行卡号" name="bankcardnum" :value="info.bankcardnum" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			smsdjs:'',
+      banklist: ['工商银行', '农业银行', '中国银行', '建设银行', '招商银行', '邮储银行', '交通银行', '浦发银行', '民生银行', '兴业银行', '平安银行', '中信银行', '华夏银行', '广发银行', '光大银行', '北京银行', '宁波银行'],
+      bankname: '',
+			info:{},
+			textset:{},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.isload = true
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminFinance/txset', {}, function (data) {
+				that.loading = false;
+				that.info = data.info;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var bankname = formdata.bankname
+			var bankcarduser = formdata.bankcarduser
+			var bankcardnum = formdata.bankcardnum
+			var weixin = formdata.weixin
+			var aliaccount = formdata.aliaccount
+			var code = formdata.code || ''
+      //if (bankname == '') {
+      //  app.alert('请选择开户行');return;
+      //}
+			app.showLoading('提交中');
+      app.post("ApiAdminFinance/txset", {bankname:bankname,bankcarduser:bankcarduser,bankcardnum:bankcardnum,weixin:weixin,aliaccount:aliaccount,code:code}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    bindBanknameChange: function (e) {
+      this.bankname = this.banklist[e.detail.value];
+    },
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 0;flex:1;color: #000;}
+.form-item .code{color:#06A051}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%)}
+</style>
\ No newline at end of file
diff --git a/admin/finance/withdrawdetail.vue b/admin/finance/withdrawdetail.vue
new file mode 100644
index 0000000..47b1bd9
--- /dev/null
+++ b/admin/finance/withdrawdetail.vue
@@ -0,0 +1,187 @@
+<template>
+<view>
+<block v-if="isload">
+	<view class="orderinfo">
+		<view class="item">
+			<text class="t1 flex1">{{t('会员')}}信息</text>
+			<view class="t2 flex-y-center" style="flex:0"><image :src="info.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"></image> {{info.nickname}}</view>
+		</view>
+	</view>
+	<view class="orderinfo">
+		<view class="item">
+			<text class="t1">提现金额</text>
+			<text class="t2">￥{{info.txmoney}}</text>
+		</view>
+		<view class="item">
+			<text class="t1">打款金额</text>
+			<text class="t2">￥{{info.money}}</text>
+		</view>
+		<view class="item">
+			<text class="t1">提现方式</text>
+			<text class="t2">{{info.paytype}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='支付宝'">
+			<text class="t1">支付宝账号</text>
+			<text class="t2">{{info.aliaccount}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">开户行</text>
+			<text class="t2">{{info.bankname}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">持卡人</text>
+			<text class="t2">{{info.bankcarduser}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">卡号</text>
+			<text class="t2">{{info.bankcardnum}}</text>
+		</view>
+
+		<view class="item">
+			<text class="t1">状态</text>
+			<text class="t2" v-if="info.status==0">审核中</text>
+			<text class="t2" v-if="info.status==1">已审核</text>
+			<text class="t2" v-if="info.status==2">已驳回</text>
+			<text class="t2" v-if="info.status==3">已打款</text>
+		</view>
+	</view>
+  <view style="width:100%;height:120rpx"></view>
+
+  <view class="bottom">
+		<view v-if="info.status==0" class="btn" @tap="shenhepass" :data-id="info.id">审核通过</view>
+		<view v-if="info.status==0" class="btn" @tap="shenhenopass" :data-id="info.id">审核驳回</view>
+		<view v-if="info.status==1" class="btn" @tap="setydk" :data-id="info.id">改为已打款</view>
+		<view v-if="info.status==1 && (info.paytype=='微信钱包' || info.paytype=='银行卡')" class="btn" @tap="wxdakuan" :data-id="info.id">微信打款</view>
+  </view>
+
+</block>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+
+      info: {},
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminFinance/withdrawdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+				uni.setNavigationBarTitle({
+					title: that.t('余额') + '提现详情'
+				});
+				that.loaded();
+			});
+		},
+    shenhenopass: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要驳回提现申请吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/widthdrawnopass', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    shenhepass: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要审核通过吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/widthdrawpass', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    setydk: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定已打款吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/widthdsetydk', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    wxdakuan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要微信打款吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiAdminFinance/widthdwxdakuan', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+
+.address{ display:flex;align-items:center;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:60rpx}
+.address image{width: 50rpx; height: 50rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{ font-weight:bold}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height: 60rpx;line-height: 30rpx;color: #000;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height: 30rpx;line-height: 30rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.bottom .btn{ border-radius:10rpx; padding:10rpx 16rpx;margin-left: 10px; border: 1px #999 solid;color: #555;}
+.bottom .pay{ border: 1px #ff8758 solid; color: #ff8758;}
+.bottom .del{ border: 1px red solid;color: red;}
+.bottom .coll{ border: 1px #ff4246 solid;color: #ff4246;}
+.bottom .wul{ border: 1px #06aa53 solid; color: #06aa53; }
+.bottom .ref{ border: 1px #999 solid;color: #999;}
+.bottom .det{ border: 1px #555 solid;color: #555;}
+
+</style>
\ No newline at end of file
diff --git a/admin/finance/withdrawlog.vue b/admin/finance/withdrawlog.vue
new file mode 100644
index 0000000..e10d071
--- /dev/null
+++ b/admin/finance/withdrawlog.vue
@@ -0,0 +1,160 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="tabcontent">
+			<dd-tab :itemdata="['全部','审核中','已审核','已驳回','已打款']" :itemst="['all','0','1','2','3']" :st="st" @changetab="changetab"></dd-tab>
+		</view>
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item" @tap="goto" :data-url="'withdrawdetail?id=' + item.id">
+				<view class="f1">
+						<image class="t1" :src="item.headimg"></image>
+						<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+						<text class="t2">提现方式：{{item.paytype}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		keyword:'',
+		st: 'all',
+		count:0,
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminFinance/withdrawlog', {keyword:keyword,pagenum: pagenum,st:st}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1){
+					uni.setNavigationBarTitle({
+						title: that.t('余额') + '提现记录'
+					});
+					that.count = res.count;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.tabcontent{width:94%;margin:16rpx 3%;overflow:hidden}
+.content{ width:94%;margin:0 3%;border-radius:16rpx;background:#fff;}
+.content .item{ width:100%;padding:20rpx 20rpx;border-bottom:1px solid #f6f6f6;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%}
+.content .item .f1 .t2{color:#666666;text-align:center}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;font-size:32rpx;height:50rpx;line-height:50rpx}
+.content .item .f2 .t2{color:#999;font-size:28rpx;height:40rpx;line-height:40rpx}
+.content .item .f2 .t3{color:#aaa;font-size:28rpx;height:40rpx;line-height:40rpx}
+.content .item .f3{ font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.team-box2{width: 100%;float: left;padding: 8px;box-sizing: border-box;margin-bottom: 5px;position: relative;min-height: 56px;background: #fff;}
+.team-box3{width: 75%;box-sizing: border-box;float: left;border-right: 1px #eaeaea solid;}
+.team-box4{width: 25%;text-align: right;float: left;box-sizing: border-box;}
+.team-sp1{ display: block;width: 100%;height: 25px;line-height: 25px;overflow: hidden;color: #666;font-size: 16px;}
+.team-sp2{ display: block;width: 100%;height: 20px;line-height: 20px;overflow: hidden;color: #999;}
+.team-sp3{ display: block;width: 100%;height: 45px;line-height: 45px;text-align: center;overflow: hidden;color: red;}
+.team-sp4{ display: block;width: 100%;height: 45px;line-height: 45px;text-align: center;overflow: hidden;color: #ff6801;}
+</style>
\ No newline at end of file
diff --git a/admin/finance/yuebaolog.vue b/admin/finance/yuebaolog.vue
new file mode 100644
index 0000000..4923026
--- /dev/null
+++ b/admin/finance/yuebaolog.vue
@@ -0,0 +1,146 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">{{t('余额宝')}}明细（共{{count}}条）</text>
+			</view>
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+					<image class="t1" :src="item.headimg"></image>
+					<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" v-if="item.money>0" style="color:#000">+{{item.money}}元</text>
+					<text class="t1" v-else>{{item.money}}元</text>
+					<text class="t2">{{date(item.createtime)}}</text>
+					<text class="t3">备注：{{item.remark}}</text>
+				</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+        opt:{},
+        loading:false,
+        isload: false,
+        keyword:'',
+        st: 0,
+        count:0,
+        datalist: [],
+        pagenum: 1,
+        nodata: false,
+        nomore: false,
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+    onLoad: function (opt) {
+        this.opt = app.getopts(opt);
+        this.getdata();
+    },
+    onPullDownRefresh: function () {
+        this.getdata();
+    },
+    onReachBottom: function () {
+        if (!this.nodata && !this.nomore) {
+            this.pagenum = this.pagenum + 1;
+            this.getdata(true);
+        }
+    },
+  methods: {
+    getdata: function (loadmore) {
+        if(!loadmore){
+            this.pagenum = 1;
+            this.datalist = [];
+        }
+        var that = this;
+        var pagenum = that.pagenum;
+        var st = that.st;
+        var keyword = that.keyword;
+        that.nodata = false;
+        that.nomore = false;
+        that.loading = true;
+        app.post('ApiAdminFinance/yuebaolog', {keyword:keyword,pagenum: pagenum}, function (res) {
+            that.loading = false;
+            var data = res.data;
+            if (pagenum == 1){
+                uni.setNavigationBarTitle({
+                    title: that.t('余额宝') + '明细'
+                });
+                that.count = res.count;
+                that.datalist = data;
+                if (data.length == 0) {
+                    that.nodata = true;
+                }
+                that.loaded();
+            }else{
+                if (data.length == 0) {
+                    that.nomore = true;
+                } else {
+                    var datalist = that.datalist;
+                    var newdata = datalist.concat(data);
+                    that.datalist = newdata;
+                }
+            }
+        });
+    },
+    changetab: function (e) {
+        var st = e.currentTarget.dataset.st;
+        this.st = st;
+        uni.pageScrollTo({
+            scrollTop: 0,
+            duration: 0
+        });
+        this.getdata();
+    },
+    searchChange: function (e) {
+        this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+        var that = this;
+        var keyword = e.detail.value;
+        that.keyword = keyword;
+        that.getdata();
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding:24rpx 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{ width:100%;padding:20rpx 20rpx;border-top: 1px #f5f5f5 solid;display:flex;align-items:center}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%;margin-left:20rpx}
+.content .item .f1 .t2{color:#666666;text-align:center;width:140rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.content .item .f2{ flex:1;width:200rpx;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;height:40rpx;line-height:40rpx;font-size:36rpx}
+.content .item .f2 .t2{color:#999;height:40rpx;line-height:40rpx;font-size:24rpx}
+.content .item .f2 .t3{color:#aaa;height:40rpx;line-height:40rpx;font-size:24rpx}
+</style>
\ No newline at end of file
diff --git a/admin/finance/yuebaowithdrawdetail.vue b/admin/finance/yuebaowithdrawdetail.vue
new file mode 100644
index 0000000..1bc644f
--- /dev/null
+++ b/admin/finance/yuebaowithdrawdetail.vue
@@ -0,0 +1,187 @@
+<template>
+<view>
+<block v-if="isload">
+	<view class="orderinfo">
+		<view class="item">
+			<text class="t1 flex1">{{t('会员')}}信息</text>
+			<view class="t2 flex-y-center" style="flex:0"><image :src="info.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"></image> {{info.nickname}}</view>
+		</view>
+	</view>
+	<view class="orderinfo">
+		<view class="item">
+			<text class="t1">提现金额</text>
+			<text class="t2">￥{{info.txmoney}}</text>
+		</view>
+		<view class="item">
+			<text class="t1">打款金额</text>
+			<text class="t2">￥{{info.money}}</text>
+		</view>
+		<view class="item">
+			<text class="t1">提现方式</text>
+			<text class="t2">{{info.paytype}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='支付宝'">
+			<text class="t1">支付宝账号</text>
+			<text class="t2">{{info.aliaccount}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">开户行</text>
+			<text class="t2">{{info.bankname}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">持卡人</text>
+			<text class="t2">{{info.bankcarduser}}</text>
+		</view>
+		<view class="item" v-if="info.paytype=='银行卡'">
+			<text class="t1">卡号</text>
+			<text class="t2">{{info.bankcardnum}}</text>
+		</view>
+
+		<view class="item">
+			<text class="t1">状态</text>
+			<text class="t2" v-if="info.status==0">审核中</text>
+			<text class="t2" v-if="info.status==1">已审核</text>
+			<text class="t2" v-if="info.status==2">已驳回</text>
+			<text class="t2" v-if="info.status==3">已打款</text>
+		</view>
+	</view>
+  <view style="width:100%;height:120rpx"></view>
+
+  <view class="bottom">
+		<view v-if="info.status==0" class="btn" @tap="shenhepass" :data-id="info.id">审核通过</view>
+		<view v-if="info.status==0" class="btn" @tap="shenhenopass" :data-id="info.id">审核驳回</view>
+		<view v-if="info.status==1" class="btn" @tap="setydk" :data-id="info.id">改为已打款</view>
+		<view v-if="info.status==1 && (info.paytype=='微信钱包' || info.paytype=='银行卡')" class="btn" @tap="wxdakuan" :data-id="info.id">微信打款</view>
+  </view>
+
+</block>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+    data() {
+        return {
+            opt:{},
+            loading:false,
+            isload: false,
+
+            info: {},
+        };
+    },
+    onLoad: function (opt) {
+        this.opt = app.getopts(opt);
+        this.getdata();
+    },
+    methods: {
+        getdata: function () {
+            var that = this;
+            that.loading = true;
+            app.get('ApiAdminFinance/yuebaowithdrawdetail', {id: that.opt.id}, function (res) {
+                that.loading = false;
+                that.info = res.info;
+                uni.setNavigationBarTitle({
+                    title: that.t('余额宝') + '提现详情'
+                });
+                that.loaded();
+            });
+        },
+        shenhenopass: function (e) {
+            var that = this;
+            var id = e.currentTarget.dataset.id;
+            app.confirm('确定要驳回提现申请吗?', function () {
+                app.showLoading('提交中');
+                app.post('ApiAdminFinance/yuebaowithdrawnopass', {id: id}, function (data) {
+                    app.showLoading(false);
+                    app.success(data.msg);
+                    setTimeout(function () {
+                        that.getdata();
+                    }, 1000);
+                });
+            });
+        },
+        shenhepass: function (e) {
+            var that = this;
+            var id = e.currentTarget.dataset.id;
+            app.confirm('确定要审核通过吗?', function () {
+                app.showLoading('提交中');
+                app.post('ApiAdminFinance/yuebaowithdrawpass', {id: id}, function (data) {
+                    app.showLoading(false);
+                    app.success(data.msg);
+                    setTimeout(function () {
+                    that.getdata();
+                    }, 1000);
+                });
+            });
+        },
+        setydk: function (e) {
+            var that = this;
+            var id = e.currentTarget.dataset.id;
+            app.confirm('确定已打款吗?', function () {
+                app.showLoading('提交中');
+                app.post('ApiAdminFinance/yuebaowidthdsetydk', {id: id}, function (data) {
+                    app.showLoading(false);
+                    app.success(data.msg);
+                    setTimeout(function () {
+                        that.getdata();
+                    }, 1000);
+                });
+            });
+        },
+        wxdakuan: function (e) {
+            var that = this;
+            var id = e.currentTarget.dataset.id;
+            app.confirm('确定要微信打款吗?', function () {
+                app.showLoading('提交中');
+                app.post('ApiAdminFinance/yuebaowidthdwxdakuan', {id: id}, function (data) {
+                    app.showLoading(false);
+                    app.success(data.msg);
+                    setTimeout(function () {
+                        that.getdata();
+                    }, 1000);
+                });
+            });
+        }
+    }
+};
+</script>
+<style>
+
+.address{ display:flex;align-items:center;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:60rpx}
+.address image{width: 50rpx; height: 50rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{ font-weight:bold}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height: 60rpx;line-height: 30rpx;color: #000;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height: 30rpx;line-height: 30rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.bottom .btn{ border-radius:10rpx; padding:10rpx 16rpx;margin-left: 10px; border: 1px #999 solid;color: #555;}
+.bottom .pay{ border: 1px #ff8758 solid; color: #ff8758;}
+.bottom .del{ border: 1px red solid;color: red;}
+.bottom .coll{ border: 1px #ff4246 solid;color: #ff4246;}
+.bottom .wul{ border: 1px #06aa53 solid; color: #06aa53; }
+.bottom .ref{ border: 1px #999 solid;color: #999;}
+.bottom .det{ border: 1px #555 solid;color: #555;}
+
+</style>
\ No newline at end of file
diff --git a/admin/finance/yuebaowithdrawlog.vue b/admin/finance/yuebaowithdrawlog.vue
new file mode 100644
index 0000000..acff018
--- /dev/null
+++ b/admin/finance/yuebaowithdrawlog.vue
@@ -0,0 +1,160 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="tabcontent">
+			<dd-tab :itemdata="['全部','审核中','已审核','已驳回','已打款']" :itemst="['all','0','1','2','3']" :st="st" @changetab="changetab"></dd-tab>
+		</view>
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item" @tap="goto" :data-url="'yuebaowithdrawdetail?id=' + item.id">
+				<view class="f1">
+						<image class="t1" :src="item.headimg"></image>
+						<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{date(item.createtime)}}</text>
+						<text class="t2">提现方式：{{item.paytype}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+    data() {
+        return {
+            opt:{},
+            loading:false,
+            isload: false,
+
+            keyword:'',
+            st: 'all',
+            count:0,
+            datalist: [],
+            pagenum: 1,
+            nodata: false,
+            nomore: false,
+			
+			event_rul: app.globalData.event_url,
+        };
+    },
+
+    onLoad: function (opt) {
+        this.opt = app.getopts(opt);
+        this.getdata();
+    },
+    onPullDownRefresh: function () {
+        this.getdata();
+    },
+    onReachBottom: function () {
+        if (!this.nodata && !this.nomore) {
+          this.pagenum = this.pagenum + 1;
+          this.getdata(true);
+        }
+    },
+    methods: {
+    getdata: function (loadmore) {
+        if(!loadmore){
+            this.pagenum = 1;
+            this.datalist = [];
+        }
+        var that = this;
+        var pagenum = that.pagenum;
+        var st = that.st;
+        var keyword = that.keyword;
+        that.nodata = false;
+        that.nomore = false;
+        that.loading = true;
+        app.post('ApiAdminFinance/yuebaowithdrawlog', {keyword:keyword,pagenum: pagenum,st:st}, function (res) {
+            that.loading = false;
+            var data = res.data;
+            if (pagenum == 1){
+                uni.setNavigationBarTitle({
+                    title: that.t('余额宝') + '提现记录'
+                });
+                that.count = res.count;
+                that.datalist = data;
+                if (data.length == 0) {
+                    that.nodata = true;
+                }
+                that.loaded();
+            }else{
+                if (data.length == 0) {
+                    that.nomore = true;
+                } else {
+                    var datalist = that.datalist;
+                    var newdata = datalist.concat(data);
+                    that.datalist = newdata;
+                }
+            }
+        });
+    },
+    changetab: function (st) {
+        this.st = st;
+        uni.pageScrollTo({
+            scrollTop: 0,
+            duration: 0
+        });
+        this.getdata();
+    },
+    searchChange: function (e) {
+        this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+        var that = this;
+        var keyword = e.detail.value;
+        that.keyword = keyword;
+        that.getdata();
+    }
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.tabcontent{width:94%;margin:16rpx 3%;overflow:hidden}
+.content{ width:94%;margin:0 3%;border-radius:16rpx;background:#fff;}
+.content .item{ width:100%;padding:20rpx 20rpx;border-bottom:1px solid #f6f6f6;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%}
+.content .item .f1 .t2{color:#666666;text-align:center}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;font-size:32rpx;height:50rpx;line-height:50rpx}
+.content .item .f2 .t2{color:#999;font-size:28rpx;height:40rpx;line-height:40rpx}
+.content .item .f2 .t3{color:#aaa;font-size:28rpx;height:40rpx;line-height:40rpx}
+.content .item .f3{ font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.team-box2{width: 100%;float: left;padding: 8px;box-sizing: border-box;margin-bottom: 5px;position: relative;min-height: 56px;background: #fff;}
+.team-box3{width: 75%;box-sizing: border-box;float: left;border-right: 1px #eaeaea solid;}
+.team-box4{width: 25%;text-align: right;float: left;box-sizing: border-box;}
+.team-sp1{ display: block;width: 100%;height: 25px;line-height: 25px;overflow: hidden;color: #666;font-size: 16px;}
+.team-sp2{ display: block;width: 100%;height: 20px;line-height: 20px;overflow: hidden;color: #999;}
+.team-sp3{ display: block;width: 100%;height: 45px;line-height: 45px;text-align: center;overflow: hidden;color: red;}
+.team-sp4{ display: block;width: 100%;height: 45px;line-height: 45px;text-align: center;overflow: hidden;color: #ff6801;}
+</style>
\ No newline at end of file
diff --git a/admin/form/formdetail.vue b/admin/form/formdetail.vue
new file mode 100644
index 0000000..213e167
--- /dev/null
+++ b/admin/form/formdetail.vue
@@ -0,0 +1,165 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">提交人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">标题</text>
+				<text class="t2">{{detail.title}}</text>
+			</view>
+			<view v-for="(item, index) in formcontent" :key="index" class="item">
+				<text class="t1">{{item.val1}}</text>
+				<text class="t2" v-if="item.key!='upload'">{{detail['form'+index]}}</text>
+				<view class="t2" v-else><image :src="detail['form'+index]" style="width:50px" mode="widthFix" @tap="previewImage" :data-url="detail['form'+index]"></image></view>
+			</view>
+			<view class="item">
+				<text class="t1">提交时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">审核状态</text>
+				<text class="t2" v-if="detail.status==0 && (!detail.payorderid||detail.paystatus==1)" style="color:#88e">待确认</text>
+				<text class="t2" v-if="detail.status==0 && detail.payorderid && detail.paystatus==0" style="color:red">待支付</text>
+				<text class="t2" v-if="detail.status==1" style="color:green">已确认</text>
+				<text class="t2" v-if="detail.status==2" style="color:red">已驳回</text>
+			</view>
+			<view class="item" v-if="detail.status==2">
+				<text class="t1">驳回原因</text>
+				<text class="t2" style="color:red">{{detail.reason}}</text>
+			</view>
+			<block v-if="form.payset==1">
+			<view class="item">
+				<text class="t1">付款金额</text>
+				<text class="t2" style="font-size:32rpx;color:#e94745">￥{{detail.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款状态</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==0" style="color:green">已付款</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==1" style="color:red">已退款</text>
+				<text class="t2" v-if="detail.paystatus==0" style="color:red">未付款</text>
+			</view>
+			<view class="item" v-if="detail.paystatus>0 && detail.paytime">
+				<text class="t1">付款时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			</block>
+		</view>
+		<view style="width:100%;height:160rpx"></view>
+		<view class="bottom notabbarbot">
+			<view v-if="detail.status==0" class="btn2" @tap="setst" :data-st="1" :data-id="detail.id">确认</view>
+			<view v-if="detail.status==0" class="btn2" @tap="setst2" :data-st="2" :data-id="detail.id">驳回</view>
+			<view class="btn2" @tap="del" :data-id="detail.id">删除</view>
+		</view>
+		<uni-popup id="dialogSetst2" ref="dialogSetst2" type="dialog">
+			<uni-popup-dialog mode="input" title="驳回原因" :value="detail.reason" placeholder="请输入驳回原因" @confirm="setst2confirm"></uni-popup-dialog>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			detail:{},
+			formcontent:[],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminForm/formdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.form = res.form;
+				that.formcontent = res.formcontent;
+				that.detail = res.detail;
+				that.loaded();
+			});
+		},
+		setst:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			var st = e.currentTarget.dataset.st;
+			app.confirm('确定要'+(st==2?'驳回':'确认')+'吗?',function(){
+				app.post('ApiAdminForm/formsetst', {id:id,st:st}, function (res) {
+					app.success(res.msg);
+					setTimeout(function () {
+						that.getdata();
+					},1000);
+				})
+			});
+		},
+		setst2:function(e){
+			this.$refs.dialogSetst2.open();
+		},
+		setst2confirm:function(done,value){
+			this.$refs.dialogSetst2.close();
+      var that = this;
+      app.post('ApiAdminForm/formsetst', {id: that.opt.id,st:2,reason:value}, function (data) {
+        app.success(data.msg);
+        setTimeout(function () {
+          that.getdata();
+        }, 1000);
+      });
+		},
+		del:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			app.confirm('确定要删除吗?',function(){
+				app.post('ApiAdminForm/formdel', {id:id}, function (res) {
+					app.success(res.msg);
+					setTimeout(function () {
+						app.goto('/admin/index/index');
+					},1000);
+				})
+			});
+		},
+  }
+};
+</script>
+<style>
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/form/formlog.vue b/admin/form/formlog.vue
new file mode 100644
index 0000000..6407d47
--- /dev/null
+++ b/admin/form/formlog.vue
@@ -0,0 +1,118 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待确认','已确认','已驳回','待支付']" :itemst="['all','0','1','2','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view style="width:100%;height:90rpx"></view>
+		<view class="content" id="datalist">
+			<view class="item" @tap="goto" :data-url="'formdetail?id=' + item.id" v-for="(item, index) in datalist" :key="index">
+				<view class="f1">
+						<text class="t1">{{item.title}}</text>
+						<text class="t2">提交时间：{{item.createtime}}</text>
+						<text class="t2" v-if="item.paynum" user-select="true" selectable="true">{{item.paynum}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" v-if="item.status==0 && (!item.payorderid||item.paystatus==1)" style="color:#88e">待确认</text>
+					<text class="t1" v-if="item.status==0 && item.payorderid && item.paystatus==0" style="color:red">待支付</text>
+					<text class="t1" v-if="item.status==1" style="color:green">已确认</text>
+					<text class="t1" v-if="item.status==2" style="color:red">已驳回</text>
+				</view>
+			</view>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			this.nodata = false;
+			this.nomore = false;
+			this.loading = true;
+      app.post('ApiAdminForm/formlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+}
+</script>
+<style>
+
+	.content{ width:100%;margin:0;}
+	.content .item{ width:94%;margin:20rpx 3%;;background:#fff;border-radius:16rpx;padding:30rpx 30rpx;display:flex;align-items:center;}
+	.content .item:last-child{border:0}
+	.content .item .f1{width:80%;display:flex;flex-direction:column}
+	.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+	.content .item .f1 .t2{color:#666666;margin-top:10rpx}
+	.content .item .f1 .t3{color:#666666}
+	.content .item .f2{width:20%;font-size:32rpx;text-align:right}
+	.content .item .f2 .t1{color:#03bc01}
+	.content .item .f2 .t2{color:#000000}
+	.content .item .f3{ flex:1;font-size:30rpx;text-align:right}
+	.content .item .f3 .t1{color:#03bc01}
+	.content .item .f3 .t2{color:#000000}
+</style>
\ No newline at end of file
diff --git a/admin/hexiao/hexiao.vue b/admin/hexiao/hexiao.vue
new file mode 100644
index 0000000..cf4c32c
--- /dev/null
+++ b/admin/hexiao/hexiao.vue
@@ -0,0 +1,366 @@
+<template>
+<view>
+<block v-if="isload">
+	<block v-if="type=='shop' || type=='collage' || type=='lucky_collage'  || type=='kanjia' || type=='scoreshop'">
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul +'/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1">{{order.linkman}} {{order.tel}}</text>
+				<text class="t2" v-if="order.freight_type!=1 && order.freight_type!=3">地址：{{order.area}}{{order.address}}</text>
+				<text class="t2" v-if="order.freight_type==1" @tap="openLocation" :data-address="order.storeinfo.address" :data-latitude="order.storeinfo.latitude" :data-longitude="order.storeinfo.longitude">取货地点：{{order.storeinfo.name}} - {{order.storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in order.prolist" :key="idx" class="content">
+				<view>
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(order.status==3 || order.status==2) && (order.freight_type==3 || order.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{order.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="order.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{order.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{order.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="order.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2">{{order.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{order.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{order.createtime}}</text>
+			</view>
+			<view class="item" v-if="order.status>0 && order.paytype!='货到付款' && order.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{order.paytime}}</text>
+			</view>
+			<view class="item" v-if="order.status>0 && order.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{order.paytype == '货到付款' ? codtxt : order.paytype}}</text>
+			</view>
+			<view class="item" v-if="order.status>1 && order.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{order.send_time}}</text>
+			</view>
+			<view class="item" v-if="order.status==3 && order.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{order.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{order.product_price}}</text>
+			</view>
+			<view class="item" v-if="order.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{order.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="order.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{order.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{order.freight_text}}</text>
+			</view>
+			<view class="item" v-if="order.freight_type==1 && order.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{order.freight_price}}</text>
+			</view>
+			<view class="item" v-if="order.freight_time">
+				<text class="t1">{{order.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{order.freight_time}}</text>
+			</view>
+			<view class="item" v-if="order.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{order.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="order.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{order.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{order.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="order.status==0">未付款</text>
+				<text class="t2" v-if="order.status==1">已付款</text>
+				<text class="t2" v-if="order.status==2">已发货</text>
+				<text class="t2" v-if="order.status==3">已收货</text>
+				<text class="t2" v-if="order.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="order.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="order.refund_status==1">审核中,¥{{order.refund_money}}</text>
+				<text class="t2 red" v-if="order.refund_status==2">已退款,¥{{order.refund_money}}</text>
+				<text class="t2 red" v-if="order.refund_status==3">已驳回,¥{{order.refund_money}}</text>
+			</view>
+			<view class="item" v-if="order.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{order.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="order.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{order.refund_checkremark}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{order.message ? order.message : '无'}}</text>
+			</view>
+			<view class="item" v-if="order.field1">
+				<text class="t1">{{order.field1data[0]}}</text>
+				<text class="t2 red">{{order.field1data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field2">
+				<text class="t1">{{order.field2data[0]}}</text>
+				<text class="t2 red">{{order.field2data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field3">
+				<text class="t1">{{order.field3data[0]}}</text>
+				<text class="t2 red">{{order.field3data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field4">
+				<text class="t1">{{order.field4data[0]}}</text>
+				<text class="t2 red">{{order.field4data[1]}}</text>
+			</view>
+			<view class="item" v-if="order.field5">
+				<text class="t1">{{order.field5data[0]}}</text>
+				<text class="t2 red">{{order.field5data[1]}}</text>
+			</view>
+		</view>
+	</block>
+	<block v-if="type=='coupon'">
+		<view class="couponbg" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}"></view>
+		<view class="orderinfo">
+			<view class="topitem">
+				<view class="f1" :style="{color:t('color1')}" v-if="order.type==1"><text style="font-size:32rpx">￥</text><text class="t1">{{order.money}}</text></view>
+				<view class="f1" :style="{color:t('color1')}" v-else-if="order.type==2">礼品券</view>
+				<view class="f1" :style="{color:t('color1')}" v-else-if="order.type==3"><text class="t1">{{order.limit_count}}</text><text class="t2">次</text></view>
+				<view class="f1" :style="{color:t('color1')}" v-else-if="order.type==4">抵运费</view>
+				<view class="f2">
+					<view class="t1">{{order.couponname}}</view>
+					<view class="t2" v-if="order.type==1 || order.type==4">
+						<text v-if="order.minprice>0">满{{order.minprice}}元可用</text>
+						<text v-else>无门槛</text>
+					</view>
+					<view class="t2" v-if="order.type==2">礼品券</view>
+					<view class="t2" v-if="order.type==3">计次券</view>
+				</view>
+			</view>
+			<view class="item">
+				<text class="t1">类型</text>
+				<text class="t2" v-if="order.type==1">代金券</text>
+				<text class="t2" v-if="order.type==2">礼品券</text>
+				<text class="t2" v-if="order.type==3">计次券</text>
+				<text class="t2" v-if="order.type==4">运费抵扣券</text>
+			</view>
+			<block v-if="order.type==3">
+			<view class="item">
+				<text class="t1">共计次数</text>
+				<text class="t2">{{order.limit_count}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">已使用次数</text>
+				<text class="t2">{{order.used_count}}</text>
+			</view>
+			<block v-if="order.limit_perday>0">
+			<view class="item">
+				<text class="t1">每天限制次数</text>
+				<text class="t2">{{order.limit_perday}}</text>
+			</view>
+			</block>
+			</block>
+			<view class="item">
+				<text class="t1">领取时间</text>
+				<text class="t2">{{order.createtime}}</text>
+			</view>
+			<block v-if="order.status==1">
+			<view class="item">
+				<text class="t1">使用时间</text>
+				<text class="t2">{{order.usetime}}</text>
+			</view>
+			</block>
+			
+			<view class="item flex-col">
+				<text class="t1">有效期</text>
+				<text class="t2">{{order.starttime}} 至 {{order.endtime}}</text>
+			</view>
+			<view class="item flex-col">
+				<text class="t1">使用说明</text>
+				<view class="t2">{{order.usetips}}</view>
+			</view>
+		</view>
+	</block>
+	<block v-if="type=='choujiang'">
+		<view style="padding:15px 0 15px 0;">
+			<view style="text-align: center;font-size:20px;color: #3cc51f;font-weight: 400;margin: 0 15%;">核销信息</view>
+		</view>
+		<view class="weui-form-preview">
+			<view class="weui-form-preview__hd">
+				<view class="weui-form-preview__label">核销类型</view>
+				<view class="weui-form-preview__value" style="font-size:32rpx">抽奖奖品</view>
+			</view>
+			<view class="weui-form-preview__bd">
+				<view class="weui-form-preview__item">
+					<view class="weui-form-preview__label">活动名称</view>
+					<view class="weui-form-preview__value">{{order.name}}</view>
+				</view>
+				<view class="weui-form-preview__item">
+					<view class="weui-form-preview__label">奖品名称</view>
+					<view class="weui-form-preview__value" style="font-size:16px;color:#000">{{order.jxmc}}</view>
+				</view>
+				<view class="weui-form-preview__item">
+					<view class="weui-form-preview__label">中奖时间</view>
+					<view class="weui-form-preview__value">{{date(order.createtime,'Y-m-d H:i')}}</view>
+				</view>
+				<view class="weui-form-preview__item">
+					<view class="weui-form-preview__label">用户信息</view>
+					<view class="weui-form-preview__value">{{order.linkman}} {{order.tel}}</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<view style="height:140rpx"></view>
+	<view class="btn-add" :style="{background:t('color1')}" @tap="hexiao">立即核销</view>
+</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		type:'',
+		order:{},
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+    getdata: function () {
+      var that = this;
+			that.loading = true;
+      app.post('ApiAdminHexiao/hexiao',{type:that.type,co:that.opt.co}, function (res) {
+				that.loading = false;
+				if(res.status == 0){
+					app.alert(res.msg,function(){
+						app.goto('/admin/index/index','reLaunch');	
+					});
+					return;
+				}
+				if(res.status == 2){
+					app.confirm(res.msg,function(){
+						app.goto('/admin/index/login','reLaunch');	
+					});
+					return;
+				}
+				that.order = res.order
+				that.loaded(); 
+      });
+    },
+		hexiao:function(){
+      var that = this;
+			app.confirm('确定要核销吗?',function(){
+				app.showLoading('核销中');
+				app.post('ApiAdminHexiao/hexiao',{op:'confirm',type:that.type,co:that.opt.co}, function (res) {
+					app.showLoading(false);
+					if(res.status == 0){
+						app.alert(res.msg);return;
+					}
+					app.alert(res.msg,function(){
+						app.goto('/admin/index/index','reLaunch');	
+					});
+				})
+			})
+		}
+  }
+};
+</script>
+<style>
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+.orderinfo .topitem{display:flex;padding:60rpx 40rpx;align-items:center;border-bottom:2px dashed #E5E5E5;position:relative}
+.orderinfo .topitem .f1{font-size:50rpx;font-weight:bold;}
+.orderinfo .topitem .f1 .t1{font-size:60rpx;}
+.orderinfo .topitem .f1 .t2{font-size:40rpx;}
+.orderinfo .topitem .f2{margin-left:40rpx}
+.orderinfo .topitem .f2 .t1{font-size:36rpx;color:#2B2B2B;font-weight:bold;height:50rpx;line-height:50rpx}
+.orderinfo .topitem .f2 .t2{font-size:24rpx;color:#999999;height:50rpx;line-height:50rpx}
+
+.btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/admin/hexiao/record.vue b/admin/hexiao/record.vue
new file mode 100644
index 0000000..a6f85a7
--- /dev/null
+++ b/admin/hexiao/record.vue
@@ -0,0 +1,142 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">核销记录（共{{count}}条）</text>
+			</view>
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+					<image class="t1" :src="item.headimg"></image>
+					<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" style="color:#000">{{item.title}}</text>
+					<text class="t2">{{date(item.createtime)}}</text>
+					<text class="t3">备注：{{item.remark}}</text>
+				</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		keyword:'',
+		st: 0,
+		count:0,
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminHexiao/record', {keyword:keyword,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1){
+					that.count = res.count;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding:24rpx 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{ width:100%;padding:20rpx 20rpx;border-top: 1px #f5f5f5 solid;display:flex;align-items:center}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%;margin-left:20rpx}
+.content .item .f1 .t2{color:#666666;text-align:center;width:140rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.content .item .f2{ flex:1;width:200rpx;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;line-height:36rpx;font-size:28rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.content .item .f2 .t2{color:#999;height:40rpx;line-height:40rpx;font-size:24rpx}
+.content .item .f2 .t3{color:#aaa;height:40rpx;line-height:40rpx;font-size:24rpx}
+</style>
\ No newline at end of file
diff --git a/admin/images/arrow-green.png b/admin/images/arrow-green.png
new file mode 100644
index 0000000..4e2f4e3
Binary files /dev/null and b/admin/images/arrow-green.png differ
diff --git a/admin/images/arrow-white.png b/admin/images/arrow-white.png
new file mode 100644
index 0000000..51b51ca
Binary files /dev/null and b/admin/images/arrow-white.png differ
diff --git a/admin/images/arrowdown.png b/admin/images/arrowdown.png
new file mode 100644
index 0000000..a40a306
Binary files /dev/null and b/admin/images/arrowdown.png differ
diff --git a/admin/images/arrowright.png b/admin/images/arrowright.png
new file mode 100644
index 0000000..c3bab18
Binary files /dev/null and b/admin/images/arrowright.png differ
diff --git a/admin/images/commissionlog.png b/admin/images/commissionlog.png
new file mode 100644
index 0000000..9527885
Binary files /dev/null and b/admin/images/commissionlog.png differ
diff --git a/admin/images/comwithdrawlog.png b/admin/images/comwithdrawlog.png
new file mode 100644
index 0000000..5b35420
Binary files /dev/null and b/admin/images/comwithdrawlog.png differ
diff --git a/admin/images/face-icon.png b/admin/images/face-icon.png
new file mode 100644
index 0000000..5222b46
Binary files /dev/null and b/admin/images/face-icon.png differ
diff --git a/admin/images/finance.png b/admin/images/finance.png
new file mode 100644
index 0000000..74c6936
Binary files /dev/null and b/admin/images/finance.png differ
diff --git a/admin/images/finance2.png b/admin/images/finance2.png
new file mode 100644
index 0000000..4fbd2c4
Binary files /dev/null and b/admin/images/finance2.png differ
diff --git a/admin/images/ico-scan.png b/admin/images/ico-scan.png
new file mode 100644
index 0000000..5a75298
Binary files /dev/null and b/admin/images/ico-scan.png differ
diff --git a/admin/images/member.png b/admin/images/member.png
new file mode 100644
index 0000000..7e95fd6
Binary files /dev/null and b/admin/images/member.png differ
diff --git a/admin/images/member2.png b/admin/images/member2.png
new file mode 100644
index 0000000..ff4359a
Binary files /dev/null and b/admin/images/member2.png differ
diff --git a/admin/images/moneylog.png b/admin/images/moneylog.png
new file mode 100644
index 0000000..b502a4c
Binary files /dev/null and b/admin/images/moneylog.png differ
diff --git a/admin/images/msg-pic.png b/admin/images/msg-pic.png
new file mode 100644
index 0000000..f0c36a3
Binary files /dev/null and b/admin/images/msg-pic.png differ
diff --git a/admin/images/my.png b/admin/images/my.png
new file mode 100644
index 0000000..a97dbbc
Binary files /dev/null and b/admin/images/my.png differ
diff --git a/admin/images/my2.png b/admin/images/my2.png
new file mode 100644
index 0000000..ed64086
Binary files /dev/null and b/admin/images/my2.png differ
diff --git a/admin/images/order.png b/admin/images/order.png
new file mode 100644
index 0000000..e0dd741
Binary files /dev/null and b/admin/images/order.png differ
diff --git a/admin/images/order1.png b/admin/images/order1.png
new file mode 100644
index 0000000..4e0a597
Binary files /dev/null and b/admin/images/order1.png differ
diff --git a/admin/images/order2.png b/admin/images/order2.png
new file mode 100644
index 0000000..664321e
Binary files /dev/null and b/admin/images/order2.png differ
diff --git a/admin/images/order3.png b/admin/images/order3.png
new file mode 100644
index 0000000..bb54805
Binary files /dev/null and b/admin/images/order3.png differ
diff --git a/admin/images/order4.png b/admin/images/order4.png
new file mode 100644
index 0000000..6efb753
Binary files /dev/null and b/admin/images/order4.png differ
diff --git a/admin/images/rechargelog.png b/admin/images/rechargelog.png
new file mode 100644
index 0000000..4a740dd
Binary files /dev/null and b/admin/images/rechargelog.png differ
diff --git a/admin/images/withdrawlog.png b/admin/images/withdrawlog.png
new file mode 100644
index 0000000..91abf95
Binary files /dev/null and b/admin/images/withdrawlog.png differ
diff --git a/admin/images/zixun.png b/admin/images/zixun.png
new file mode 100644
index 0000000..ce1cdde
Binary files /dev/null and b/admin/images/zixun.png differ
diff --git a/admin/images/zixun2.png b/admin/images/zixun2.png
new file mode 100644
index 0000000..571dadb
Binary files /dev/null and b/admin/images/zixun2.png differ
diff --git a/admin/index/businessqr.vue b/admin/index/businessqr.vue
new file mode 100644
index 0000000..f3b4934
--- /dev/null
+++ b/admin/index/businessqr.vue
@@ -0,0 +1,41 @@
+<template>
+<view class="addressadd">
+	<block v-if="isload">
+		<image :src="poster" style="width:100%" @tap="previewImage" :data-url="poster" mode="widthFix"></image>
+	</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+
+      poster: '',
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminIndex/getbusinessqr', {}, function (res) {
+				that.loading = false;
+				that.poster = res.posterurl;
+				that.loaded();
+			});
+		},
+	}
+};
+</script>
+<style>
+
+</style>
\ No newline at end of file
diff --git a/admin/index/index.vue b/admin/index/index.vue
new file mode 100644
index 0000000..e096426
--- /dev/null
+++ b/admin/index/index.vue
@@ -0,0 +1,490 @@
+<template>
+<view>
+	<block v-if="isload">
+	<view class="banner" :style="{background:'url('+pre_url+'/static/img/topbg.png)',backgroundSize:'100%'}">
+			<image :src="set.logo" background-size="cover" @tap="goto" :data-url="uinfo.bid==0 ? '/pages/index/index' : '/pages/business/index?id='+uinfo.bid"/>
+			<view class="info">
+				 <text class="nickname">{{set.name}}</text>
+				 <text>{{uinfo.un}}</text>
+				 <view  class="recharge" v-if="showrecharge" @tap="goto" data-url="recharge">充值</view>
+			</view>
+			<view class="set" @tap="saoyisao">
+				<image :src="event_rul +'/static/img/static/img/ico-scan.png'"></image>
+			</view>
+	</view>
+	<view class="contentdata">
+		<block v-if="auth_data.order">
+		<view class="order">
+			<view class="head">
+				<text class="f1">商城订单</text>
+				<view class="f2" @tap="goto" data-url="../order/shoporder"><text>查看全部订单</text><image :src="event_rul +'/static/img/static/img/arrowright.png'"></image></view>
+			</view>
+			<view class="content">
+				 <view class="item" @tap="goto" data-url="../order/shoporder?st=0">
+						<image :src="event_rul +'/static/img/static/img/order1.png'"></image>
+						<text class="t3">待付款({{count0}})</text>
+				 </view>
+				 <view class="item" @tap="goto" data-url="../order/shoporder?st=1">
+						<image :src="event_rul +'/static/img/static/img/order2.png'"></image>
+						<text class="t3">待发货({{count1}})</text>
+				 </view>
+				 <view class="item" @tap="goto" data-url="../order/shoporder?st=2">
+						<image :src="event_rul +'/static/img/static/img/order3.png'"></image>
+						<text class="t3">待收货({{count2}})</text>
+				 </view>
+				 <view class="item" @tap="goto" data-url="../order/shopRefundOrder">
+						<image :src="event_rul +'/static/img/static/img/order4.png'"></image>
+						<text class="t3">退款/售后({{count4}})</text>
+				 </view>
+			</view>
+		</view>
+		<view class="list">
+			<view class="item" @tap="goto" data-url="../order/collageorder" v-if="showcollageorder">
+				<view class="f2">拼团订单</view>
+				<text class="f3">{{collageCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../order/kanjiaorder" v-if="showkanjiaorder">
+				<view class="f2">砍价订单</view>
+				<text class="f3">{{kanjiaCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../order/seckillorder" v-if="showseckillorder">
+				<view class="f2">秒杀订单</view>
+				<text class="f3">{{seckillCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../order/tuangouorder" v-if="showtuangouorder">
+				<view class="f2">团购订单</view>
+				<text class="f3">{{tuangouCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../order/scoreshoporder" v-if="showscoreshoporder">
+				<view class="f2">{{t('积分')}}商城订单</view>
+				<text class="f3">{{scoreshopCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../order/luckycollageorder" v-if="showluckycollageorder">
+				<view class="f2">幸运拼团订单</view>
+				<text class="f3">{{luckycollageCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../form/formlog" v-if="showformlog">
+				<view class="f2">表单提交记录</view>
+				<text class="f3">{{formlogCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../order/yuyueorder" v-if="showyuyueorder">
+				<view class="f2">预约订单</view>
+				<text class="f3">{{yuyueorderCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			
+		</view>
+		</block>
+		
+			<view class="list"  v-if="showworkorder">
+				<view class="item" @tap="goto" data-url="../workorder/record">
+					<view class="f2">工单记录</view>
+					<text class="f3">{{workordercount}}</text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+
+		<block v-if="auth_data.product">
+		<view class="list">
+			<view class="item" @tap="goto" data-url="../product/index">
+				<view class="f2">商品列表</view>
+				<text class="f3">{{productCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../product/edit">
+				<view class="f2">添加商品</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+		</block>
+		
+		<block v-if="auth_data.restaurant_product || auth_data.restaurant_table || auth_data.restaurant_tableWaiter">
+			<view class="list">
+				<view v-if="auth_data.restaurant_product" class="item" @tap="goto" data-url="../restaurant/product/index">
+					<view class="f2">菜品列表</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_product" class="item" @tap="goto" data-url="../restaurant/product/edit">
+					<view class="f2">添加菜品</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_product" class="item" @tap="goto" data-url="../restaurant/category/index">
+					<view class="f2">菜品分类</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_product" class="item" @tap="goto" data-url="../restaurant/category/edit">
+					<view class="f2">添加分类</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_table" class="item" @tap="goto" data-url="../restaurant/tableCategory">
+					<view class="f2">餐桌分类</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_table" class="item" @tap="goto" data-url="../restaurant/table">
+					<view class="f2">餐桌编辑</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_tableWaiter" class="item" @tap="goto" data-url="../restaurant/tableWaiter">
+					<view class="f2">餐桌管理</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+		</block>
+		<block v-if="auth_data.restaurant_takeaway || auth_data.restaurant_shop || auth_data.restaurant_booking || auth_data.restaurant_deposit || auth_data.restaurant_queue">
+			<view class="list">
+				<view v-if="auth_data.restaurant_takeaway" class="item" @tap="goto" data-url="../restaurant/takeawayorder">
+					<view class="f2">外卖订单</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_shop" class="item" @tap="goto" data-url="../restaurant/shoporder">
+					<view class="f2">点餐订单</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_booking" class="item" @tap="goto" data-url="../restaurant/bookingorder">
+					<view class="f2">预定订单</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_booking" class="item" @tap="goto" data-url="../restaurant/booking">
+					<view class="f2">添加预定</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_deposit" class="item" @tap="goto" data-url="../restaurant/depositorder">
+					<view class="f2">寄存订单</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_queue" class="item" @tap="goto" data-url="../restaurant/queue">
+					<view class="f2">排队叫号</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view v-if="auth_data.restaurant_queue" class="item" @tap="goto" data-url="../restaurant/queueCategory">
+					<view class="f2">排队管理</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+		</block>
+
+		<view class="list">
+			<view class="item" @tap="goto" data-url="../hexiao/record">
+				<view class="f2">我的核销</view>
+				<text class="f3">{{hexiaoCount}}</text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+
+		<view class="list">
+			<view class="item" v-if="uinfo.tmpl_orderconfirm_show==1">
+				<view class="f2">订单提交通知</view>
+				<view class="f3"><switch value="1" :checked="uinfo.tmpl_orderconfirm==1?true:false" @change="switchchange" data-type="tmpl_orderconfirm"></switch></view>
+			</view>
+			<view class="item" v-if="uinfo.tmpl_orderpay_show==1">
+				<view class="f2">订单支付通知</view>
+				<view class="f3"><switch value="1" :checked="uinfo.tmpl_orderpay==1?true:false" @change="switchchange" data-type="tmpl_orderpay"></switch></view>
+			</view>
+			<view class="item" v-if="uinfo.tmpl_ordershouhuo_show==1">
+				<view class="f2">订单收货通知</view>
+				<view class="f3"><switch value="1" :checked="uinfo.tmpl_ordershouhuo==1?true:false" @change="switchchange" data-type="tmpl_ordershouhuo"></switch></view>
+			</view>
+			<view class="item" v-if="uinfo.tmpl_ordertui_show==1">
+				<view class="f2">退款申请通知</view>
+				<view class="f3"><switch value="1" :checked="uinfo.tmpl_ordertui==1?true:false" @change="switchchange" data-type="tmpl_ordertui"></switch></view>
+			</view>
+			<view class="item" v-if="uinfo.tmpl_withdraw_show==1">
+				<view class="f2">提现申请通知</view>
+				<view class="f3"><switch value="1" :checked="uinfo.tmpl_withdraw==1?true:false" @change="switchchange" data-type="tmpl_withdraw"></switch></view>
+			</view>
+			<view class="item" v-if="uinfo.tmpl_formsub_show==1">
+				<view class="f2">表单提交通知</view>
+				<view class="f3"><switch value="1" :checked="uinfo.tmpl_formsub==1?true:false" @change="switchchange" data-type="tmpl_formsub"></switch></view>
+			</view>
+			<view class="item" v-if="uinfo.tmpl_kehuzixun_show==1">
+				<view class="f2">用户咨询通知</view>
+				<view class="f3"><switch value="1" :checked="uinfo.tmpl_kehuzixun==1?true:false" @change="switchchange" data-type="tmpl_kehuzixun"></switch></view>
+			</view>
+		</view>
+		<view class="list">
+			<view v-if="showbusinessqr" class="item" @tap="goto" data-url="businessqr">
+				<view class="f2">推广码</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view v-if="showbusinessqr" class="item" @tap="goto" data-url="businessqr">
+				<view class="f2">推广码</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../workorder/add" v-if="showworkadd" >
+				<view class="f2">工单提交</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="setinfo" v-if="uinfo.bid>0">
+				<view class="f2">店铺设置</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="setpwd">
+				<view class="f2">修改密码</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+			<view class="item" @tap="goto" data-url="../index/login">
+				<view class="f2">切换账号</view>
+				<text class="f3"></text>
+				<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+			</view>
+		</view>
+	</view>
+
+	<view class="tabbar">
+		<view class="tabbar-bot"></view>
+		<view class="tabbar-bar" style="background-color:#ffffff">
+			<view @tap="goto" data-url="../member/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.member">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/member.png'"></image>
+				</view>
+				<view class="tabbar-text">{{t('会员')}}</view>
+			</view>
+			<view @tap="goto" data-url="../kefu/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.zixun">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/zixun.png'"></image>
+				</view>
+				<view class="tabbar-text">咨询</view>
+			</view>
+			<view @tap="goto" data-url="../finance/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.finance">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/finance.png'"></image>
+				</view>
+				<view class="tabbar-text">财务</view>
+			</view>
+			<view @tap="goto" data-url="../index/index" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/my2.png'"></image>
+				</view>
+				<view class="tabbar-text active">我的</view>
+			</view>
+		</view>
+	</view>
+	</block>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+			pre_url:app.globalData.pre_url,
+
+			set:{},
+			uinfo:{},
+			count0: 0,
+			count1: 0,
+			count2: 0,
+			count3: 0,
+			count4: 0,
+			seckillCount: 0,
+			collageCount: 0,
+			kanjiaCount: 0,
+			tuangouCount:0,
+			scoreshopCount: 0,
+			maidanCount: 0,
+			productCount: 0,
+			yuyueorderCount: 0,
+			hexiaoCount: 0,
+			formlogCount:0,
+			auth_data: {},
+			showbusinessqr:false,
+			showyuyueorder:false,
+			showcollageorder:false,
+			showkanjiaorder:false,
+			showseckillorder:false,
+			showscoreshoporder:false,
+			showluckycollageorder:false,
+			showtuangouorder:false,
+			showformlog:false,
+			showworkorder:false,
+			showworkadd:false,
+			workorderCount:0,
+			showrecharge:false,
+
+			event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminIndex/index', {}, function (res) {
+				that.loading = false;
+				that.set = res.set;
+				that.uinfo = res.uinfo;
+				that.count0 = res.count0;
+				that.count1 = res.count1;
+				that.count2 = res.count2;
+				that.count3 = res.count3;
+				that.count4 = res.count4;
+				that.seckillCount = res.seckillCount;
+				that.collageCount = res.collageCount;
+				that.luckycollageCount = res.luckycollageCount;
+				that.kanjiaCount = res.kanjiaCount;
+				that.tuangouCount = res.tuangouCount;
+				that.scoreshopCount = res.scoreshopCount;
+				that.yuyueCount = res.yuyueCount;
+				that.maidanCount = res.maidanCount;
+				that.productCount = res.productCount;
+				that.hexiaoCount = res.hexiaoCount;
+				that.formlogCount = res.formlogCount;
+				that.auth_data = res.auth_data;
+				that.showbusinessqr = res.showbusinessqr;
+				that.yuyueorderCount = res.yuyueorderCount;
+				that.workordercount = res.workordercount;
+				
+				that.showcollageorder = res.showcollageorder;
+				that.showkanjiaorder = res.showkanjiaorder;
+				that.showseckillorder = res.showseckillorder;
+				that.showtuangouorder = res.showtuangouorder;
+				that.showscoreshoporder = res.showscoreshoporder;
+				that.showluckycollageorder = res.showluckycollageorder;
+				that.showformlog = res.showformlog;
+				that.showworkorder = res.showworkorder;
+				that.showworkadd = res.showworkadd;
+				that.showyuyueorder = res.showyuyueorder;
+				that.showrecharge = res.showrecharge;
+				that.loaded();
+			});
+		},
+    switchchange: function (e) {
+      console.log(e);
+      var field = e.currentTarget.dataset.type;
+      var value = e.detail.value ? 1 : 0;
+      app.post('ApiAdminIndex/setusertmpl', {
+        field: field,
+        value: value
+      }, function (data) {});
+    },
+    saoyisao: function (d) {
+      var that = this;
+			if(app.globalData.platform == 'h5'){
+				app.alert('请使用微信扫一扫功能扫码核销');return;
+			}else if(app.globalData.platform == 'mp'){
+				var jweixin = require('jweixin-module');
+				jweixin.ready(function () {   //需在用户可能点击分享按钮前就先调用
+					jweixin.scanQRCode({
+						needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+						scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+						success: function (res) {
+							var content = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+							var params = content.split('?')[1];
+							app.goto('/admin/hexiao/hexiao?'+params);
+							//if(content.length == 18 && (/^\d+$/.test(content))){ //是十八位数字 付款码
+							//	location.href = "{:url('shoukuan')}/aid/{$aid}/auth_code/"+content
+							//}else{
+							//	location.href = content;
+							//}
+						}
+					});
+				});
+			}else{
+				uni.scanCode({
+					success: function (res) {
+						console.log(res);
+						var content = res.result;
+						var params = content.split('?')[1];
+						app.goto('/admin/hexiao/hexiao?'+params);
+					}
+				});
+			}
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.banner{ display:flex;width:100%;height:352rpx;padding:40rpx 32rpx;color:#fff;position:relative}
+.banner image{ width:120rpx;height:120rpx;border-radius:50%;margin-right:20rpx}
+.banner .info{display:flex;flex:auto;flex-direction:column;padding-top:10rpx}
+.banner .info .nickname{font-size:32rpx;font-weight:bold;padding-bottom:12rpx}
+.banner .set{ width:70rpx;height:100rpx;line-height:100rpx;font-size:40rpx;text-align:center}
+.banner .set image{width:50rpx;height:50rpx;border-radius:0}
+
+.contentdata{display:flex;flex-direction:column;width:100%;padding:0 30rpx;margin-top:-160rpx;position:relative;margin-bottom:20rpx}
+.money{ display:flex;width:100%;align-items:center;padding:10rpx 20rpx;background:#fff;}
+.money .f1{flex:auto}
+.money .f1 .t2{color:#ff3300}
+.money .f2{ background:#fff;color:#ff3300;border:1px solid #ff3300;height:50rpx;line-height:50rpx;padding:0 14rpx;font-size: 28rpx;}
+
+.score{ display:flex;width:100%;align-items:center;padding:10rpx 20rpx;background:#fff;border-top:1px dotted #eee}
+.score .f1 .t2{color:#ff3300}
+
+.order{width:100%;background:#fff;padding:0 20rpx;margin-top:20rpx;border-radius:16rpx}
+.order .head{ display:flex;align-items:center;width:100%;padding:10rpx 0;border-bottom:0px solid #eee}
+.order .head .f1{flex:auto;color:#333}
+.order .head .f2{ display:flex;align-items:center;color:#FC5648;width:200rpx;padding:10rpx 0;text-align:right;justify-content:flex-end}
+.order .head .f2 image{ width:30rpx;height:30rpx;}
+.order .head .t3{ width: 40rpx; height: 40rpx;}
+.order .content{ display:flex;width:100%;padding:10rpx 0;align-items:center;font-size:24rpx}
+.order .content .item{padding:10rpx 0;flex:1;display:flex;flex-direction:column;align-items:center;position:relative}
+.order .content .item image{ width:50rpx;height:50rpx}
+.order .content .item .t3{ padding-top:3px;color:#333}
+.order .content .item .t2{background: red;color: #fff;border-radius:50%;padding: 0 10rpx;position: absolute;top: 0px;right:40rpx;width:34rpx;height:34rpx;text-align:center;}
+
+.agent{width:100%;background:#fff;padding:0px 20rpx;margin-top:20rpx}
+.agent .head{ display:flex;align-items:center;width:100%;padding:10rpx 0;border-bottom:1px solid #eee}
+.agent .head .f1{flex:auto;}
+.agent .head .f2{ display:flex;align-items:center;color:#999;width:200rpx;padding:10rpx 0;text-align:right;justify-content:flex-end}
+.agent .head .f2 image{ width:30rpx;height:30rpx;}
+.agent .head .t3{ width: 40rpx; height: 40rpx;}
+.agent .content{ display:flex;width:100%;padding:10rpx 0;align-items:center;font-size:24rpx}
+.agent .content .item{padding:10rpx 0;flex:1;display:flex;flex-direction:column;align-items:center;position:relative}
+.agent .content .item image{ width:50rpx;height:50rpx}
+.agent .content .item .t3{ padding-top:3px}
+.agent .content .item .t2{background: red;color: #fff;border-radius:50%;padding: 0 10rpx;position: absolute;top: 0px;right:40rpx;}
+
+.list{ width: 100%;background: #fff;margin-top:20rpx;padding:0 20rpx;font-size:30rpx;border-radius:16rpx}
+.list .item{ height:100rpx;display:flex;align-items:center;border-bottom:0px solid #eee}
+.list .item:last-child{border-bottom:0;}
+.list .f1{width:50rpx;height:50rpx;line-height:50rpx;display:flex;align-items:center;}
+.list .f1 image{ width:40rpx;height:40rpx;}
+.list .f1 span{ width:40rpx;height:40rpx;font-size:40rpx}
+.list .f2{color:#222}
+.list .f3{ color: #FC5648;text-align:right;flex:1;}
+.list .f4{ width: 24rpx; height: 24rpx;}
+
+.recharge{ background: #fff; width: 100rpx;color: #FB6534; text-align: center; font-size: 20rpx; padding: 5rpx; border-radius: 10rpx; margin-top: 10rpx;}
+
+switch{transform:scale(.7);}
+</style>
\ No newline at end of file
diff --git a/admin/index/login.vue b/admin/index/login.vue
new file mode 100644
index 0000000..a4283be
--- /dev/null
+++ b/admin/index/login.vue
@@ -0,0 +1,118 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="title">管理员登录</view>
+		<view class="loginform">
+			<view class="form-item">
+				<image :src="event_rul + '/static/img/static/img/reg-tel.png'" class="img"/>
+				<input type="text" class="input" placeholder="请输入登录账号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="username" value=""/>
+			</view>
+			<view class="form-item">
+				<image :src="event_rul + '/static/img/static/img/reg-pwd.png'" class="img"/>
+				<input type="text" class="input" placeholder="请输入密码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="password" value="" :password="true"/>
+			</view>
+			<view class="form-item">
+					<image :src="event_rul + '/static/img/static/img/reg-code.png'" class="img"/>
+					<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="captcha" value=""/>
+					<image @tap="regetcaptcha" :src="pre_url+'/?s=/ApiIndex/captcha&aid='+aid+'&session_id='+session_id+'&t='+randt" style="width:240rpx;height:80rpx"/>
+				</view>
+			<button class="form-btn" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" form-type="submit">登录</button>
+		</view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+		aid:app.globalData.aid,
+		session_id:app.globalData.session_id,
+		captcha_src:'',
+		randt:'',
+
+		event_rul: app.globalData.event_url,
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get("ApiAdminIndex/login", {}, function (res) {
+				that.loading = false;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+			var that = this;
+      var formdata = e.detail.value;
+      if (formdata.username == ''){
+        app.alert('请输入账号');
+        return;
+      }
+			if (formdata.password == '') {
+				app.alert('请输入密码');
+				return;
+			}
+			if (formdata.captcha == '') {
+				app.alert('请输入验证码');
+				return;
+			}
+			
+			app.showLoading('提交中');
+      app.post("ApiAdminIndex/login", {username:formdata.username,password:formdata.password,captcha:formdata.captcha}, function (res) {
+				app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('index');
+          }, 1000);
+        } else {
+          app.error(res.msg);
+					if(res.status==2){
+						that.randt = that.randt+'1';
+					}
+        }
+      });
+    },
+		regetcaptcha:function(){
+			this.randt = this.randt+'1';
+		}
+  }
+};
+</script>
+
+<style>
+page{background:#ffffff}
+.container{width:100%;}
+.title{margin:70rpx 50rpx 50rpx 40rpx;height:60rpx;line-height:60rpx;font-size: 48rpx;font-weight: bold;color: #000000;}
+.loginform{ width:100%;padding:0 50rpx;border-radius:5px;background: #FFF;}
+.loginform .form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:88rpx;line-height:88rpx;border-bottom:1px solid #F0F3F6;margin-top:20rpx}
+.loginform .form-item:last-child{border:0}
+.loginform .form-item .img{width:44rpx;height:44rpx;margin-right:30rpx}
+.loginform .form-item .input{flex:1;color: #000;}
+.loginform .form-item .code{font-size:30rpx}
+.loginform .form-btn{margin-top:60rpx;width:100%;height:96rpx;line-height:96rpx;color:#fff;font-size:30rpx;border-radius: 48rpx;}
+
+</style>
\ No newline at end of file
diff --git a/admin/index/recharge.vue b/admin/index/recharge.vue
new file mode 100644
index 0000000..8f8a708
--- /dev/null
+++ b/admin/index/recharge.vue
@@ -0,0 +1,139 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="mymoney" :style="{background:t('color1')}">
+			<view class="f1">我的{{t('余额')}}</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{data.money}}</view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">充值金额(元)</view></view>
+			<block v-if="caninput==1">
+				<view class="item3"><view class="f1">￥</view><view class="f2"><input type="digit" name="money" :value="money" placeholder="请输入充值金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput" style="font-size:60rpx"/></view></view>
+			</block>
+
+		</view>
+		<view class="op">
+			<view class="btn" @tap="topay" :style="{background:t('color1')}">去支付</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			textset:{},
+			canrecharge:0,
+      userinfo: {},
+			giveset:[],
+			shuoming:'',
+      money: '',
+      moneyduan: 0,
+      give_coupon_list: "",
+      give_coupon_show: false,
+      give_coupon_close_url: "",
+			caninput:1,
+			transfer:false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			app.loading = true;
+			app.get('ApiAdminIndex/getBusiness', {}, function (res) {
+				app.loading = false;
+				that.data = res.data;
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var money = e.detail.value;
+      var giveset = this.giveset;
+
+      if (parseFloat(money) < 0) {
+        app.error('必须大于0');
+      } else {
+        var moneyduan = 0;
+        if (giveset.length > 0) {
+          for (var i in giveset) {
+            if (money * 1 >= giveset[i]['money'] * 1 && giveset[i]['money'] * 1 > moneyduan) {
+              moneyduan = giveset[i]['money'] * 1;
+            }
+          }
+        }
+        this.money = money;
+        this.moneyduan = moneyduan;
+      }
+    },
+    selectgiveset: function (e) {
+      var money = e.currentTarget.dataset.money;
+      this.money = money;
+      this.moneyduan = money;
+    },
+    topay: function (e) {
+      var that = this;
+      var money = that.money;
+			var paytype = e.currentTarget.dataset.paytype;
+			that.loading = true;
+      app.post('ApiAdminIndex/recharge',{money: money},function (res) {
+				that.loading = false;
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        }
+				app.goto('/pages/pay/pay?id='+res.payorderid);
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx}
+.content2 .item2 .f1{height:120rpx;line-height:120rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;border-bottom:1px solid #F0F0F0;}
+.content2 .item3 .f1{height:120rpx;line-height:120rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 input{height:120rpx;line-height:120rpx;}
+
+.op{width:96%;margin:20rpx 2%;display:flex;align-items:center;margin-top:40rpx}
+.op .btn{flex:1;height:100rpx;line-height:100rpx;background:#07C160;width:90%;margin:0 10rpx;border-radius:10rpx;color: #fff;font-size:28rpx;font-weight:bold;display:flex;align-items:center;justify-content:center}
+.op .btn .img{width:48rpx;height:48rpx;margin-right:20rpx}
+
+.giveset{width:100%;padding:20rpx 0rpx;display:flex;flex-wrap:wrap;justify-content:center}
+.giveset .item{margin:10rpx;padding:15rpx 0;width:210rpx;height:120rpx;background:#FDF6F6;border-radius:10rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.giveset .item .t1{color:#545454;font-size:32rpx;}
+.giveset .item .t2{color:#8C8C8C;font-size:20rpx;margin-top:6rpx}
+.giveset .item.active .t1{color:#fff;font-size:32rpx}
+.giveset .item.active .t2{color:#fff;font-size:20rpx}
+</style>
\ No newline at end of file
diff --git a/admin/index/setinfo.vue b/admin/index/setinfo.vue
new file mode 100644
index 0000000..77059bb
--- /dev/null
+++ b/admin/index/setinfo.vue
@@ -0,0 +1,342 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="apply_box">
+				<view class="apply_item">
+					<view>商家名称<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="name" :value="info.name" :disabled="true" placeholder="请输入商家名称"></input></view>
+				</view>
+				<view class="apply_item">
+					<view>商家描述<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="desc" :value="info.desc" placeholder="请输入商家描述"></input></view>
+				</view>
+				<view class="apply_item">
+					<view>店铺坐标<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" disabled placeholder="请选择坐标" name="zuobiao" :value="latitude ? latitude+','+longitude:''" @tap="locationSelect"></input></view>
+				</view>
+				<view class="apply_item">
+					<view>店铺地址<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="address" :value="address" placeholder="请输入商家详细地址"></input></view>
+				</view>
+				<input type="text" hidden="true" name="latitude" :value="latitude"></input>
+				<input type="text" hidden="true" name="longitude" :value="longitude"></input>
+				<view class="apply_item">
+					<view>客服电话<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="tel" :value="info.tel" placeholder="请填写客服电话"></input></view>
+				</view>
+				<view class="apply_item" style="line-height:50rpx"><textarea name="content" placeholder="请输入商家简介" :value="info.content"></textarea></view>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item" style="border-bottom:0"><text>商家主图<text style="color:red"> *</text></text></view>
+				<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					<view v-for="(item, index) in pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pic"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pic" v-if="pic.length==0"></view>
+				</view>
+				<input type="text" hidden="true" name="logo" :value="pic.join(',')" maxlength="-1"></input>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item" style="border-bottom:0"><text>商家照片(3-5张)<text style="color:red"> *</text></text></view>
+				<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" v-if="pics.length<5"></view>
+				</view>
+				<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item" style="border-bottom:0"><text>营业时间<text style="color:red"> *</text></text></view>
+					<view class="flex-col" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					<view class="flex-y-center">
+						<picker mode="time" :value="start_hours" @change="bindStartHoursChange">
+							 <view class="picker">{{start_hours}}</view>
+						 </picker>
+						 <view style="padding:0 30rpx;color:#222;">到</view>
+						 <picker mode="time" :value="end_hours" @change="bindEndHoursChange">
+							 <view class="picker">{{end_hours}}</view>
+						 </picker>
+					</view>
+					<view class="flex-y-center">
+						<picker mode="time" :value="start_hours2" @change="bindStartHours2Change">
+							 <view class="picker">{{start_hours2}}</view>
+						 </picker>
+						 <view style="padding:0 30rpx;color:#222;">到</view>
+						 <picker mode="time" :value="end_hours2" @change="bindEndHours2Change">
+							 <view class="picker">{{end_hours2}}</view>
+						 </picker>
+					</view>
+					<view class="flex-y-center">
+						<picker mode="time" :value="start_hours3" @change="bindStartHours3Change">
+							 <view class="picker">{{start_hours3}}</view>
+						 </picker>
+						 <view style="padding:0 30rpx;color:#222;">到</view>
+						 <picker mode="time" :value="end_hours3" @change="bindEndHours3Change">
+							 <view class="picker">{{end_hours3}}</view>
+						 </picker>
+					</view>
+				</view>
+				<view class="apply_item">
+					<text>店铺状态<text style="color:red"> *</text></text>
+					<view class="flex-y-center">
+						<radio-group class="radio-group" name="is_open" @change="bindStatusChange">
+							<label><radio value="1" :checked="info.is_open==1?true:false"></radio> 开启</label> 
+							<label><radio value="0" :checked="info.is_open==0?true:false"></radio> 关闭</label>
+						</radio-group>
+					</view>
+				</view>
+			</view>
+			<view style="padding:30rpx 0"><button form-type="submit" class="set-btn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'">确 定</button></view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		datalist: [],
+		pagenum: 1,
+		cateArr: [],
+		cindex: 0,
+		pic:[],
+		pics:[],
+		info: {},
+		latitude: '',
+		longitude: '',
+		address:'',
+		start_hours:'00:00',
+		end_hours:'00:00',
+		start_hours2:'00:00',
+		end_hours2:'00:00',
+		start_hours3:'00:00',
+		end_hours3:'00:00',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminIndex/setinfo', {}, function (res) {
+				that.loading = false;
+				if (res.status == 2) {
+					app.alert(res.msg, function () {
+						app.goto('/admin/index/index', 'redirect');
+					})
+					return;
+				}
+				uni.setNavigationBarTitle({
+					title: res.title
+				});
+				var clist = res.clist;
+				var cateArr = [];
+				for (var i in clist) {
+					cateArr.push(clist[i].name);
+				}
+				var pics = res.info ? res.info.pics : '';
+				if (pics) {
+					pics = pics.split(',');
+				} else {
+					pics = [];
+				}
+				that.pics = pics;
+				that.info = res.info;
+        that.address = res.info.address;
+        that.latitude = res.info.latitude;
+        that.longitude = res.info.longitude;
+				that.cateArr = cateArr;
+				that.pic = res.info.logo ? [res.info.logo] : [];
+				that.start_hours = res.info.start_hours ? res.info.start_hours : '00:00';
+				that.end_hours = res.info.end_hours ? res.info.end_hours : '00:00';
+				that.start_hours2 = res.info.start_hours2 ? res.info.start_hours2 : '00:00';
+				that.end_hours2 = res.info.end_hours2 ? res.info.end_hours2 : '00:00';
+				that.start_hours3 = res.info.start_hours3 ? res.info.start_hours3 : '00:00';
+				that.end_hours3 = res.info.end_hours3 ? res.info.end_hours3 : '00:00';
+				that.loaded();
+			});
+		},
+    cateChange: function (e) {
+      this.cindex = e.detail.value;
+    },
+    locationSelect: function () {
+      var that = this;
+      uni.chooseLocation({
+        success: function (res) {
+          that.info.address = res.name;
+					that.info.latitude = res.latitude;
+          that.info.longitude = res.longitude;
+          that.address = res.name;
+          that.latitude = res.latitude;
+          that.longitude = res.longitude;
+        }
+      });
+    },
+		
+		bindStartHoursChange:function(e){
+			this.start_hours = e.target.value
+		},
+		bindEndHoursChange:function(e){
+			this.end_hours = e.target.value
+		},
+		
+		bindStartHours2Change:function(e){
+			this.start_hours2 = e.target.value
+		},
+		bindEndHours2Change:function(e){
+			this.end_hours2 = e.target.value
+		},
+		
+		bindStartHours3Change:function(e){
+			this.start_hours3 = e.target.value
+		},
+		bindEndHours3Change:function(e){
+			this.end_hours3 = e.target.value
+		},
+    subform: function (e) {
+      var that = this;
+      var info = e.detail.value;
+      if (info.tel == '') {
+        app.error('请填写客服电话');
+        return false;
+      }
+      if (info.zuobiao == '') {
+        //app.error('请选择店铺坐标');
+        //return false;
+      }
+      if (info.address == '') {
+        app.error('请填写店铺地址');
+        return false;
+      }
+      if (info.pic == '') {
+        app.error('请上传商家主图');
+        return false;
+      }
+      if (info.pics == '') {
+        app.error('请上传商家照片');
+        return false;
+      }
+      info.address = that.address;
+      info.latitude = that.latitude;
+      info.longitude = that.longitude;
+			info.start_hours = that.start_hours ? that.start_hours : '00:00';
+			info.end_hours = that.end_hours ? that.end_hours : '00:00';
+			info.start_hours2 = that.start_hours2 ? that.start_hours2 : '00:00';
+			info.end_hours2 = that.end_hours2 ? that.end_hours2 : '00:00';
+			info.start_hours3 = that.start_hours3 ? that.start_hours3 : '00:00';
+			info.end_hours3 = that.end_hours3 ? that.end_hours3 : '00:00';
+
+			app.showLoading('提交中');
+      app.post("ApiAdminIndex/setinfo", {info: info}, function (res) {
+				app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('index');
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    },
+    isagreeChange: function (e) {
+      console.log(e.detail.value);
+      var val = e.detail.value;
+      if (val.length > 0) {
+        this.isagree = true;
+      } else {
+        this.isagree = false;
+      }
+    },
+    showxieyiFun: function () {
+      this.showxieyi = true;
+    },
+    hidexieyi: function () {
+      this.showxieyi = false;
+			this.isagree = true;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'pic'){
+				var pics = that.pic
+				pics.splice(index,1);
+				that.pic = pics;
+			}else if(field == 'pics'){
+				var pics = that.pics
+				pics.splice(index,1);
+				that.pics = pics;
+			}else if(field == 'zhengming'){
+				var pics = that.zhengming
+				pics.splice(index,1);
+				that.zhengming = pics;
+			}
+		},
+  }
+}
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.apply_box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.apply_title { background: #fff}
+.apply_title .qr_goback{ width:18rpx;height:32rpx; margin-left:24rpx;     margin-top: 34rpx;}
+.apply_title .qr_title{ font-size: 36rpx; color: #242424;   font-weight:bold;margin: 0 auto; line-height: 100rpx;}
+
+.apply_item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.apply_box .apply_item:last-child{ border:none}
+.apply_item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.apply_item input::placeholder{ color:#999999}
+.apply_item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.apply_item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.apply_item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.set-btn{width: 90%;margin:0 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/index/setpwd.vue b/admin/index/setpwd.vue
new file mode 100644
index 0000000..ce9d25f
--- /dev/null
+++ b/admin/index/setpwd.vue
@@ -0,0 +1,110 @@
+<template>
+<view class="addressadd">
+	<block v-if="isload">
+	<form id="setform" @submit="confirm">
+		<view class="form">
+			<view class="form-item">
+				<label class="label">登录账户</label>
+				<view class="f2 flex flex1">{{user.un}}</view>
+			</view>
+			<view class="form-item">
+				<label class="label">原 密 码</label>
+				<view class="f2 flex flex1">
+					<input type="text" password="true" name="oldpwd" value="" placeholder="请输入原密码" placeholder-style="font-size:28rpx" autocomplete="off"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<label class="label">新 密 码</label>
+				<view class="f2 flex flex1">
+					<input type="text" password="true" name="pwd" value="" placeholder="请输入新密码" placeholder-style="font-size:28rpx" autocomplete="off"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<label class="label">确认密码</label>
+				<view class="f2 flex flex1">
+					<input type="text" password="true" name="repwd" value="" placeholder="请再次输入密码" placeholder-style="font-size:28rpx" autocomplete="off"></input>
+				</view>
+			</view>
+		</view>
+		<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">确定修改</button>
+	</form>
+	</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+
+      user: [],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminIndex/setpwd', {}, function (res) {
+				that.loading = false;
+				that.user = res.user;
+				that.loaded();
+			});
+		},
+    confirm: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+      var oldpwd = formdata.oldpwd;
+      var pwd = formdata.pwd;
+      var repwd = formdata.repwd;
+
+      if(!oldpwd){
+        app.error('请输入原密码');
+        return;
+      }
+      if(!pwd){
+        app.error('请输入新密码');
+        return;
+      }
+      if(!repwd){
+        app.error('请再次输入新密码');
+        return;
+      }
+      if(pwd != repwd){
+        app.error('两次新密码输入不一致');
+        return;
+      }
+			app.showLoading('修改中');
+      app.post('ApiAdminIndex/setpwd',{oldpwd: oldpwd,pwd: pwd,repwd: repwd},function(res){
+				app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('index');
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{ color:#8B8B8B;font-weight:bold;height: 60rpx; line-height: 60rpx; text-align:left;width:200rpx;padding-right:20rpx}
+.form-item .input{ flex:1;height: 60rpx; line-height: 60rpx;text-align:right}
+
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+</style>
\ No newline at end of file
diff --git a/admin/index/withdraw.vue b/admin/index/withdraw.vue
new file mode 100644
index 0000000..f696ae1
--- /dev/null
+++ b/admin/index/withdraw.vue
@@ -0,0 +1,158 @@
+<template>
+<view>
+<form report-submit="true" @submit="formSubmit">
+<view class="container">
+	<image :src="pre_url + '/static/m/images/money.png'" class="img"></image>
+	<view class="f1">您的当前余额</view>
+	<view class="f2">￥{{binfo.money}}</view>
+	<view class="f3">
+		<text class="t1">提现金额</text>
+		<view class="t2">
+			<text class="x1">￥</text>
+			<input type="digit" name="money" placeholder="请输入金额" placeholder-style="color:#666;font-size:32rpx" placeholder-class="pclass" @input="moneyinput"></input>
+		</view>
+	</view>
+  <view class="f4" v-if="bset.withdrawfee>0 || bset.withdrawmin>0">
+		<text v-if="bset.withdrawmin>0">最低提现金额{{bset.withdrawmin}}元 </text>
+		<text v-if="bset.withdrawfee>0">提现手续费{{bset.withdrawfee}}% </text>
+	</view>
+	<view class="withdrawtype flex flex-x-center flex-y-center" style="width:100%;margin:20rpx 0">
+		<view style="font-size:26rpx;margin-right:10rpx">提现方式：</view>
+		<radio-group class="radio-group flex" name="paytype">
+			<label class="radio flex-y-center" v-if="bset.withdraw_weixin==1">
+				<radio value="微信钱包" checked="checked"></radio>微信钱包
+			</label>
+			<label class="radio flex-y-center" v-if="bset.withdraw_aliaccount==1">
+				<radio value="支付宝" v-if="!bset.withdraw_weixin || bset.withdraw_weixin==0" checked="checked"></radio>
+				<radio value="支付宝" v-else></radio>支付宝
+			</label>
+			<label class="radio flex-y-center" v-if="bset.withdraw_bankcard==1">
+				<radio value="银行卡" v-if="(!bset.withdraw_weixin || bset.withdraw_weixin==0)&&(!bset.withdraw_aliaccount || bset.withdraw_aliaccount==0)" checked="checked"></radio>
+				<radio value="银行卡" v-else></radio>银行卡
+			</label>
+		</radio-group>
+	</view>
+	<button class="btn" form-type="submit">立即提现</button>
+	<view class="f0" @tap="goto" data-url="moneylog?st=1">
+		<text>查看提现记录</text>
+		<image :src="event_rul + '/static/img/static/img/arrowright.png'"></image>
+	</view>
+</view>
+</form>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+      binfo: [],
+      money: 0,
+      bset: false,
+	  
+	  event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (options) {
+    var that = this;
+    app.get('businessht/withdraw', {}, function (res) {
+      that.setData(res);
+    });
+  },
+  methods: {
+    moneyinput: function (e) {
+      var usermoney = parseFloat(this.binfo.money);
+      var money = parseFloat(e.detail.value);
+
+      if (money < 0) {
+        app.error('必须大于0');
+      } else if (money > usermoney) {
+        app.error('可提现余额不足');
+        return {
+          value: usermoney
+        };
+      } else {
+        this.setData({
+          money: money
+        });
+      }
+    },
+    formSubmit: function (e) {
+      var that = this;
+      var usermoney = parseFloat(this.binfo.money);
+      var withdrawmin = parseFloat(this.bset.withdrawmin);
+      var formdata = e.detail.value;
+      var money = parseFloat(formdata.money);
+      var paytype = formdata.paytype;
+
+      if (isNaN(money) || money <= 0) {
+        app.error('提现金额必须大于0');
+        return;
+      }
+
+      if (withdrawmin > 0 && money < withdrawmin) {
+        app.error('提现金额必须大于¥' + withdrawmin);
+        return;
+      }
+
+      if (money > usermoney) {
+        app.error('余额不足');
+        return;
+      }
+
+      if (paytype == '支付宝' && !this.binfo.aliaccount) {
+        app.alert('请先设置支付宝账号', function () {
+          app.goto('txset');
+        });
+        return;
+      }
+
+      if (paytype == '银行卡' && (!this.binfo.bankname || !this.binfo.bankcarduser || !this.binfo.bankcardnum)) {
+        app.alert('请先设置完整银行卡信息', function () {
+          app.goto('txset');
+        });
+        return;
+      }
+			
+			app.showLoading('提交中');
+      app.post('ApiBusinessht/withdraw', {
+        money: money,
+        paytype: paytype
+      }, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.error(data.msg);
+          return;
+        } else {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goto('moneylog?st=2');
+          }, 1000);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;display:flex;flex-direction:column;align-items:center}
+.img{width:160rpx;height:160rpx;margin-top:100rpx;}
+.f1{color: #555;font-size: 28rpx;margin-top:30rpx;}
+.f2{color: #555;font-size: 48rpx;margin-top: 10px;}
+.f3{width:380rpx;display:flex;height: 80rpx;line-height: 80rpx;margin-top:26rpx;}
+.f3 .t1{ font-size:32rpx;width:150rpx}
+.f3 .t2{ flex:1;border-bottom:1px solid #888;display:flex;align-items:center;font-size:40rpx}
+.f3 .t2 .x1{color:#000}
+.f3 .t2 input{ border: 0;color: #000;flex:1;}
+.btn{ height: 80rpx;line-height: 80rpx;background: #31cd00;width:500rpx;border-radius: 10rpx;margin-top: 20rpx;color: #fff;font-size: 32rpx;}
+.f0{margin-top:16rpx;height:60rpx;line-height:60rpx;overflow: hidden;color: #666;font-size:32rpx;display:flex;align-items:center;}
+.f0 image{width: 16px;height: 16px;}
+.f4{margin-top:20rpx;color:red}
+
+.radio radio{transform:scale(0.7);}
+.pclass{font-size:32rpx;}
+
+</style>
\ No newline at end of file
diff --git a/admin/kefu/index.vue b/admin/kefu/index.vue
new file mode 100644
index 0000000..3f716dc
--- /dev/null
+++ b/admin/kefu/index.vue
@@ -0,0 +1,222 @@
+<template>
+<view>
+<block v-if="isload">
+	<view class="topsearch flex-y-center">
+		<view class="f1 flex-y-center">
+			<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+			<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+		</view>
+	</view>
+	<view class="content" v-if="datalist && datalist.length>0">
+		<block v-for="(item, index) in datalist" :key="index">
+			<view class="item" @tap="goto" :data-url="'message?mid=' + item.mid" @longpress="showdel" :data-mid="item.mid">
+				<view class="f1">
+					<image :src="item.headimg"></image>
+					<view class="t2">
+						<text class="x1">{{item.nickname}}</text>
+						<text class="x2" v-if="item.msgtype=='image'">[图片]</text>
+						<text class="x2" v-else-if="item.msgtype=='voice'">[语音]</text>
+						<text class="x2" v-else-if="item.msgtype=='video'">[小视频]</text>
+						<text class="x2" v-else-if="item.msgtype=='music'">[音乐]</text>
+						<text class="x2" v-else-if="item.msgtype=='news'">[图文]</text>
+						<text class="x2" v-else-if="item.msgtype=='link'">[链接]</text>
+						<text class="x2" v-else-if="item.msgtype=='miniprogram'">[小程序]</text>
+						<text class="x2" v-else-if="item.msgtype=='location'">[地理位置]</text>
+						<text class="x2" v-else>{{item.content}}</text>
+						<text class="x3">{{item.showtime}}</text>
+					</view>
+				</view>
+				<view class="unread" v-if="item.noreadcount>0">{{item.noreadcount}}</view>
+			</view>
+		</block>
+	</view>
+
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+	<view class="tabbar">
+		<view class="tabbar-bot"></view>
+		<view class="tabbar-bar" style="background-color:#ffffff;">
+			<view @tap="goto" data-url="../member/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.member">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/member.png'"></image>
+				</view>
+				<view class="tabbar-text">{{t('会员')}}</view>
+			</view>
+			<view @tap="goto" data-url="../kefu/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.zixun">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/zixun2.png'"></image>
+				</view>
+				<view class="tabbar-text active">咨询</view>
+			</view>
+			<view @tap="goto" data-url="../finance/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.finance">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/finance.png'"></image>
+				</view>
+				<view class="tabbar-text">财务</view>
+			</view>
+			<view @tap="goto" data-url="../index/index" data-opentype="reLaunch" class="tabbar-item">
+				<view class="tabbar-image-box">
+					<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/my.png'"></image>
+				</view>
+				<view class="tabbar-text">我的</view>
+			</view>
+		</view>
+	</view>
+	<popmsg ref="popmsg"></popmsg>
+</block>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		st: 1,
+		datalist: [],
+		pagenum: 1,
+		uid: 0,
+		token: 0,
+		keyword: '',
+		nodata: false,
+		nomore: false,
+		auth_data: {},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onUnload: function () {
+  },
+  onHide: function () {
+  },
+  onLoad: function () {
+    this.getdata();
+  },
+  onPullDownRefresh: function () {
+    this.getdata();
+    uni.stopPullDownRefresh();
+  },
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+		getdata:function(loadmore){
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;
+			var pagenum = this.pagenum;
+			var datalist = this.datalist;
+			var keyword = that.keyword;
+			this.nomore = false;
+			this.nodata = false;
+			this.loading = true;
+			app.get('ApiAdminKefu/index', {keyword:keyword,pagenum:pagenum,datalist:datalist}, function (res) {
+				that.loading = false;
+				if (res.status == 0){
+					app.alert(res.msg);
+					return;
+				}
+        var data = res.datalist;
+				if (pagenum == 1){
+					that.uid = res.uid;
+					that.token = res.token;
+					that.datalist = data;
+					that.auth_data = res.auth_data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+			});
+		},
+		sendSocketMessage:function(msg) {
+			if (this.socketOpen) {
+				uni.sendSocketMessage({
+					data: JSON.stringify(msg)
+				});
+			} else {
+				socketMsgQueue.push(msg);
+			}
+		},
+    receiveMessage: function (data) {
+			if(data.type == 'tokefu'){
+				this.getdata();
+				return true;
+			}else{
+				return false;
+			}
+    },
+    showdel: function (e) {
+      return;
+      var that = this;
+      var mid = e.currentTarget.dataset.mid;
+      uni.showActionSheet({
+        itemList: ['删除'],
+        success(res) {
+					if(res.tapIndex >= 0){
+						app.post('ApiAdminKefu/del', {
+							mid: mid
+						}, function (d) {
+							that.getdata();
+						});
+					}
+        },
+        fail(res) {}
+      });
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding: 16rpx;color: #666;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{width: 100%;padding:20rpx;border-top: 1px #eaeaea solid;min-height: 112rpx;display:flex;align-items:center;position:relative}
+.content .item:first-child{border-top:0}
+.content .item image{width:110rpx;height:110rpx;border-radius:10rpx;flex-shrink:0;}
+.content .item .f1{display:flex;flex:1;overflow:hidden}
+.content .item .f1 .t2{display:flex;flex-direction:column;padding-left:20rpx}
+.content .item .f1 .t2 .x1{color: #666;font-size: 32rpx;}
+.content .item .f1 .t2 .x2{color: #999;}
+.content .item .f1 .t2 .x3{font-size:24rpx;color: #999;}
+.content .item .unread{position:absolute;width:30rpx;height:30rpx;color:#fff;background:#ff5620;text-align:center;border-radius:50%;font-size:20rpx;top:8rpx;left:110rpx}
+
+.content .item .f2{display:flex;flex-direction:column;width:200rpx;text-align:right;border-left:1px solid #eee}
+.content .item .f2 .t1{ font-size: 40rpx;color: #666;height: 40rpx;line-height: 40rpx;}
+.content .item .f2 .t2{ font-size: 28rpx;color: #999;height: 50rpx;line-height: 50rpx;}
+
+</style>
\ No newline at end of file
diff --git a/admin/kefu/message.vue b/admin/kefu/message.vue
new file mode 100644
index 0000000..d678753
--- /dev/null
+++ b/admin/kefu/message.vue
@@ -0,0 +1,305 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="message-list">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="message-time" v-if="item.formatTime">{{item.formatTime}}</view>
+				<view class="message-item" v-if="item.isreply==0">
+					<image class="message-avatar" mode="aspectFill" :src="item.headimg"></image>
+					<view class="message-text-left">
+						<view class="arrow-box arrow-left">
+							<image class="arrow-icon" :src="event_rul + '/static/img/static/img/arrow-white.png'"></image>
+						</view>
+						<view class="message-text">
+							<rich-text :nodes="item.content"></rich-text>
+						</view>
+					</view>
+				</view>
+				<view class="message-item" style="justify-content:flex-end" v-else>
+					<view class="message-text-right">
+						<view class="arrow-box arrow-right">
+							<image class="arrow-icon" :src="event_rul + '/static/img/static/img/arrow-green.png'"></image>
+						</view>
+						<view class="message-text">
+							<rich-text :nodes="item.content"></rich-text>
+						</view>
+					</view>
+					<image class="message-avatar" mode="aspectFill" :src="item.uheadimg"></image>
+				</view>
+			</block>
+		</view>
+		<view class="input-box notabbarbot" id="input-box">
+			<view class="input-form">
+				<image @tap="sendimg" class="pic-icon" :src="event_rul + '/static/img/static/img/msg-pic.png'"></image>
+				<input @confirm="sendMessage" @focus="onInputFocus" @input="messageChange" class="input" confirmHold="true" confirmType="send" cursorSpacing="20" type="text" :value="message" maxlength="-1"/>
+				<image @tap="toggleFaceBox" class="face-icon" :src="event_rul + '/static/img/static/img/face-icon.png'"></image>
+				<button class="send-button" v-if="!trimMessage">
+					发送
+				</button>
+				<button @tap="sendMessage" class="send-button-active" v-if="trimMessage">
+					发送
+				</button>
+			</view>
+			<wxface v-if="faceshow" @selectface="selectface"></wxface>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+var interval0;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		isload: false,
+		loading: false,
+
+		token:'',
+		uid:0,
+		nowtime:'',
+		pagenum: 1,
+		datalist: [],
+		message: "",
+		trimMessage: "",
+		faceshow: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.mid = this.opt.mid;
+		this.getdata();
+  },
+  onUnload: function () {
+    clearInterval(interval0);
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminKefu/message',{mid:that.mid},function (res) {
+				that.loading = false;
+				that.token = res.token;
+				that.uid = res.uid;
+				that.nowtime = res.nowtime;
+				uni.setNavigationBarTitle({
+					title: res.tomember.nickname
+				});
+				that.getdatalist();
+				that.loaded();
+
+				interval0 = setInterval(function () {
+					that.nowtime++;
+				}, 1000);
+			});
+		},
+    updateMessageTime: function () {
+      var that = this;
+      var datalist = this.datalist;
+			console.log(datalist)
+			for(var i in datalist){
+        var thistime = parseInt(datalist[i].createtime);
+        var prevtime = 0;
+        if (i > 0) {
+          prevtime = parseInt(datalist[i - 1].createtime);
+        }
+        if (thistime - prevtime > 600) {
+          datalist[i].formatTime = that.getTime(thistime);
+        } else {
+          datalist[i].formatTime = '';
+        }
+      }
+			console.log(datalist)
+      this.datalist = datalist;
+    },
+    getdatalist: function () {
+      var that = this;
+      if (that.loading) return;
+			that.loading = true;
+			app.post('ApiAdminKefu/getmessagelist',{mid:that.mid,pagenum: that.pagenum}, function (res) {
+				that.loading = false;
+				var datalist = res.data;
+				if (datalist.length > 0) {
+					for (var i in datalist) {
+						datalist[i].content = that.transformMsgHtml(datalist[i].msgtype, datalist[i].content);
+					}
+					that.datalist = datalist.concat(that.datalist);
+					that.updateMessageTime();
+					if (that.pagenum == 1) {
+						that.scrollToBottom();
+					} else {
+
+					}
+					that.pagenum = that.pagenum + 1;
+				}else{
+					that.nomore = true;
+				}
+			});
+    },
+    sendMessage: function (e) {
+      var that = this;
+      var message = this.message;
+      if (message.length > 2000) {
+        uni.showToast({
+          title: "单条消息不能超过2000字",
+          icon: "none",
+          duration: 1000
+        });
+      } else {
+        if (message.replace(/^\s*|\s*$/g, "")) {
+          var msgdata = {
+            aid: app.globalData.aid,
+            mid: that.mid,
+						umid:app.globalData.mid,
+            uid: that.uid,
+            msgtype: 'text',
+            content: message,
+						platform:app.globalData.platform,
+						pre_url:app.globalData.pre_url
+          };
+          app.sendSocketMessage({
+            type: 'tokehu',
+            token: that.token,
+            data: msgdata
+          });
+          that.message = "";
+          that.trimMessage = "";
+          that.faceshow = false
+        }
+      }
+    },
+    sendimg: function () {
+      var that = this;
+      app.chooseImage(function (data) {
+        for (var i = 0; i < data.length; i++) {
+          var message = data[i];
+          var msgdata = {
+            aid: app.globalData.aid,
+            mid: that.mid,
+						umid:app.globalData.mid,
+            uid: that.uid,
+            msgtype: 'image',
+            content: message,
+						platform:app.globalData.platform,
+						pre_url:app.globalData.pre_url
+          };
+          app.sendSocketMessage({
+            type: 'tokehu',
+            token: that.token,
+            data: msgdata
+          });
+        }
+      }, 3);
+    },
+    receiveMessage: function (data) {
+			var that = this;
+			if((data.type == 'tokefu' && that.mid == data.data.mid) || (data.type=='tokehu' && that.mid == data.data.mid)){
+				var message = data.data
+				message.content = that.transformMsgHtml(message.msgtype, message.content);
+				that.datalist = that.datalist.concat([message]);
+				setTimeout(that.updateMessageTime, 100);
+				this.scrollToBottom();
+				app.post('ApiKefu/isread',{mid:that.mid});
+				return true;
+			}else{
+				return false;
+			}
+    },
+    toggleFaceBox: function () {
+      this.faceshow = !this.faceshow
+    },
+    scrollToBottom: function () {
+      var that = this;
+      setTimeout(function () {
+				uni.pageScrollTo({
+					scrollTop: 10000,
+					duration:0
+				});
+      },300);
+    },
+    onInputFocus: function (e) {
+      this.faceshow = false
+    },
+		onPageScroll: function (e) {
+			var that = this;
+			var scrollY = e.scrollTop;     
+			if (scrollY == 0 && !that.nomore) {
+				this.getdatalist();
+			}
+		},
+    messageChange: function (e) {
+      this.message = e.detail.value;
+      this.trimMessage = e.detail.value.trim();
+    },
+    transformMsgHtml: function (msgtype, content) {
+      if (msgtype == 'miniprogrampage') {
+        var contentdata = JSON.parse(content);
+        content = '<div style="font-size:16px;font-weight:bold;height:25px;line-height:25px">' + contentdata.Title + '</div><img src="' + contentdata.ThumbUrl + '" width="200"/>';
+      }
+      if (msgtype == 'image') {
+        content = '<img src="' + content + '" width="200"/>';
+      }
+      return content;
+    },
+    selectface: function (face) {
+      this.message = "" + this.message + face;
+			this.trimMessage = this.message.trim();
+    },
+    getTime: function (createtime) {
+      var t = this.nowtime - createtime;
+      if (t > 0) {
+        var todaystart = new Date(this.date(this.nowtime, "Y-m-d 00:00:00")).getTime();
+        todaystart = todaystart / 1000;
+        var lastdaystart = todaystart - 86400;
+        if (t <= 180) {
+          return '刚刚';
+        }
+        if (createtime > todaystart) {
+          return this.date(createtime, "H:i");
+        }
+        if (createtime > lastdaystart) {
+          return '昨天' + this.date(createtime, "H:i");
+        }
+        return this.date(createtime, 'Y年m月d日 H:i:s');
+      }
+    }
+  }
+};
+</script>
+<style>
+.container{display: block;min-height: 100%;	box-sizing: border-box;	background: #f4f4f4;color: #222;}
+.message-list {	padding-left: 25rpx;	padding-right: 25rpx;	padding-bottom: 20rpx;padding-bottom:100rpx;}
+.message-item {display:flex;padding:20rpx 0}
+.message-time {	width:100%;padding-top: 20rpx;	padding-bottom: 10rpx;	text-align: center;display: inline-block;	color: #999;	font-size: 24rpx;}
+.message-avatar {	width: 90rpx;	height: 90rpx;	border-radius: 50%;}
+.message-text {	max-width: 525rpx;	min-height: 64rpx;	line-height: 50rpx;	font-size: 30rpx;	padding: 20rpx 30rpx;word-break:break-all}
+.message-text-left {	position: relative;	background-color: #fff;	margin-left: 20rpx;	border-radius: 12rpx;	border: 1rpx solid #dddddd;}
+.message-text-right {	position: relative;	background-color: #9AE966;	margin-right: 20rpx;	border-radius: 12rpx;	border: 1rpx solid #6DBF58;}
+.arrow-box {	position: absolute;	width: 16rpx;	height: 24rpx;	top: 35rpx;}
+.arrow-left {left: -14rpx;}
+.arrow-right {right: -14rpx;}
+.arrow-icon {	display: block;	width: 100%;	height: 100%;}
+
+.input-box {	position: fixed;	z-index: 100;	bottom: 0;	width: 96%;	min-height: 100rpx;	padding: 15rpx 2%;	background-color: #fff;box-sizing:content-box}
+.input-form {	width: 100%;	height: 100%;	display: flex;	flex-direction: row;	align-items: center;}
+.input {	flex: 1;	height: 66rpx;	border: 1rpx solid #ddd;	padding: 5rpx 10rpx;	background-color: #fff;	font-size: 30rpx;	border-radius: 12rpx;}
+.pic-icon {	width: 54rpx;	height: 54rpx;	margin-right: 18rpx;}
+.face-icon {	width: 60rpx;	height: 60rpx;	margin-left: 18rpx;}
+.faces-box {	width: 100%;	height: 500rpx;}
+.single-face {	width: 48rpx;	height: 48rpx;	margin: 10rpx;}
+.send-button {	width: 100rpx;	height: 62rpx;	margin-left: 18rpx;	border-radius: 8rpx;	text-align: center;	line-height: 62rpx;	font-size: 28rpx;	background-color: #dcdcdc;	border: 1rpx solid #ccc;	color: #999;}
+.send-button-active {	width: 100rpx;	height: 62rpx;	margin-left: 20rpx;	border-radius: 8rpx;	text-align: center;	line-height: 62rpx;	font-size: 28rpx;	background-color: #2396FC;	border: 1rpx solid #1F88E5;	color: #fff;}
+.send-icon {	width: 56rpx;	height: 56rpx;}
+
+.anit{width: 100%;height: 70rpx;background:#555;position: absolute;color:#fff;font-size: 30rpx;line-height: 70rpx;top: -70rpx;text-align: left;padding:0 20rpx;overflow:hidden}
+.show{top: 0rpx;animation: show 0.2s;animation-timing-function:ease;}
+@keyframes show{from {top:-70rpx;}to {top:0rpx;}}
+.hide{top: -70rpx;animation: hide 0.2s;animation-timing-function:ease;}
+@keyframes hide{from {top:0rpx;}to {top:-70rpx;}}
+</style>
\ No newline at end of file
diff --git a/admin/login/index.vue b/admin/login/index.vue
new file mode 100644
index 0000000..67a832e
--- /dev/null
+++ b/admin/login/index.vue
@@ -0,0 +1,87 @@
+<template>
+<view>
+<view style="padding:30px 0 10px 0;">
+	<view style="text-align: center;font-size:28px;color: #3cc51f;font-weight: 400;margin: 0 15%;">管理员登录</view>
+</view>
+<view style="margin:0 ">
+	<form @submit="subform">
+		<view class="weui-cells weui-cells_form">
+			<view class="weui-cell">
+				<view class="weui-cell__hd" style="width:105px"><label class="weui-label">账号</label></view>
+				<view class="weui-cell__bd">
+					<input class="weui-input" type="text" name="username" placeholder="请输入账号"></input>
+				</view>
+			</view>
+			<view class="weui-cell">
+				<view class="weui-cell__hd" style="width:105px"><label class="weui-label">密码</label></view>
+				<view class="weui-cell__bd">
+					<input class="weui-input" type="text" password="true" name="password" placeholder="请输入密码"></input>
+				</view>
+			</view>
+			<view class="weui-cell">
+				<view class="weui-cell__hd" style="width:105px"><label class="weui-label">验证码</label></view>
+				<view class="weui-cell__bd">
+					<input class="weui-input" type="text" name="captcha" placeholder="请输入验证码"></input>
+				</view>
+				<view class="weui-cell__ft">
+					<image :src="pre_url + '/am.php?s=/login/captcha&aid=' + aid + '&session_id=' + session_id + '&t=' + randt" id="LAY-user-get-vercode" style="width:120px;height:37px" @tap="regetcaptcha"></image>
+				</view>
+			</view>
+		</view>
+		<view class="weui-btn-area">
+			<button class="weui-btn weui-btn_primary" form-type="submit" style="background:#1aad19;color:#fff;font-size:16px;height:40px;line-height:40px;border-radius:4px">确定</button>
+		</view>
+	</form>
+</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+      datalist: [],
+      pagenum: 1,
+      randt: '1',
+      needAuth: "",
+      aid: "",
+      session_id: ""
+    };
+  },
+  onLoad: function () {
+    this.setData({
+      needAuth: app.needAuth,
+      aid: app.aid,
+      session_id: app.config.session_id
+    });
+    var that = this;
+  },
+  methods: {
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+      app.post(app.pre_url + "/am.php?s=/login/index", formdata, function (res) {
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('../index/index', 'redirect');
+          }, 1000);
+        } else {
+          app.error(res.msg);
+          that.regetcaptcha();
+        }
+      });
+    },
+    regetcaptcha: function () {
+      this.setData({
+        randt: this.randt + '1'
+      });
+    }
+  }
+};
+</script>
+<style>
+/* am/pages/login/index.wxss */
+</style>
\ No newline at end of file
diff --git a/admin/member/detail.vue b/admin/member/detail.vue
new file mode 100644
index 0000000..d8abf6a
--- /dev/null
+++ b/admin/member/detail.vue
@@ -0,0 +1,238 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">头像</text>
+				<view class="t2"><image :src="member.headimg" style="width:80rpx;height:80rpx"></image></view>
+			</view>
+			<view class="item">
+				<text class="t1">昵称</text>
+				<text class="t2">{{member.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">地区</text>
+				<text class="t2">{{member.province ? member.province : '' }}{{member.city ? member.city : '' }}</text>
+			</view>
+			<view class="item">
+				<text class="t1">加入时间</text>
+				<text class="t2">{{member.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">姓名</text>
+				<text class="t2">{{member.realname ? member.realname : '' }}</text>
+			</view>
+			<view class="item">
+				<text class="t1">电话</text>
+				<text class="t2">{{member.tel ? member.tel : '' }}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('余额')}}</text>
+				<text class="t2">{{member.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('积分')}}</text>
+				<text class="t2">{{member.score}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">等级</text>
+				<text class="t2">{{member.levelname}}</text>
+			</view>
+			<view class="item" v-if="member.remark">
+				<text class="t1">备注</text>
+				<text class="t2">{{member.remark}}</text>
+			</view>
+		</view>
+		<view style="width:100%;height:120rpx"></view>
+		<view class="bottom">
+			<view class="btn" @tap="recharge" :data-id="member.id">充值</view>
+			<view class="btn" @tap="addscore" :data-id="member.id">加{{t('积分')}}</view>
+			<view class="btn" @tap="changelv" :data-id="member.id">修改等级</view>
+			<view class="btn" @tap="remark" :data-id="member.id">备注</view>
+		</view>
+		
+		<uni-popup id="rechargeDialog" ref="rechargeDialog" type="dialog">
+			<uni-popup-dialog mode="input" title="充值" value="" placeholder="请输入充值金额" @confirm="rechargeConfirm"></uni-popup-dialog>
+		</uni-popup>
+		
+		<uni-popup id="addscoreDialog" ref="addscoreDialog" type="dialog">
+			<uni-popup-dialog mode="input" :title="'加'+t('积分')" value="" placeholder="请输入增加积分数" @confirm="addscoreConfirm"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="remarkDialog" ref="remarkDialog" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" value="" placeholder="请输入备注" @confirm="remarkConfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogChangelv" ref="dialogChangelv" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择等级</text>
+				</view>
+				<view class="uni-dialog-content">
+						<picker @change="levelChange" :value="index2" :range="levelList2" style="width:100%;font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{levelList2[index2]}}</view>
+						</picker>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogChangelvClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmChangelv">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+      isload: false,
+      member: "",
+			index2:0,
+			levelList:[],
+			levelList2:[],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminMember/detail', {mid: that.opt.mid}, function (res) {
+				that.loading = false;
+				that.member = res.member;
+				uni.setNavigationBarTitle({
+					title: that.t('会员') + '信息'
+				});
+
+				var levelList2 = [];
+				for(var i in res.levelList){
+					levelList2.push(res.levelList[i].name);
+				}
+				that.levelList = res.levelList;
+				that.levelList2 = levelList2;
+
+				that.loaded();
+			});
+		},
+    recharge: function (e) {
+      this.$refs.rechargeDialog.open();
+    },
+    rechargeConfirm: function (done,value) {
+			this.$refs.rechargeDialog.close();
+      var that = this;
+      app.post('ApiAdminMember/recharge', {rechargemid:that.opt.mid,rechargemoney:value}, function (data) {
+        app.success(data.msg);
+        setTimeout(function () {
+          that.getdata();
+        }, 1000);
+      });
+    },
+    addscore: function (e) {
+      this.$refs.addscoreDialog.open();
+    },
+   addscoreConfirm: function (done,value) {
+			this.$refs.addscoreDialog.close();
+      var that = this;
+      app.post('ApiAdminMember/addscore', {rechargemid:that.opt.mid,rechargescore:value}, function (data) {
+        app.success(data.msg);
+        setTimeout(function () {
+          that.getdata();
+        }, 1000);
+      });
+    },
+		remark:function(e){
+			this.$refs.remarkDialog.open();
+		},
+		remarkConfirm: function (done,value) {
+			this.$refs.remarkDialog.close();
+      var that = this;
+      app.post('ApiAdminMember/remark', {remarkmid:that.opt.mid,remark:value}, function (data) {
+        app.success(data.msg);
+        setTimeout(function () {
+          that.getdata();
+        }, 1000);
+      });
+    },
+		changelv:function(){
+			this.$refs.dialogChangelv.open();
+		},
+		dialogChangelvClose:function(){
+			this.$refs.dialogChangelv.close();
+		},
+		levelChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmChangelv:function(){
+			var that = this
+			console.log(this.index2);
+			console.log(this.levelList[this.index2]);
+			var levelid = this.levelList[this.index2].id
+			app.post('ApiAdminMember/changelv', { changemid:that.opt.mid,levelid:levelid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogChangelv.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+  }
+};
+</script>
+<style>
+
+.address{ display:flex;align-items:center;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:60rpx}
+.address image{width: 50rpx; height: 50rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{ font-weight:bold}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{height: 60rpx;line-height: 30rpx;color: #000;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height: 30rpx;line-height: 30rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:94%;margin:20rpx 3%;border-radius:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px; left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+.bottom .btn{ border-radius:10rpx; padding:10rpx 16rpx;margin-left: 10px;border: 1px #999 solid;}
+
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;width:100%}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/member/index.vue b/admin/member/index.vue
new file mode 100644
index 0000000..530fdb5
--- /dev/null
+++ b/admin/member/index.vue
@@ -0,0 +1,173 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入昵称/姓名/手机号搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">{{t('会员')}}列表（共{{count}}人）</text>
+			</view>
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="item">
+					<view class="f1" @tap="goto" :data-url="'detail?mid=' + item.id">
+						<image :src="item.headimg"></image>
+						<view class="t2">
+							<view class="x1 flex-y-center">
+								{{item.nickname}}
+								<image style="margin-left:10rpx;width:40rpx;height:40rpx" :src="event_rul +'/static/img/static/img/nan.png'" v-if="item.sex==1"></image>
+								<image style="margin-left:10rpx;width:40rpx;height:40rpx" :src="event_rul +'/static/img/static/img/nv.png'" v-if="item.sex==2"></image>
+							</view>
+							<text class="x2">{{item.createtime}}</text>
+							<text class="x2">{{item.province ? '' : item.province}}{{item.city ? '' : item.city}}</text>
+							<text class="x2" v-if="item.remark" style="color:#a66;font-size:22rpx">{{item.remark}}</text>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+		<view class="tabbar">
+			<view class="tabbar-bot"></view>
+			<view class="tabbar-bar" style="background-color:#ffffff;">
+				<view @tap="goto" data-url="../member/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.member">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/member2.png'"></image>
+					</view>
+					<view class="tabbar-text active">{{t('会员')}}</view>
+				</view>
+				<view @tap="goto" data-url="../kefu/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.zixun">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/zixun.png'"></image>
+					</view>
+					<view class="tabbar-text">咨询</view>
+				</view>
+				<view @tap="goto" data-url="../finance/index" data-opentype="reLaunch" class="tabbar-item" v-if="auth_data.finance">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/finance.png'"></image>
+					</view>
+					<view class="tabbar-text">财务</view>
+				</view>
+				<view @tap="goto" data-url="../index/index" data-opentype="reLaunch" class="tabbar-item">
+					<view class="tabbar-image-box">
+						<image class="tabbar-icon" :src="event_rul +'/static/img/static/img/my.png'"></image>
+					</view>
+					<view class="tabbar-text">我的</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		count: 0,
+		keyword: '',
+		auth_data: {},
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+			var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminMember/index', {keyword: keyword,pagenum: pagenum}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+					that.count = res.count;
+					that.auth_data = res.auth_data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					uni.setNavigationBarTitle({
+						title: that.t('会员') + '列表'
+					});
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding:24rpx 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{width: 100%;padding: 32rpx;border-top: 1px #f5f5f5 solid;min-height: 112rpx;display:flex;align-items:center;}
+.content .item image{width:90rpx;height:90rpx;}
+.content .item .f1{display:flex;flex:1}
+.content .item .f1 .t2{display:flex;flex-direction:column;padding-left:20rpx}
+.content .item .f1 .t2 .x1{color: #222;font-size:30rpx;}
+.content .item .f1 .t2 .x2{color: #999;font-size:24rpx}
+
+.content .item .f2{display:flex;flex-direction:column;width:200rpx;text-align:right;border-left:1px solid #eee}
+.content .item .f2 .t1{ font-size: 40rpx;color: #666;height: 40rpx;line-height: 40rpx;}
+.content .item .f2 .t2{ font-size: 28rpx;color: #999;height: 50rpx;line-height: 50rpx;}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/collageorder.vue b/admin/order/collageorder.vue
new file mode 100644
index 0000000..44a3f3b
--- /dev/null
+++ b/admin/order/collageorder.vue
@@ -0,0 +1,173 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'collageorderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<block v-if="item.status==1">
+							<block v-if="item.buytype!=1">
+								<text v-if="item.team.status==1" class="st1">拼团中</text>
+								<text v-if="item.team.status==2 && item.freight_type!=1" class="st1">拼团成功,待发货</text>
+								<text v-if="item.team.status==2 && item.freight_type==1" class="st1">拼团成功,待提货</text>
+								<text v-if="item.team.status==3" class="st4">拼团失败,已退款</text>
+							</block>
+							<block v-else>
+								<text v-if="item.freight_type!=1" class="st1">待发货</text>
+								<text v-if="item.freight_type==1" class="st1">待提货</text>
+							</block>
+						</block>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view @tap="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+							<text class="t2">{{item.ggname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+						</view>
+					</view>
+					<view class="bottom">
+						<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore, keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/collageorder', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/collageorderdetail.vue b/admin/order/collageorderdetail.vue
new file mode 100644
index 0000000..6f2dabc
--- /dev/null
+++ b/admin/order/collageorderdetail.vue
@@ -0,0 +1,695 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'/activity/collage/product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<block v-if="detail.status==1">
+					<block v-if="detail.buytype!=1">
+						<text v-if="team.status==1" class="t2">拼团中</text>
+						<text v-if="team.status==2 && detail.freight_type!=1" class="t2">拼团成功,待发货</text>
+						<text v-if="team.status==2 && detail.freight_type==1" class="t2">拼团成功,待提货</text>
+						<text v-if="team.status==3" class="t2">拼团失败,已退款</text>
+					</block>
+					<block v-else>
+						<text v-if="detail.freight_type!=1" class="t2">待发货</text>
+						<text v-if="detail.freight_type==1" class="t2">待提货</text>
+					</block>
+				</block>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1" class="btn2" @tap="hexiao" :data-id="detail.id">核销</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="(detail.status==2 || detail.status==3) && detail.express_com" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		detail: "",
+		team:{},
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/collageorderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'collage',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'collage',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'collage',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		hexiao:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要核销并改为已完成状态吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/hexiao', { type:'collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'collage_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'collage_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'shop_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/kanjiaorder.vue b/admin/order/kanjiaorder.vue
new file mode 100644
index 0000000..985a3a1
--- /dev/null
+++ b/admin/order/kanjiaorder.vue
@@ -0,0 +1,163 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'kanjiaorderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view @tap="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+							<text class="t2">{{item.ggname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×1</text></view>
+						</view>
+					</view>
+					<view class="bottom">
+						<text>共计1件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/kanjiaorder', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/kanjiaorderdetail.vue b/admin/order/kanjiaorderdetail.vue
new file mode 100644
index 0000000..1b7dfe5
--- /dev/null
+++ b/admin/order/kanjiaorderdetail.vue
@@ -0,0 +1,674 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'/activity/kanjia/product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<block v-if="detail.status==1">
+					<text v-if="detail.freight_type!=1" class="t2">待发货</text>
+					<text v-if="detail.freight_type==1" class="t2">待提货</text>
+				</block>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1" class="btn2" @tap="hexiao" :data-id="detail.id">核销</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="(detail.status==2 || detail.status==3) && detail.express_com" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		detail: "",
+		team:{},
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/kanjiaorderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.loaded();
+			});
+		},
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'kanjia',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'kanjia',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'kanjia',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'kanjia',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		hexiao:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要核销并改为已完成状态吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/hexiao', { type:'kanjia',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'kanjia',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'kanjia',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'kanjia',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'kanjia',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'kanjia_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'kanjia_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'kanjia_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/luckycollageorder.vue b/admin/order/luckycollageorder.vue
new file mode 100644
index 0000000..ccc2222
--- /dev/null
+++ b/admin/order/luckycollageorder.vue
@@ -0,0 +1,173 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'luckycollageorderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<block v-if="item.status==1">
+							<block v-if="item.buytype!=1">
+								<text v-if="item.status==1" class="st1">拼团中</text>
+								<text v-if="item.status==2 && item.freight_type!=1" class="st1">拼团成功,待发货</text>
+								<text v-if="item.status==2 && item.freight_type==1" class="st1">拼团成功,待提货</text>
+								<text v-if="item.status==3" class="st4">拼团失败,已退款</text>
+							</block>
+							<block v-else>
+								<text v-if="item.freight_type!=1" class="st1">待发货</text>
+								<text v-if="item.freight_type==1" class="st1">待提货</text>
+							</block>
+						</block>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view @tap="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+							<text class="t2">{{item.ggname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+						</view>
+					</view>
+					<view class="bottom">
+						<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore, keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/luckycollageorder', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/luckycollageorderdetail.vue b/admin/order/luckycollageorderdetail.vue
new file mode 100644
index 0000000..acc6ae4
--- /dev/null
+++ b/admin/order/luckycollageorderdetail.vue
@@ -0,0 +1,695 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'/activity/luckycollage/product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<block v-if="detail.status==1">
+					<block v-if="detail.buytype!=1">
+						<text v-if="team.status==1" class="t2">拼团中</text>
+						<text v-if="team.status==2 && detail.freight_type!=1" class="t2">拼团成功,待发货</text>
+						<text v-if="team.status==2 && detail.freight_type==1" class="t2">拼团成功,待提货</text>
+						<text v-if="team.status==3" class="t2">拼团失败,已退款</text>
+					</block>
+					<block v-else>
+						<text v-if="detail.freight_type!=1" class="t2">待发货</text>
+						<text v-if="detail.freight_type==1" class="t2">待提货</text>
+					</block>
+				</block>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1" class="btn2" @tap="hexiao" :data-id="detail.id">核销</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="(detail.status==2 || detail.status==3) && detail.express_com" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		detail: "",
+		team:{},
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/luckycollageorderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'lucky_collage',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'lucky_collage',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'lucky_collage',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'lucky_collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		hexiao:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要核销并改为已完成状态吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/hexiao', { type:'lucky_collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'lucky_collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'lucky_collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'lucky_collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'lucky_collage',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'lucky_collage_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'lucky_collage_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'lucky_collage_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/maidanlog.vue b/admin/order/maidanlog.vue
new file mode 100644
index 0000000..401fbb0
--- /dev/null
+++ b/admin/order/maidanlog.vue
@@ -0,0 +1,147 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" :placeholder="'输入'+t('会员')+'昵称搜索'" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">{{t('余额')}}明细（共{{count}}条）</text>
+			</view>
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+					<image class="t1" :src="item.headimg"></image>
+					<text class="t2">{{item.nickname}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" v-if="item.money>0" style="color:#000">+{{item.money}}元</text>
+					<text class="t1" v-else>{{item.money}}元</text>
+					<text class="t2">{{date(item.createtime)}}</text>
+					<text class="t3">备注：{{item.remark}}</text>
+				</view>
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+
+		keyword:'',
+		st: 0,
+		count:0,
+		datalist: [],
+		pagenum: 1,
+		nodata: false,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/moneylog', {keyword:keyword,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1){
+					uni.setNavigationBarTitle({
+						title: that.t('余额') + '明细'
+					});
+					that.count = res.count;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    }
+  }
+};
+</script>
+<style>
+@import "../common.css";
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width: 94%;margin:0 3%;background: #fff;border-radius:16rpx}
+.content .label{display:flex;width: 100%;padding:24rpx 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{ width:100%;padding:20rpx 20rpx;border-top: 1px #f5f5f5 solid;display:flex;align-items:center}
+.content .item .f1{display:flex;flex-direction:column;margin-right:20rpx}
+.content .item .f1 .t1{width:100rpx;height:100rpx;margin-bottom:10rpx;border-radius:50%;margin-left:20rpx}
+.content .item .f1 .t2{color:#666666;text-align:center;width:140rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.content .item .f2{ flex:1;width:200rpx;font-size:30rpx;display:flex;flex-direction:column}
+.content .item .f2 .t1{color:#03bc01;height:40rpx;line-height:40rpx;font-size:36rpx}
+.content .item .f2 .t2{color:#999;height:40rpx;line-height:40rpx;font-size:24rpx}
+.content .item .f2 .t3{color:#aaa;height:40rpx;line-height:40rpx;font-size:24rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/scoreshoporder.vue b/admin/order/scoreshoporder.vue
new file mode 100644
index 0000000..c54c82b
--- /dev/null
+++ b/admin/order/scoreshoporder.vue
@@ -0,0 +1,218 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'scoreshoporderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view @tap.stop="goto" :data-url="'/pages/scoreshop/product?id=' + item2.proid">
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">市场价￥{{item2.sell_price}}</text>
+								<view class="t3"><text class="x1 flex1"><text v-if="item2.money_price>0">￥{{item2.money_price}}+</text>{{item2.score_price}}{{t('积分')}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text>共计{{item.procount}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/scoreshoporder', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'scoreshop_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].realname + ' - ' + peisonguser[i].tel + '(配送中'+peisonguser[i].dan+'单)');
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'scoreshop_order',orderid: that.detail.id,psid:0}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'scoreshop_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		}
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/scoreshoporderdetail.vue b/admin/order/scoreshoporderdetail.vue
new file mode 100644
index 0000000..2f961af
--- /dev/null
+++ b/admin/order/scoreshoporderdetail.vue
@@ -0,0 +1,698 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'/activity/scoreshop/product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">市场价￥{{item.sell_price}}</text>
+					<view class="t3"><text class="x1 flex1"><text v-if="item.money_price>0">￥{{item.money_price}}+</text>{{item.score_price}}{{t('积分')}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<view class="t2 red" v-if="detail.totalmoney>0">¥{{detail.totalmoney}} + {{detail.totalscore}}{{t('积分')}}</view>
+				<text class="t2 red" v-else>{{detail.totalscore}}{{t('积分')}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1" class="btn2" @tap="hexiao" :data-id="detail.id">核销</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="(detail.status==2 || detail.status==3) && detail.express_com" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		djs: '',
+		detail: "",
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/scoreshoporderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'scoreshop',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'scoreshop',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'scoreshop',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'scoreshop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		hexiao:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要核销并改为已完成状态吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/hexiao', { type:'scoreshop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'scoreshop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'scoreshop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'scoreshop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'scoreshop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000);
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'scoreshop_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'scoreshop_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'shop',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/seckill2order.vue b/admin/order/seckill2order.vue
new file mode 100644
index 0000000..7c6ead6
--- /dev/null
+++ b/admin/order/seckill2order.vue
@@ -0,0 +1,151 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','已付款','寄售','发货']" :itemst="['all','0','1','2','3']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'seckill2orderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text class="st0">{{item.status_s}}</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view @tap="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+							<text class="t2">{{item.ggname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+						</view>
+					</view>
+					<view class="bottom">
+						<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: ""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/seckill2order', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/seckill2orderdetail.vue b/admin/order/seckill2orderdetail.vue
new file mode 100644
index 0000000..5b637f6
--- /dev/null
+++ b/admin/order/seckill2orderdetail.vue
@@ -0,0 +1,687 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'/activity/seckill/product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1" >已支付</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+				<text class="t2" v-if="detail.status==7">{{seckillset.sale_name}}审核中</text>
+				<text class="t2" v-if="detail.status==8">{{seckillset.sale_name}}中</text>
+				<text class="t2" v-if="detail.status==9">{{seckillset.sale_name}}已驳回</text>
+				<text class="t2" v-if="detail.status==10">已售出,{{seckillset.see_time}}天后打款</text>
+				<text class="t2" v-if="detail.status==12">申请{{seckillset.sale_name}}中</text>
+				<text class="t2" v-if="detail.status==11">已申请发货</text>
+				<text class="t2" v-if="detail.status==13">已锁定</text>
+				<text class="t2" v-if="detail.status==14">已完成</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			<view class="item" v-if="detail.sale_price>0">
+				<text class="t1">委托价格</text>
+				<text class="t2 red" >¥{{detail.sale_price}}</text>
+			</view>
+			<view class="item" v-if="detail.remarks !='' && detail.sale_status == 2">
+				<text class="t1">驳回原因</text>
+				<text class="t2" >{{detail.remarks}}</text>
+			</view>
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==11" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="detail.status==11 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="detail.status==13" class="btn2" @tap="jiebang" :data-id="detail.id">解除锁定</view>
+			<view v-if="detail.status==2 || detail.status==3" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		detail: "",
+		team:{},
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+		seckillset:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/seckill2orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.seckillset = res.seckillset;
+				that.loaded();
+			});
+		},
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'seckill',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'seckill',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'seckill',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		jiebang:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要解除锁定吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/jiebang', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'seckill_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'seckill_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'seckill_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/seckillorder.vue b/admin/order/seckillorder.vue
new file mode 100644
index 0000000..831c7ef
--- /dev/null
+++ b/admin/order/seckillorder.vue
@@ -0,0 +1,163 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'seckillorderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view @tap="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+							<text class="t2">{{item.ggname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+						</view>
+					</view>
+					<view class="bottom">
+						<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/seckillorder', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/seckillorderdetail.vue b/admin/order/seckillorderdetail.vue
new file mode 100644
index 0000000..8004265
--- /dev/null
+++ b/admin/order/seckillorderdetail.vue
@@ -0,0 +1,673 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'/activity/seckill/product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<text class="t2">{{detail.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<block v-if="detail.status==1">
+					<text v-if="detail.freight_type!=1" class="t2">待发货</text>
+					<text v-if="detail.freight_type==1" class="t2">待提货</text>
+				</block>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1" class="btn2" @tap="hexiao" :data-id="detail.id">核销</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="(detail.status==2 || detail.status==3) && detail.express_com" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		detail: "",
+		team:{},
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/seckillorderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.loaded();
+			});
+		},
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'seckill',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'seckill',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'seckill',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		hexiao:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要核销并改为已完成状态吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/hexiao', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'seckill',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'seckill_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'seckill_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'seckill_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/shopRefundOrder.vue b/admin/order/shopRefundOrder.vue
new file mode 100644
index 0000000..f3eae77
--- /dev/null
+++ b/admin/order/shopRefundOrder.vue
@@ -0,0 +1,167 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待审核','已同意','驳回']" :itemst="['all','1','2','3']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'shopRefundOrderDetail?id=' + item.id">
+					<view class="head">
+						<view>退款单号：{{item.refund_ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.refund_status==0" class="st3">取消</text>
+						<text v-if="item.refund_status==1" class="st0">待审核</text>
+						<text v-if="item.refund_status==2" class="st4">通过</text>
+						<text v-if="item.refund_status==3" class="st2">驳回</text>
+						<text v-if="item.refund_status==4" class="st2">通过,待退货</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view @tap.stop="goto" :data-url="'/pages/shop/product?id=' + item2.proid">
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3"><text class="x1 flex1">￥{{item2.sell_price}}</text><text class="x2">×{{item2.refund_num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text style="margin-right: 10rpx;">{{item.refund_type_label}}</text>
+						<text v-if="item.refund_status==0" style="color:grey"> 申请退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+						<text v-if="item.refund_status==4" style="color:red"> 审核通过,待退货</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore, keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/shopRefundOrder', {keyword:keyword,st: st,pagenum: pagenum,orderid:that.opt.orderid}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/shopRefundOrderDetail.vue b/admin/order/shopRefundOrderDetail.vue
new file mode 100644
index 0000000..cc7b1bc
--- /dev/null
+++ b/admin/order/shopRefundOrderDetail.vue
@@ -0,0 +1,366 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop_refund.jpg);background-size:100%'">
+			<view class="f1" v-if="detail.refund_status==0">
+				<view class="t1">已取消</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==1">
+				<view class="t1">待审核</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==2">
+				<view class="t1">审核通过，已退款</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==3">
+				<view class="t1">驳回</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==4">
+				<view class="t1">审核通过，待退货</view>
+				<view class="t2">联系买家进行退货</view>
+			</view>
+		</view>
+		<!-- <view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view> -->
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'/pages/shop/product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.refund_num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">类型</text>
+				<text class="t2 red">{{detail.refund_type_label}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">退货单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.refund_ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">申请退款金额</text>
+				<text class="t2 red">¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">本单已退款金额</text>
+				<text class="t2 red">¥{{detail.refundMoneyTotal}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">申请时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 grey" v-if="detail.refund_status==0">已取消</text>
+				<text class="t2 red" v-if="detail.refund_status==1">待审核</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回</text>
+				<text class="t2 red" v-if="detail.refund_status==4">审核通过，待退货</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">图片</text>
+				<text class="t2" v-if="detail.refund_pics && detail.refund_pics.length > 0"><block v-for="item in detail.refund_pics"><image :src="item" class="imageMin" mode="widthFix" @tap="previewImage" :data-url="item"/></block></text>
+				<text class="t2" v-else>无</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{order.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{order.createtime}}</text>
+			</view>
+			<view class="item" v-if="order.status>0 && order.paytype!='货到付款' && order.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{order.paytime}}</text>
+			</view>
+			<view class="item" v-if="order.status>0 && order.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{order.paytype == '货到付款' ? codtxt : order.paytype}}</text>
+			</view>
+			<view class="item" v-if="order.status>1 && order.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{order.send_time}}</text>
+			</view>
+			<view class="item" v-if="order.status==3 && order.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{order.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{order.product_price}}</text>
+			</view>
+			<view class="item" v-if="order.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{order.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="order.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{order.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{order.freight_text}}</text>
+			</view>
+			<view class="item" v-if="order.freight_type==1 && order.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{order.freight_price}}</text>
+			</view>
+			<view class="item" v-if="order.freight_time">
+				<text class="t1">{{order.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{order.freight_time}}</text>
+			</view>
+			<view class="item" v-if="order.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{order.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="order.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{order.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{order.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="order.status==0">未付款</text>
+				<text class="t2" v-if="order.status==1">已付款</text>
+				<text class="t2" v-if="order.status==2">已发货</text>
+				<text class="t2" v-if="order.status==3">已收货</text>
+				<text class="t2" v-if="order.status==4">已关闭</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<block v-if="detail.refund_status==1">
+				<view class="btn2" @tap="refundnopassShow" :data-id="detail.id">驳回</view>
+				<view v-if="detail.refund_type == 'refund'" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+				<view v-else-if="detail.refund_type == 'return'" class="btn2" @tap="returnpass" :data-id="detail.id">退货退款通过</view>
+			</block>
+			<view v-if="detail.refund_type == 'return' && detail.refund_status==4" class="btn2" @tap="refundpass" :data-id="detail.id" :data-title="'确定要收到退货并退款吗？'">收货并退款</view>
+			<!-- <view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view> -->
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="确定要驳回申请吗？" :value="detail.remark" placeholder="请输入备注" @confirm="refundnopass"></uni-popup-dialog>
+		</uni-popup>
+	
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		order: {},
+		detail: "",
+		prolist: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/shopRefundOrderDetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.detail = res.detail;
+				that.order = res.order;
+				that.prolist = res.prolist;
+				that.loaded();
+			});
+		},
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'shop',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		refundnopassShow: function (e) {
+			this.$refs.dialogSetremark.open();
+		},
+		refundnopass: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this;
+			var orderid = that.detail.id;
+			app.showLoading();
+			app.post('ApiAdminOrder/refundnopass', { type:'shop',orderid: orderid,remark:remark, release:'2106'}, function (data) {
+				app.showLoading(false);
+				app.success(data.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id;
+			var title = e.currentTarget.dataset.title;
+			app.confirm(title ? title : '确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'shop',orderid: orderid, release:'2106' }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		returnpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定同意买家退货退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/returnpass', { type:'shop',orderid: orderid, release:'2106' }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+  }
+};
+</script>
+<style>
+.imageMin {width:130rpx;height:auto; margin-right: 6rpx;}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;padding:0 30rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/shoporder.vue b/admin/order/shoporder.vue
new file mode 100644
index 0000000..5b4e650
--- /dev/null
+++ b/admin/order/shoporder.vue
@@ -0,0 +1,184 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成']" :itemst="['all','0','1','2','3']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入关键字搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm"></input>
+			</view>
+		</view>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'shoporderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view @tap.stop="goto" :data-url="'/pages/shop/product?id=' + item2.proid">
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3"><text class="x1 flex1">￥{{item2.sell_price}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text>共计{{item.procount}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		codtxt: "",
+		keyword:"",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/shoporder', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		searchConfirm:function(e){
+			var keyword = e.detail.value;
+      this.getdata(false,keyword);
+		}
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:110rpx}
+
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/shoporderdetail.vue b/admin/order/shoporderdetail.vue
new file mode 100644
index 0000000..33edcf7
--- /dev/null
+++ b/admin/order/shoporderdetail.vue
@@ -0,0 +1,713 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择'+codtxt : '已成功付款'}}</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true" selectable="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'/pages/shop/product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+
+			<view class="item" v-if="detail.balance_price>0">
+				<text class="t1">尾款</text>
+				<text class="t2 red">¥{{detail.balance_price}}</text>
+			</view>
+			<view class="item" v-if="detail.balance_price>0">
+				<text class="t1">尾款状态</text>
+				<text class="t2" v-if="detail.balance_pay_status==1">已支付</text>
+				<text class="t2" v-if="detail.balance_pay_status==0">未支付</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.checkmemid">
+			<view class="item">
+				<text class="t1">所选会员</text>
+				<text class="flex1"></text>
+				<image :src="detail.checkmember.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.checkmember.nickname}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1" class="btn2" @tap="hexiao" :data-id="detail.id">核销</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="(detail.status==2 || detail.status==3) && detail.express_com" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+		
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		djs: '',
+		detail: "",
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/shoporderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'shop',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'shop',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				if(res.status == 0){
+					app.error(res.msg);
+					return;
+				}
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'shop',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		hexiao:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要核销并改为已完成状态吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/hexiao', { type:'shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'shop_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'shop_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'shop_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/tuangouorder.vue b/admin/order/tuangouorder.vue
new file mode 100644
index 0000000..7194004
--- /dev/null
+++ b/admin/order/tuangouorder.vue
@@ -0,0 +1,155 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'tuangouorderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view @tap="goto" :data-url="'/activity/tuangou/product?id=' + item.proid">
+							<image :src="item.propic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+						</view>
+					</view>
+					<view class="bottom">
+						<text>共计{{item.num}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: ""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/tuangouorder', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/order/tuangouorderdetail.vue b/admin/order/tuangouorderdetail.vue
new file mode 100644
index 0000000..822eb3b
--- /dev/null
+++ b/admin/order/tuangouorderdetail.vue
@@ -0,0 +1,695 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1" user-select="true">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude" user-select="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view class="content">
+				<view @tap="goto" :data-url="'/activity/tuangou/product?id=' + detail.proid">
+					<image :src="detail.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{detail.proname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{detail.sell_price}}</text><text class="x2">×{{detail.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2" user-select="true">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">预付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+			<view class="item" v-if="detail.tuimoney > 0">
+				<text class="t1">已退款</text>
+				<text class="t2 red">¥{{detail.tuimoney}}</text>
+			</view>
+			<view class="item" v-if="detail.tuimoney > 0">
+				<text class="t1">实付金额</text>
+				<text class="t2 red">¥{{detail.real_price}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<block v-if="detail.status==1">
+					<text v-if="detail.freight_type!=1" class="t2">待发货</text>
+					<text v-if="detail.freight_type==1" class="t2">待提货</text>
+				</block>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true">{{item[1]}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1" class="btn2" @tap="hexiao" :data-id="detail.id">核销</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="(detail.status==2 || detail.status==3) && detail.express_com" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==2 && detail.freight_type==10" class="btn2" @tap="fahuo" :data-id="detail.id">修改物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogExpress10" ref="dialogExpress10" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货信息</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="form-item flex" style="border-bottom:0;">
+							<view class="f1" style="margin-right:20rpx">物流单照片</view>
+							<view class="f2">
+								<view class="layui-imgbox" v-if="express_pic">
+									<view class="layui-imgbox-close" @tap="removeimg" :data-index="0" data-field="express_pic"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+									<view class="layui-imgbox-img"><image :src="express_pic" @tap="previewImage" :data-url="express_pic" mode="widthFix"></image></view>
+								</view>
+								<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="express_pic" data-pernum="1" v-else></view>
+							</view>
+							<input type="text" hidden="true" name="express_pic" :value="express_pic" maxlength="-1"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_fhname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">发货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_fhaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货人：</view>
+							<input type="text" placeholder="请输入发货人信息" @input="setexpress_shname" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">收货地址：</view>
+							<input type="text" placeholder="请输入发货地址" @input="setexpress_shaddress" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">备注：</view>
+							<input type="text" placeholder="请输入备注" @input="setexpress_remark" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpress10Close">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo10">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		detail: "",
+		team:{},
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+		express_pic:'',
+		express_fhname:'',
+		express_fhaddress:'',
+		express_shname:'',
+		express_shaddress:'',
+		express_remark:'',
+		mdid:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/tuangouorderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.team = res.team;
+				that.storeinfo = res.storeinfo;
+				that.mdid = res.mdid;
+				that.loaded();
+			});
+		},
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'tuangou',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			if(this.detail.freight_type==10){
+				this.$refs.dialogExpress10.open();
+			}else{
+				this.$refs.dialogExpress.open();
+			}
+		},
+		zongbuFahuo:function(e){
+			var that = this
+			app.confirm('确定要选择总部发货吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/zongbuFahuo', { type:'tuangou',orderid: that.detail.id }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		dialogExpress10Close:function(){
+			this.$refs.dialogExpress10.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'tuangou',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		setexpress_pic:function(e){
+			this.express_pic = e.detail.value;
+		},
+		setexpress_fhname:function(e){
+			this.express_fhname = e.detail.value;
+		},
+		setexpress_fhaddress:function(e){
+			this.express_fhaddress = e.detail.value;
+		},
+		setexpress_shname:function(e){
+			this.express_shname = e.detail.value;
+		},
+		setexpress_shaddress:function(e){
+			this.express_shaddress = e.detail.value;
+		},
+		setexpress_remark:function(e){
+			this.express_remark = e.detail.value;
+		},
+		confirmfahuo10:function(){
+			this.$refs.dialogExpress10.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'tuangou',orderid: that.detail.id,pic:that.express_pic,fhname:that.express_fhname,fhaddress:that.express_fhaddress,shname:that.express_shname,shaddress:that.express_shaddress,remark:that.express_remark}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'tuangou',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		hexiao:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要核销并改为已完成状态吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/hexiao', { type:'tuangou',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'tuangou',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'tuangou',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'tuangou',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'tuangou',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'tuangou_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'tuangou_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'tuangou_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'express_pic') that.express_pic = pics[0];
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'express_pic'){
+				that.express_pic = '';
+			}
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/order/yuyueorder.vue b/admin/order/yuyueorder.vue
new file mode 100644
index 0000000..f2a6963
--- /dev/null
+++ b/admin/order/yuyueorder.vue
@@ -0,0 +1,185 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','派单中','待确认','已完成','已取消']" :itemst="['all','0','1','2','3','4']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap.stop="goto" :data-url="'yuyueorderdetail?id=' + item.id">
+					<view class="head">
+						<view class="f1" v-if="item.bid!=0" @tap.stop="goto" :data-url="'/pages/business/index?id=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+						<view v-else>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						
+						<block v-if="item.status==1 && item.refund_status==0 && item.worker_orderid">
+							<text v-if="item.worker.status==0" class="st1">待接单</text>
+							<text v-if="item.worker.status==1" class="st1">已接单</text>
+							<text v-if="item.worker.status==2" class="st2">服务中</text>
+						</block>
+						<block v-else-if="item.status==1 && item.refund_status==0">
+							<text class="st1">派单中</text>
+						</block>	
+						<text v-if="item.status==1 && item.refund_status==1" class="st1">退款审核中</text>
+						<text v-if="item.status==2" class="st2">服务中</text>
+						<text v-if="item.status==3 && item.isconmement==0" class="st3">待评价</text>
+						<text v-if="item.status==3" class="st4">已完成</text>
+						<text v-if="item.status==4" class="st4">订单已关闭</text>
+					</view>
+					<view class="content" style="border-bottom:none">
+						<view v-if="item.paidan_type==3" >
+							<image :src="item.propic" ></image>
+						</view>
+						<view v-else @tap.stop="goto" :data-url="'product?id=' + item.proid">
+							<image :src="item.propic">
+						</view>	
+						<view class="detail">
+							<text class="t1">{{item.proname}}</text>
+		
+							<text class="t1">预约日期：{{item.yy_time}}</text>
+						
+							<view class="t3" v-if="item.balance_price>0"><text class="x1 flex1">实付金额：￥{{item.totalprice}}</text><text class="x1 flex1" v-if="item.balance_price>0">尾款：￥{{item.balance_price}}</text></view>
+							<view class="t3" v-else><text class="x1 flex1">实付金额：￥{{item.totalprice}}</text><text class="x1 flex1" >含跑腿费：￥{{item.paidan_money}}</text></view>
+						</view>
+					</view>
+					<view class="bottom"  v-if="item.send_time>0">
+						<text>派单时间：{{item.senddate}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'yuyueorderdetail?id=' + item.id" class="btn2">详情</view>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		codtxt: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminOrder/yuyueorder', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+/*.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px; font-size: 14px; position: absolute; bottom: 10px; right: 10px; background: #fff; }*/
+.order-pin{ border: 1px #ffc702 solid; border-radius: 5px; color: #ffc702; float: right; padding: 0 5px; height: 23px; line-height: 23px; margin-left: 5px;}
+
+.zan-tex{clear:both; display: block; width: 100%; color: #565656; font-size: 12px; height: 30px; line-height: 30px; text-align: center;  }
+.ind-bot{ width: 100%; float: left; text-align: center; height: 50px; line-height: 50px; font-size: 13px; color: #ccc; background:#F2F2F2}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+
+</style>
\ No newline at end of file
diff --git a/admin/order/yuyueorderdetail.vue b/admin/order/yuyueorderdetail.vue
new file mode 100644
index 0000000..981e798
--- /dev/null
+++ b/admin/order/yuyueorderdetail.vue
@@ -0,0 +1,560 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop flex" :style="'background:url('+pre_url+'/static/img/orderbg.png);background-size:100%'">
+			<view class="f1 " v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>				
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.refund_status==0">
+				<block v-if="!detail.worker_id">
+					<view class="t2">等待派单</view>
+				</block>
+				<block v-else>
+					<view class="t2">订单已接单</view>
+				</block>
+			</view>
+			
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单服务中</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+			<view class="orderx"><image :src="event_rul + '/static/img/static/img/orderx.png'"></view>
+			
+		</view>
+		
+		<view class="orderinfo orderinfotop">
+			<view class="title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">预约时间</text>
+				<text class="t2">{{detail.yy_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="(detail.formdata).length > 0">
+			<view class="item" v-for="item in detail.formdata">
+				<text class="t1">{{item[0]}}</text>
+				<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+				<text class="t2" v-else user-select="true" selectable="true">{{item[1]}}</text>
+			</view>
+		</view>
+		
+		<!-- <view class="btitle flex-y-center" v-if="detail.bid>0" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;"></image>
+			<view class="flex1" decode="true" space="true" style="padding-left:16rpx">{{detail.binfo.name}}</view>
+		</view> -->
+		<view class="product">
+			<view class="title">服务信息</view>
+			<view class="content">
+				<view @tap="goto" :data-url="'product?id=' + prolist.proid">
+					<image :src="prolist.propic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{prolist.proname}}</text>
+					<text class="t2">{{prolist.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{prolist.product_price}}</text><text class="" style="color: #939393;">×{{prolist.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && prolist.iscomment==0" @tap.stop="goto" :data-url="'comment?oid=' + prolist.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && prolist.iscomment==1" @tap.stop="goto" :data-url="'comment?oid=' + prolist.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+
+			<view class="item">
+				<text class="t1">应付金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.leveldk_money > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.manjian_money > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.coupon_money > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+	
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">服务中</text>
+				<text class="t2" v-if="detail.status==3">已完成</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+				<text class="" v-if="detail.refundCount" style="margin-left: 8rpx;">有退款({{detail.refundCount}})</text>
+			</view>
+			<view class="item" v-if="detail.refundingMoneyTotal>0">
+				<text class="t1">退款中</text>
+				<text class="t2 red" @tap="goto" :data-url="'refundlist?orderid='+ detail.id">¥{{detail.refundingMoneyTotal}}</text>
+				<text class="t3 iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+			</view>
+			<view class="item" v-if="detail.refundedMoneyTotal>0">
+				<text class="t1">已退款</text>
+				<text class="t2 red" @tap="goto" :data-url="'refundlist?orderid='+ detail.id">¥{{detail.refundedMoneyTotal}}</text>
+				<text class="t3 iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回</text>
+			</view>
+			
+			<view class="item" v-if="detail.balance_price>0">
+				<text class="t1">尾款</text>
+				<text class="t2 red">¥{{detail.balance_price}}</text>
+			</view>
+			<view class="item" v-if="detail.balance_price>0">
+				<text class="t1">尾款状态</text>
+				<text class="t2" v-if="detail.balance_pay_status==1">已支付</text>
+				<text class="t2" v-if="detail.balance_pay_status==0">未支付</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytypeid!='4' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.paytypeid">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytypeid == '4' ? codtxt : detail.paytype}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">派单时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">完成时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="title">顾客信息</view>
+			<view class="item">
+				<text class="t1">姓名</text>
+				<text class="t2">{{detail.linkman}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">手机号</text>
+				<text class="t2">{{detail.tel}}</text>
+			</view>
+			<view class="item" v-if="detail.fwtype==2">
+				<text class="t1">上门地址</text>
+				<text class="t2">{{detail.address}}</text>
+			</view>
+		</view>
+		
+			
+		
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1 && !detail.worker_id" class="btn2" @tap="peisong" :data-id="detail.id">派单</view>
+			<block v-if="detail.status==2 || detail.status==3 || detail.worker_orderid>0">
+				<view class="btn2" @tap="logistics" :data-express_com="detail.express_com" :data-express_no="detail.worker_orderid"  >查进度</view>
+			</block>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+			<block v-if="detail.status==3 || detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+		
+		</view>
+		
+		
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+	
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:24rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		prodata: '',
+		djs: '',
+		iscommentdp: "",
+		detail: "",
+		payorder:{},
+		prolist: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		pay_transfer_info:{},
+		invoice:0,
+		selectExpressShow:false,
+		express_content:'',
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminOrder/yuyueorderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.iscommentdp = res.iscommentdp,
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				that.pay_transfer_info =  res.pay_transfer_info;
+				that.payorder = res.payorder;
+				that.invoice = res.invoice;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+	setremark:function(){
+		this.$refs.dialogSetremark.open();
+	},
+	setremarkconfirm: function (done, remark) {
+		this.$refs.dialogSetremark.close();
+		var that = this
+		app.post('ApiAdminOrder/setremark', { type:'yuyue',orderid: that.detail.id,content:remark }, function (res) {
+			app.success(res.msg);
+			setTimeout(function () {
+				that.getdata();
+			}, 1000)
+		})
+	},
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiYuyue/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+	  refundnopass: function (e) {
+		var that = this;
+		var orderid = e.currentTarget.dataset.id
+		app.confirm('确定要驳回退款申请吗?', function () {
+			app.showLoading('提交中');
+			app.post('ApiAdminOrder/refundnopass', { type:'yuyue',orderid: orderid }, function (data) {
+				app.showLoading(false);
+				app.success(data.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		});
+	  },
+	  refundpass: function (e) {
+		var that = this;
+		var orderid = e.currentTarget.dataset.id
+		app.confirm('确定要审核通过并退款吗?', function () {
+			app.showLoading('提交中');
+			app.post('ApiAdminOrder/refundpass', { type:'yuyue',orderid: orderid }, function (data) {
+				app.showLoading(false);
+				app.success(data.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		});
+	  },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定已完成服务吗?', function () {
+				app.showLoading('确认中');
+        app.post('ApiYuyue/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+	peisong:function(){
+		var that = this;
+		that.loading = true;
+		app.post('ApiAdminOrder/getyuyuepsuser',{type:'yuyue_order',orderid:that.detail.id},function(res){
+			that.loading = false;
+			var peisonguser = res.peisonguser
+			var paidantype = res.paidantype
+			var psfee = res.psfee
+			var ticheng = res.ticheng
+	
+			var peisonguser2 = [];
+			for(var i in peisonguser){
+				peisonguser2.push(peisonguser[i].title);
+			}
+			that.peisonguser = res.peisonguser;
+			that.peisonguser2 = peisonguser2;
+			if(paidantype==1){
+				that.$refs.dialogPeisong.open();
+			}else{
+				if(that.detail.bid == 0){
+					var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+				}else{
+					var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+				}
+				if(paidantype == 2){
+					var psid = '-1';
+				}else{
+					var psid = '0';
+				}
+				app.confirm(tips,function(){
+					app.post('ApiAdminOrder/yuyuepeisong', { type:'yuyue_order',orderid: that.detail.id,worker_id:psid}, function (res) {
+						app.success(res.msg);
+						setTimeout(function () {
+							that.getdata();
+						}, 1000)
+					})
+				})
+			}
+		})
+	},
+	dialogPeisongClose:function(){
+		this.$refs.dialogPeisong.close();
+	},
+	peisongChange:function(e){
+		this.index2 = e.detail.value;
+	},
+	confirmPeisong:function(){
+		var that = this
+		var psid = this.peisonguser[this.index2].id
+		app.post('ApiAdminOrder/yuyuepeisong', { type:'yuyue_order',orderid: that.detail.id,worker_id:psid}, function (res) {
+			app.success(res.msg);
+			that.$refs.dialogPeisong.close();
+			setTimeout(function () {
+				that.getdata();
+			}, 1000)
+		})
+	},
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openLocation:function(e){
+			var latitude = parseFloat(e.currentTarget.dataset.latitude);
+			var longitude = parseFloat(e.currentTarget.dataset.longitude);
+			var address = e.currentTarget.dataset.address;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		
+		logistics:function(e){
+			var express_com = e.currentTarget.dataset.express_com
+			var express_no = e.currentTarget.dataset.express_no
+			app.goto('/activity/yuyue/logistics?express_no=' + express_no);
+		},
+		hideSelectExpressDialog:function(){
+			this.$refs.dialogSelectExpress.close();
+		}
+  }
+};
+</script>
+<style>
+	.text-min { font-size: 24rpx; color: #999;}
+.ordertop{width:100%;height:452rpx;padding:50rpx 0 0 70rpx; justify-content: space-between;}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:40rpx;height:60rpx;line-height:60rpx;}
+.ordertop .f1 .t2{font-size:26rpx; margin-top: 20rpx;}
+
+.container .orderinfotop{ position: relative; margin-top: -200rpx;}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .title,.product .title{ font-weight: bold; font-size: 30rpx; line-height: 60rpx; margin-bottom: 15rpx;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .t3{ margin-top: 3rpx;}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;min-width:160rpx;padding: 0 20rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center;}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center;}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+.orderx image{ width:124rpx ; height: 124rpx; margin-right: 60rpx;}
+
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/product/edit.vue b/admin/product/edit.vue
new file mode 100644
index 0000000..22d1eae
--- /dev/null
+++ b/admin/product/edit.vue
@@ -0,0 +1,1000 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">商品名称<text style="color:red"> *</text></view>
+					<view class="f2"><input type="text" name="name" :value="info.name" placeholder="请填写商品名称" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">商品分类<text style="color:red"> *</text></view>
+					<view class="f2" @tap="changeClistDialog"><text v-if="cids.length>0">{{cnames}}</text><text v-else style="color:#888">请选择</text><image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">商品分组</view>
+					<view class="f2" @tap="changeGlistDialog"><text v-if="gids.length>0">{{gnames}}</text><text v-else style="color:#888">请选择</text><image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">商品卖点</view>
+					<view class="f2"><input type="text" name="sellpoint" :value="info.sellpoint" placeholder="请填写商品卖点" placeholder-style="color:#888"></input></view>
+				</view>
+			</view>
+			<view class="form-box">
+				<view class="form-item flex-col" style="border-bottom:0">
+					<view class="f1">商品主图<text style="color:red"> *</text></view>
+					<view class="f2">
+						<view v-for="(item, index) in pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pic"><image style="display:block" :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pic" data-pernum="1" v-if="pic.length==0"></view>
+					</view>
+					<input type="text" hidden="true" name="pic" :value="pic.join(',')" maxlength="-1"/>
+				</view>
+				<view class="form-item flex-col">
+					<view class="f1">商品图片</view>
+					<view class="f2" style="flex-wrap:wrap">
+						<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image style="display:block" :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" data-pernum="9" v-if="pics.length<5"></view>
+					</view>
+					<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+				</view>
+			</view>
+			<view class="form-box">
+				<view class="form-item flex-col">
+					<view class="f1">设置规格</view>
+					<view class="flex-col">
+						<view class="ggtitle">
+							<view class="t1">规格分组</view>
+							<view class="t2">规格名称</view>
+						</view>
+						<view class="ggcontent" v-for="(gg,index) in guigedata">
+							<view class="t1" @tap="delgggroupname" :data-index="index" :data-title="gg.title">{{gg.title}}<image class="edit" :src="event_rul +'/static/img/static/img/edit2.png'"/></view>
+							<view class="t2">
+								<view class="ggname" v-for="(ggitem,index2) in gg.items" @tap="delggname" :data-index="index" :data-index2="index2" :data-title="ggitem.title" :data-k="ggitem.k">{{ggitem.title}}<image class="close" :src="event_rul +'/static/img/static/img/ico-del.png'"/></view>
+								<view class="ggnameadd" @tap="addggname" :data-index="index">+</view>
+							</view>
+						</view>
+						<view class="ggcontent">
+							<view class="ggadd" @tap="addgggroupname">添加分组</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<!-- 规格列表 -->
+			<view class="form-box" v-for="(item,index) in gglist">
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">规格</view>
+					<view class="f2" style="font-weight:bold">{{item.name}}</view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">市场价（元）</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="market_price" :name="'market_price['+index+']'" :value="item.market_price" placeholder="请填写市场价" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">成本价（元）</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="cost_price" :name="'cost_price['+index+']'" :value="item.cost_price" placeholder="请填写成本价" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">销售价（元）</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="sell_price" :name="'sell_price['+index+']'" :value="item.sell_price" placeholder="请填写销售价" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">重量（克）</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="weight" :name="'weight['+index+']'" :value="item.weight" placeholder="请填写重量" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">库存</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="stock" :name="'stock['+index+']'" :value="item.stock" placeholder="请填写库存" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx" v-if="bid <= 0">
+					<view class="f1">赠{{t('积分')}}(个)</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="givescore" :name="'givescore['+index+']'" :value="item.givescore" placeholder="请填写赠送数量" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">规格图片</view>
+					<view class="f2" style="flex-wrap:wrap;margin-top:20rpx;margin-bottom:20rpx">
+						<view class="layui-imgbox" v-if="item.pic!=''">
+							<view class="layui-imgbox-close" @tap="removeimg2" :data-index="index"><image style="display:block" :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item.pic" @tap="previewImage" :data-url="item.pic" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" v-else :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg2" :data-index="index"></view>
+					</view>
+				</view>
+			</view>
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">配送模板</view>
+					<view class="f2">
+						<picker @change="freighttypeChange" :value="freightindex" :range="freighttypeArr">
+							<view class="picker">{{freighttypeArr[freightindex]}}</view>
+						</picker>
+						<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/>
+					</view>
+				</view>
+				<view class="form-item flex-col" v-if="freightindex==1">
+					<view class="f1">选择模板</view>
+					<view class="f2 flex-col">
+						<view class="freightitem" style="width:100%" v-for="(item,index) in freightList" @tap="changeFrieght" :data-index="index" :data-id="item.id">
+							<view class="f1">{{item.name}}</view>
+							<view class="radio" :style="inArray(item.id,freightIds) ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</view>
+				</view>
+				<view class="form-item flex-col" v-if="freightindex==2">
+					<view class="f1">发货信息</view>
+					<view class="f2 flex-col"><textarea name="freightdata" placeholder="请输入发货信息" placeholder-style="color:#888;font-size:28rpx" style="height:160rpx;min-height:160rpx;font-size:28rpx" maxlength="-1" :value="info.freightdata"></textarea></view>
+				</view>
+				<view class="form-item flex-col" v-if="freightindex==3" style="color:#999">请在电脑端后台上传卡密信息</view>
+			</view>
+
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">销量</view>
+					<view class="f2"><input type="text" name="sales" :value="info.sales" placeholder="请填写销量" placeholder-style="color:#888"></input></view>
+					<input type="text" hidden="true" name="oldsales" :value="info.id?info.sales:'0'">
+				</view>
+				<view class="form-item">
+					<view class="f1">起售数量</view>
+					<view class="f2"><input type="text" name="limit_start" :value="info.limit_start" placeholder="0表示不限制" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">每人限购</view>
+					<view class="f2"><input type="text" name="perlimit" :value="info.perlimit" placeholder="0表示不限购" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">序号</view>
+					<view class="f2"><input type="text" name="sort" :value="info.sort" placeholder="用于排序,越大越靠前" placeholder-style="color:#888"></input></view>
+				</view>
+			</view>
+			
+			<view class="form-box" v-if="product_showset==1">
+				<view class="form-item flex-col">
+					<view class="f1">购买条件</view>
+					<view class="f2" style="line-height:30px">
+						<checkbox-group class="radio-group" name="gettj" @change="bindGettjChange">
+							<label><checkbox value="-1" :checked="inArray('-1',gettjArr)?true:false"></checkbox> 所有人</label> 
+							<label><checkbox value="0" :checked="inArray('0',gettjArr)?true:false"></checkbox> 关注用户</label>
+							<label v-for="item in levellist" :key="item.id"><checkbox :value="item.id" :checked="inArray(item.id,gettjArr)?true:false"></checkbox> {{item.name}}</label>
+						</checkbox-group>
+					</view>
+				</view>
+			</view>
+
+			<view class="form-box">
+				<view class="form-item">
+					<text>状态<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="status" @change="bindStatusChange">
+							<label><radio value="1" :checked="info.status==1?true:false"></radio> 上架</label> 
+							<label><radio value="0" :checked="!info || info.status==0?true:false"></radio> 下架</label>
+							<label><radio value="2" :checked="info.status==2?true:false"></radio> 上架时间</label>
+							<label><radio value="3" :checked="info.status==3?true:false"></radio> 上架周期</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item flex-col" v-if="info.status==2">
+					<view class="f1">上架时间</view>
+					<view class="f2" style="line-height:30px">
+						 <picker mode="date" :value="start_time1" @change="bindStartTime1Change">
+               <view class="picker">{{start_time1}}</view>
+             </picker>
+						 <picker mode="time" :value="start_time2" @change="bindStartTime2Change">
+               <view class="picker" style="padding-left:10rpx">{{start_time2}}</view>
+             </picker>
+						 <view style="padding:0 10rpx;color:#222;font-weight:bold">到</view>
+						 <picker mode="date" :value="end_time1" @change="bindEndTime1Change">
+               <view class="picker">{{end_time1}}</view>
+             </picker>
+						 <picker mode="time" :value="end_time2" @change="bindEndTime2Change">
+               <view class="picker" style="padding-left:10rpx">{{end_time2}}</view>
+             </picker>
+					</view>
+				</view>
+				<view class="form-item flex-col" v-if="info.status==3">
+					<view class="f1">上架周期</view>
+					<view class="f2" style="line-height:30px">
+						 <picker mode="time" :value="start_hours" @change="bindStartHoursChange">
+               <view class="picker">{{start_hours}}</view>
+             </picker>
+						 <view style="padding:0 10rpx;color:#222;font-weight:bold">到</view>
+						 <picker mode="time" :value="end_hours" @change="bindEndHoursChange">
+               <view class="picker">{{end_hours}}</view>
+             </picker>
+					</view>
+				</view>
+			</view>
+			<view class="form-box">
+				<view class="form-item flex-col">
+					<text>商品详情</text>
+					<view class="detailop"><view class="btn" @tap="detailAddtxt">+文本</view><view class="btn" @tap="detailAddpic">+图片</view></view>
+					<view>
+						<block v-for="(setData, index) in pagecontent" :key="index">
+							<view class="detaildp">
+							<view class="op"><view class="flex1"></view><view class="btn" @tap="detailMoveup" :data-index="index">上移</view><view class="btn" @tap="detailMovedown" :data-index="index">下移</view><view class="btn" @tap="detailMovedel" :data-index="index">删除</view></view>
+							<view class="detailbox">
+								<block v-if="setData.temp=='notice'">
+									<dp-notice :params="setData.params" :data="setData.data"></dp-notice>
+								</block>
+								<block v-if="setData.temp=='banner'">
+									<dp-banner :params="setData.params" :data="setData.data"></dp-banner> 
+								</block>
+								<block v-if="setData.temp=='search'">
+									<dp-search :params="setData.params" :data="setData.data"></dp-search>
+								</block>
+								<block v-if="setData.temp=='text'">
+									<dp-text :params="setData.params" :data="setData.data"></dp-text>
+								</block>
+								<block v-if="setData.temp=='title'">
+									<dp-title :params="setData.params" :data="setData.data"></dp-title>
+								</block>
+								<block v-if="setData.temp=='dhlist'">
+									<dp-dhlist :params="setData.params" :data="setData.data"></dp-dhlist>
+								</block>
+								<block v-if="setData.temp=='line'">
+									<dp-line :params="setData.params" :data="setData.data"></dp-line>
+								</block>
+								<block v-if="setData.temp=='blank'">
+									<dp-blank :params="setData.params" :data="setData.data"></dp-blank>
+								</block>
+								<block v-if="setData.temp=='menu'">
+									<dp-menu :params="setData.params" :data="setData.data"></dp-menu> 
+								</block>
+								<block v-if="setData.temp=='map'">
+									<dp-map :params="setData.params" :data="setData.data"></dp-map> 
+								</block>
+								<block v-if="setData.temp=='cube'">
+									<dp-cube :params="setData.params" :data="setData.data"></dp-cube> 
+								</block>
+								<block v-if="setData.temp=='picture'">
+									<dp-picture :params="setData.params" :data="setData.data"></dp-picture> 
+								</block>
+								<block v-if="setData.temp=='pictures'"> 
+									<dp-pictures :params="setData.params" :data="setData.data"></dp-pictures> 
+								</block>
+								<block v-if="setData.temp=='video'">
+									<dp-video :params="setData.params" :data="setData.data"></dp-video> 
+								</block>
+								<block v-if="setData.temp=='shop'">
+									<dp-shop :params="setData.params" :data="setData.data" :shopinfo="setData.shopinfo"></dp-shop> 
+								</block>
+								<block v-if="setData.temp=='product'">
+									<dp-product :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-product> 
+								</block>
+								<block v-if="setData.temp=='collage'">
+									<dp-collage :params="setData.params" :data="setData.data"></dp-collage> 
+								</block>
+								<block v-if="setData.temp=='kanjia'">
+									<dp-kanjia :params="setData.params" :data="setData.data"></dp-kanjia> 
+								</block>
+								<block v-if="setData.temp=='seckill'">
+									<dp-seckill :params="setData.params" :data="setData.data"></dp-seckill> 
+								</block>
+								<block v-if="setData.temp=='scoreshop'">
+									<dp-scoreshop :params="setData.params" :data="setData.data"></dp-scoreshop> 
+								</block>
+								<block v-if="setData.temp=='coupon'">
+									<dp-coupon :params="setData.params" :data="setData.data"></dp-coupon> 
+								</block>
+								<block v-if="setData.temp=='article'">
+									<dp-article :params="setData.params" :data="setData.data"></dp-article> 
+								</block>
+								<block v-if="setData.temp=='business'">
+									<dp-business :params="setData.params" :data="setData.data"></dp-business> 
+								</block>
+								<block v-if="setData.temp=='liveroom'">
+									<dp-liveroom :params="setData.params" :data="setData.data"></dp-liveroom> 
+								</block>
+								<block v-if="setData.temp=='button'">
+									<dp-button :params="setData.params" :data="setData.data"></dp-button> 
+								</block>
+								<block v-if="setData.temp=='hotspot'">
+									<dp-hotspot :params="setData.params" :data="setData.data"></dp-hotspot> 
+								</block>
+								<block v-if="setData.temp=='cover'">
+									<dp-cover :params="setData.params" :data="setData.data"></dp-cover> 
+								</block>
+								<block v-if="setData.temp=='richtext'">
+									<dp-richtext :params="setData.params" :data="setData.data" :content="setData.content"></dp-richtext> 
+								</block>
+								<block v-if="setData.temp=='form'">
+									<dp-form :params="setData.params" :data="setData.data" :content="setData.content"></dp-form> 
+								</block>
+								<block v-if="setData.temp=='userinfo'">
+									<dp-userinfo :params="setData.params" :data="setData.data" :content="setData.content"></dp-userinfo> 
+								</block>
+							</view>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+
+
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">提交</button>
+			<view style="height:50rpx"></view>
+		</form>
+
+		
+		<view class="popup__container" v-if="clistshow">
+			<view class="popup__overlay" @tap.stop="changeClistDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择商品分类</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="changeClistDialog"/>
+				</view>
+				<view class="popup__content">
+					<block v-for="(item, index) in clist" :key="item.id">
+						<view class="clist-item" @tap="cidsChange" :data-id="item.id">
+							<view class="flex1">{{item.name}}</view>
+							<view class="radio" :style="inArray(item.id,cids) ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+						<block v-for="(item2, index2) in item.child" :key="item2.id">
+							<view class="clist-item" style="padding-left:80rpx" @tap="cidsChange" :data-id="item2.id">
+								<view class="flex1" v-if="item.child.length-1==index2">└ {{item2.name}}</view>
+								<view class="flex1" v-else>├ {{item2.name}}</view>
+								<view class="radio" :style="inArray(item2.id,cids) ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+							</view>
+							<block v-for="(item3, index3) in item2.child" :key="item3.id">
+							<view class="clist-item" style="padding-left:160rpx" @tap="cidsChange" :data-id="item3.id">
+								<view class="flex1" v-if="item2.child.length-1==index3">└ {{item3.name}}</view>
+								<view class="flex1" v-else>├ {{item3.name}}</view>
+								<view class="radio" :style="inArray(item3.id,cids) ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+							</view>
+							</block>
+						</block>
+					</block>
+				</view>
+			</view>
+		</view>
+		<view class="popup__container" v-if="glistshow">
+			<view class="popup__overlay" @tap.stop="changeGlistDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择商品分组</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="changeGlistDialog"/>
+				</view>
+				<view class="popup__content">
+					<block v-for="(item, index) in glist" :key="item.id">
+						<view class="clist-item" @tap="gidsChange" :data-id="item.id">
+							<view class="flex1">{{item.name}}</view>
+							<view class="radio" :style="inArray(item.id,gids) ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<uni-popup id="dialogInput" ref="dialogInput" type="dialog">
+			<uni-popup-dialog mode="input" title="输入规格名称" :value="ggname" placeholder="请输入规格名称" @confirm="setggname"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="dialogInput2" ref="dialogInput2" type="dialog">
+			<uni-popup-dialog mode="input" title="输入规格分组" :value="ggname" placeholder="请输入规格分组" @confirm="setgggroupname"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="dialogDetailtxt" ref="dialogDetailtxt" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请输入文本内容</text>
+				</view>
+				<view class="uni-dialog-content">
+					<textarea value="" placeholder="请输入文本内容" @input="catcheDetailtxt"></textarea>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogDetailtxtClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="dialogDetailtxtConfirm">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+				<view class="uni-popup-dialog__close" @click="dialogDetailtxtClose">
+					<span class="uni-popup-dialog__close-icon "></span>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		isload:false,
+		loading:false,
+		pre_url:app.globalData.pre_url,
+		info:{},
+		pagecontent:[],
+		aglevellist:[],
+		levellist:[],
+		clist:[],
+		cateArr:[],
+		glist:[],
+		groupArr:[],
+		freighttypeArr:['全部模板','指定模板','自动发货','在线卡密'],
+		freightindex:0,
+		freightList:[],
+		freightdata:[],
+		freightIds:[],
+		guigedata:[],
+		pic:[],
+		pics:[],
+		cids:[],
+		gids:[],
+		cnames:'',
+		gnames:'',
+		clistshow:false,
+		glistshow:false,
+		ggname:'',
+		ggindex:0,
+		ggindex2:0,
+		oldgglist:[],
+		gglist:[],
+		catche_detailtxt:'',
+		start_time1:'-选择日期-',
+		start_time2:'-选择时间-',
+		end_time1:'-选择日期-',
+		end_time2:'-选择时间-',
+		start_hours:'-开始时间-',
+		end_hours:'-结束时间-',
+		gettjArr:['-1'],
+		product_showset:1,
+		commission_canset:1,
+		bid:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id ? that.opt.id : '';
+			that.loading = true;
+			app.get('ApiAdminProduct/edit',{id:id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+				if(that.info.start_time){
+					var start_times = (that.info.start_time).split(' ');
+					that.start_time1 = start_times[0];
+					that.start_time2 = start_times[1];
+				}
+				if(that.info.end_time){
+					var end_times = (that.info.end_time).split(' ');
+					that.end_time1 = end_times[0];
+					that.end_time2 = end_times[1];
+				}
+				if(that.info.start_hours){
+					that.start_hours = that.info.start_hours;
+				}
+				if(that.info.end_hours){
+					that.end_hours = that.info.end_hours;
+				}
+				that.product_showset = res.product_showset
+				that.commission_canset = res.commission_canset
+				that.gettjArr = that.info.gettj
+				that.pagecontent = res.pagecontent;
+				that.aglevellist = res.aglevellist;
+				that.levellist = res.levellist;
+				that.oldgglist = res.newgglist;
+				that.clist = res.clist;
+				that.cateArr = res.cateArr;
+				that.glist = res.glist;
+				that.groupArr = res.groupArr;
+				that.freightList = res.freightList;
+				that.freightdata = res.freightdata;
+				if(res.info.freighttype == 1) that.freightindex = 0;
+				if(res.info.freighttype == 0){
+					that.freightindex = 1;
+					if(res.info.freightdata){
+						that.freightIds = res.info.freightdata.split(',');
+					}
+				}
+				if(res.info.freighttype == 3) that.freightindex = 2;
+				if(res.info.freighttype == 4) that.freightindex = 3;
+				that.pic = res.pic;
+				that.pics = res.pics;
+				that.cids = res.cids;
+				that.gids = res.gids;
+				that.guigedata = res.guigedata;
+				if(res.bset)
+				that.bset = res.bset;
+				that.bid = res.bid;
+				that.getcnames();
+				that.getgnames();
+				that.getgglist();
+				that.loaded();
+			});
+		},
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+      formdata.cid = that.cids.join(',');
+      formdata.gid = that.gids;
+			var guigedata = that.guigedata;
+			if(guigedata.length == 0){
+				app.alert('至少需要添加一个规格');
+				return;
+			}
+			for(var i in guigedata){
+				if(guigedata[i].items.length==0){
+					app.alert('规格分组['+guigedata[i].title+']至少需要添加一个规格');
+					return;
+				}
+			}
+			var freightindex = this.freightindex;
+			if(freightindex == 0){
+				formdata.freighttype = 1;
+			}else if(freightindex == 1){
+				formdata.freighttype = 0;
+				formdata.freightdata = this.freightIds.join(',');
+			}else if(freightindex == 2){
+				formdata.freighttype = 3;
+			}else if(freightindex == 3){
+				formdata.freighttype = 4;
+			}
+			if(formdata.status==2){
+				formdata.start_time = that.start_time1 + ' '+that.start_time2;
+				formdata.end_time = that.end_time1 + ' '+that.end_time2;
+			}
+			if(formdata.status==3){
+				formdata.start_hours = that.start_hours;
+				formdata.end_hours = that.end_hours;
+			}
+
+      var id = that.opt.id ? that.opt.id : '';
+      app.post('ApiAdminProduct/save', {id:id,info:formdata,guigedata:guigedata,gglist:that.gglist,pagecontent:that.pagecontent}, function (res) {
+        if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('index', 'redirect');
+          }, 1000);
+        }
+      });
+    },
+		detailAddtxt:function(){
+			this.$refs.dialogDetailtxt.open();
+		},
+		dialogDetailtxtClose:function(){
+			this.$refs.dialogDetailtxt.close();
+		},
+		catcheDetailtxt:function(e){
+			console.log(e)
+			this.catche_detailtxt = e.detail.value;
+		},
+		dialogDetailtxtConfirm:function(e){
+			var detailtxt = this.catche_detailtxt;
+			console.log(detailtxt)
+			var Mid = 'M' + new Date().getTime() + parseInt(Math.random() * 1000000);
+			var pagecontent = this.pagecontent;
+			pagecontent.push({"id":Mid,"temp":"text","params":{"content":detailtxt,"showcontent":detailtxt,"bgcolor":"#ffffff","fontsize":"14","lineheight":"20","letter_spacing":"0","bgpic":"","align":"left","color":"#000","margin_x":"0","margin_y":"0","padding_x":"5","padding_y":"5","quanxian":{"all":true},"platform":{"all":true}},"data":"","other":"","content":""});
+			this.pagecontent = pagecontent;
+			this.$refs.dialogDetailtxt.close();
+		},
+		detailAddpic:function(){
+			var that = this;
+			app.chooseImage(function(urls){
+				var Mid = 'M' + new Date().getTime() + parseInt(Math.random() * 1000000);
+				var pics = [];
+				for(var i in urls){
+					var picid = 'p' + new Date().getTime() + parseInt(Math.random() * 1000000);
+					pics.push({"id":picid,"imgurl":urls[i],"hrefurl":"","option":"0"})
+				}
+				var pagecontent = that.pagecontent;
+				pagecontent.push({"id":Mid,"temp":"picture","params":{"bgcolor":"#FFFFFF","margin_x":"0","margin_y":"0","padding_x":"0","padding_y":"0","quanxian":{"all":true},"platform":{"all":true}},"data":pics,"other":"","content":""});
+				that.pagecontent = pagecontent;
+			},9);
+		},
+		detailMoveup:function(e){
+			var index = e.currentTarget.dataset.index;
+			var pagecontent = this.pagecontent;
+			pagecontent[index] = pagecontent.splice(index-1, 1, pagecontent[index])[0];
+		},
+		detailMovedown:function(e){
+			var index = e.currentTarget.dataset.index;
+			var pagecontent = this.pagecontent;
+			pagecontent[index] = pagecontent.splice(index+1, 1, pagecontent[index])[0];
+		},
+		detailMovedel:function(e){
+			var index = e.currentTarget.dataset.index;
+			var pagecontent = this.pagecontent;
+			pagecontent.splice(index,1);
+		},
+		changeFrieght:function(e){
+			var id = e.currentTarget.dataset.id;
+			var index = e.currentTarget.dataset.index;
+			var freightIds = this.freightIds;
+			var newfreightIds = [];
+			var ischecked = false;
+			for(var i in freightIds){
+				if(freightIds[i] != id){
+					newfreightIds.push(freightIds[i]);
+				}else{
+					ischecked = true;
+				}
+			}
+			if(!ischecked) newfreightIds.push(id);
+			this.freightIds = newfreightIds;
+		},
+		freighttypeChange:function(e){
+			this.freightindex = e.detail.value;
+		},
+		bindStatusChange:function(e){
+			this.info.status = e.detail.value;
+		},
+		bindStartTime1Change:function(e){
+			this.start_time1 = e.target.value
+		},
+		bindStartTime2Change:function(e){
+			this.start_time2 = e.target.value
+		},
+		bindEndTime1Change:function(e){
+			this.end_time1 = e.target.value
+		},
+		bindEndTime2Change:function(e){
+			this.end_time2 = e.target.value
+		},
+		bindStartHoursChange:function(e){
+			this.start_hours = e.target.value
+		},
+		bindEndHoursChange:function(e){
+			this.end_hours = e.target.value
+		},
+		gglistInput:function(e){
+			var index = e.currentTarget.dataset.index;
+			var field = e.currentTarget.dataset.field;
+			var gglist = this.gglist;
+			gglist[index][field] = e.detail.value;
+			this.gglist = gglist;
+			console.log(gglist)
+		},
+		getgglist:function(){
+			var oldgglist = this.oldgglist;
+			var guigedata = this.guigedata;
+			var gglist = [];
+			var len = guigedata.length;
+			var newlen = 1; 
+			var h = new Array(len);
+			for(var i=0;i<len;i++){
+				var itemlen = guigedata[i].items.length;
+				if(itemlen<=0) { return; };
+				newlen*=itemlen;
+				h[i] = new Array(itemlen);
+				for(var j=0;j<itemlen;j++){
+					h[i][j] = { k:guigedata[i].items[j].k,title:guigedata[i].items[j].title};
+				}
+			}
+			 
+			//排列组合算法
+			var arr = h;  //原二维数组
+			var sarr = [[]];  //排列组合后的数组
+			for (var i = 0; i < arr.length; i++) {
+				var tarr = [];
+				for (var j = 0; j < sarr.length; j++)
+					for (var k = 0; k < arr[i].length; k++){
+						tarr.push(sarr[j].concat(arr[i][k]));
+					}
+					sarr = tarr;
+			}
+			console.log(sarr);
+			console.log(' ------ ');
+		
+			for(var i=0;i<sarr.length;i++){
+				var ks = [];
+				var titles = [];
+				for(var j=0;j<sarr[i].length;j++){
+					ks.push( sarr[i][j].k);
+					titles.push( sarr[i][j].title);
+				}
+				ks =ks.join(',');
+				titles =titles.join(',');
+				//console.log(ks);
+				//console.log(titles);
+				if(typeof(oldgglist[ks])!='undefined'){
+					var val = oldgglist[ks];
+				}else{
+					var val = { ks:ks,name:titles,market_price:'',cost_price:'',sell_price:'',weight:'100',stock:'1000',pic:'',givescore:'0',lvprice_data:null};
+				}
+				gglist.push(val);
+			}
+			this.gglist = gglist;
+			console.log(gglist);
+		},
+		addgggroupname:function(e){
+			this.ggname = '';
+			this.ggindex = -1;
+			this.$refs.dialogInput2.open();
+		},
+		delgggroupname:function(e){
+			var that = this;
+			var ggindex = e.currentTarget.dataset.index;
+			var title = e.currentTarget.dataset.title;
+			uni.showActionSheet({
+        itemList: [ '修改','删除'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) { //修改规格项
+							that.ggname = title;
+							that.ggindex = ggindex;
+							that.$refs.dialogInput2.open();return;
+						}else if (res.tapIndex == 1) { //删除规格项
+							var guigedata = that.guigedata;
+							var newguigedata = [];
+							for(var i in guigedata){
+								if(i != ggindex){
+									newguigedata.push(guigedata[i]);
+								}
+							}
+							that.guigedata = newguigedata;
+							console.log(newguigedata);
+							that.getgglist();
+						}
+					}
+				}
+			});
+		},
+		setgggroupname:function(done,val){
+			var guigedata = this.guigedata;
+			var ggindex = this.ggindex;
+			if(ggindex == -1){ //新增规格分组
+				ggindex = guigedata.length;
+				guigedata.push({k:ggindex,title:val,items:[]});
+				this.guigedata = guigedata;
+			}else{ //修改规格分组名称
+				guigedata[ggindex].title = val;
+				this.guigedata = guigedata;
+			}
+			this.$refs.dialogInput2.close();
+			this.getgglist();
+		},
+		addggname:function(e){
+			var ggindex = e.currentTarget.dataset.index;
+			this.ggname = '';
+			this.ggindex = ggindex;
+			this.ggindex2 = -1;
+			this.$refs.dialogInput.open();
+		},
+		delggname:function(e){
+			var that = this;
+			var ggindex = e.currentTarget.dataset.index;
+			var ggindex2 = e.currentTarget.dataset.index2;
+			var k = e.currentTarget.dataset.k;
+			var title = e.currentTarget.dataset.title;
+			uni.showActionSheet({
+        itemList: [ '修改','删除'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) { //修改规格项
+							that.ggname = title;
+							that.ggindex = ggindex;
+							that.ggindex2 = ggindex2;
+							that.$refs.dialogInput.open();return;
+						}else if (res.tapIndex == 1) { //删除规格项
+							var guigedata = that.guigedata;
+							var newguigedata = [];
+							for(var i in guigedata){
+								if(i == ggindex){
+									var newitems = [];
+									var index2 = 0;
+									for(var j in guigedata[i].items){
+										if(j!=ggindex2){
+											newitems.push({k:index2,title:guigedata[i].items[j].title});
+											index2++;
+										}
+									}
+									guigedata[i].items = newitems;
+								}
+								newguigedata.push(guigedata[i]);
+							}
+							that.guigedata = newguigedata;
+							console.log(newguigedata)
+							that.getgglist();
+						}
+					}
+				}
+			});
+		},
+		setggname:function(done,val){
+			var guigedata = this.guigedata;
+			var ggindex = this.ggindex;
+			var ggindex2 = this.ggindex2;
+			if(ggindex2 == -1){ //新增规格名称
+				var items = guigedata[ggindex].items;
+				ggindex2 = items.length;
+				items.push({k:ggindex2,title:val});
+				guigedata[ggindex].items = items;
+				this.guigedata = guigedata;
+			}else{ //修改规格名称
+				guigedata[ggindex].items[ggindex2].title = val;
+				this.guigedata = guigedata;
+			}
+			this.$refs.dialogInput.close();
+			this.getgglist();
+		},
+		cidsChange:function(e){
+			var clist = this.clist;
+			var cids = this.cids;
+			var cid = e.currentTarget.dataset.id;
+			var newcids = [];
+			var ischecked = false;
+			for(var i in cids){
+				if(cids[i] != cid){
+					newcids.push(cids[i]);
+				}else{
+					ischecked = true;
+				}
+			}
+			if(ischecked==false){
+				if(newcids.length >= 5){
+					app.error('最多只能选择五个分类');return;
+				}
+				newcids.push(cid);
+			}
+			this.cids = newcids;
+			this.getcnames();
+		},
+		getcnames:function(){
+			var cateArr = this.cateArr;
+			var cids = this.cids;
+			var cnames = [];
+			for(var i in cids){
+				cnames.push(cateArr[cids[i]]);
+			}
+			this.cnames = cnames.join(',');
+		},
+		gidsChange:function(e){
+			var glist = this.glist;
+			var gids = this.gids;
+			var gid = e.currentTarget.dataset.id;
+			var newgids = [];
+			var ischecked = false;
+			for(var i in gids){
+				if(gids[i] != gid){
+					newgids.push(gids[i]);
+				}else{
+					ischecked = true;
+				}
+			}
+			if(ischecked==false){
+				newgids.push(gid);
+			}
+			this.gids = newgids;
+			this.getgnames();
+		},
+		getgnames:function(){
+			var groupArr = this.groupArr;
+			var gids = this.gids;
+			var gnames = [];
+			for(var i in gids){
+				gnames.push(groupArr[gids[i]]);
+			}
+			this.gnames = gnames.join(',');
+		},
+		changeClistDialog:function(){
+			this.clistshow = !this.clistshow
+		},
+		changeGlistDialog:function(){
+			this.glistshow = !this.glistshow
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'pic'){
+				var pics = that.pic
+				pics.splice(index,1);
+				that.pic = pics;
+			}else if(field == 'pics'){
+				var pics = that.pics
+				pics.splice(index,1);
+				that.pics = pics;
+			}
+		},
+		uploadimg2:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			app.chooseImage(function(urls){
+				that.gglist[index].pic = urls[0];
+			},1);
+		},
+		removeimg2:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			that.gglist[index].pic = '';
+		},
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.form-box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.form-item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.form-item .f1{color:#222;width:200rpx;flex-shrink:0}
+.form-item .f2{display:flex;align-items:center}
+.form-box .form-item:last-child{ border:none}
+.form-box .flex-col{padding-bottom:20rpx}
+.form-item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.form-item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.form-item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.form-item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+
+.ggtitle{height:60rpx;line-height:60rpx;color:#111;font-weight:bold;font-size:26rpx;display:flex;border-bottom:1px solid #f4f4f4}
+.ggtitle .t1{width:200rpx;}
+.ggcontent{line-height:60rpx;margin-top:10rpx;color:#111;font-size:26rpx;display:flex}
+.ggcontent .t1{width:200rpx;display:flex;align-items:center;flex-shrink:0}
+.ggcontent .t1 .edit{width:40rpx;height:40rpx}
+.ggcontent .t2{display:flex;flex-wrap:wrap;align-items:center}
+.ggcontent .ggname{background:#f55;color:#fff;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:8rpx;margin-right:20rpx;margin-bottom:10rpx;font-size:24rpx;position:relative}
+.ggcontent .ggname .close{position:absolute;top:-14rpx;right:-14rpx;background:#fff;height:28rpx;width:28rpx;border-radius:14rpx}
+.ggcontent .ggnameadd{background:#ccc;font-size:36rpx;color:#fff;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:8rpx;margin-right:20rpx;margin-left:10rpx;position:relative}
+.ggcontent .ggadd{font-size:26rpx;color:#558}
+
+.ggbox{line-height:50rpx;}
+
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+
+
+.clist-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.radio .radio-img{width:100%;height:100%;display:block}
+
+.freightitem{width:100%;height:60rpx;display:flex;align-items:center;margin-left:40rpx}
+.freightitem .f1{color:#666;flex:1}
+
+.detailop{display:flex;line-height:60rpx}
+.detailop .btn{border:1px solid #ccc;margin-right:10rpx;padding:0 16rpx;color:#222;border-radius:10rpx}
+.detaildp{position:relative;line-height:50rpx}
+.detaildp .op{width:100%;display:flex;justify-content:flex-end;font-size:24rpx;height:60rpx;line-height:60rpx;margin-top:10rpx}
+.detaildp .op .btn{background:rgba(0,0,0,0.4);margin-right:10rpx;padding:0 10rpx;color:#fff}
+.detaildp .detailbox{border:2px dashed #00a0e9}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/product/index.vue b/admin/product/index.vue
new file mode 100644
index 0000000..710b782
--- /dev/null
+++ b/admin/product/index.vue
@@ -0,0 +1,180 @@
+<template>
+<view class="container">
+	<dd-tab :itemdata="['全部('+countall+')','已上架('+count1+')','未上架('+count0+')']" :itemst="['all','1','0']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+	<view class="topsearch flex-y-center">
+		<view class="f1 flex-y-center">
+			<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+			<input :value="keyword" placeholder="输入关键字搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm"></input>
+		</view>
+	</view>
+
+	<view id="datalist">
+	<block v-for="(item, index) in datalist" :key="index">
+		<view class="order-box">
+			<view class="content" style="border-bottom:none">
+				<view @tap="goto" :data-url="'/pages/shop/product?id=' + item.id">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">剩余：{{item.stock}}<text style="color:#a88;padding-left:20rpx">已售：{{item.sales}}</text></text>
+					<view class="t3"><text class="x1">￥{{item.sell_price}}</text><text class="x2">￥{{item.market_price}}</text></view>
+				</view>
+			</view>
+			<view class="op">
+				<text style="color:red" class="flex1" v-if="!item.status || item.status==0">未上架</text>
+				<text style="color:green" class="flex1" v-else>已上架</text>
+				<text style="color:orange" class="flex1" v-if="!item.ischecked">待审核</text>
+				<view class="btn1" :style="{background:t('color1')}" @tap="setst" data-st="1" :data-id="item.id" v-if="!item.status || item.status==0">上架</view>
+				<view class="btn1" :style="{background:t('color2')}" @tap="setst" data-st="0" :data-id="item.id" v-else>下架</view>
+				<view @tap="goto" :data-url="'edit?id='+item.id" class="btn2">编辑</view>
+				<view class="btn2" @tap="todel" :data-id="item.id">删除</view>
+			</view>
+		</view>
+	</block>
+	</view>
+
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		count0: 0,
+		count1: 0,
+		countall: 0,
+		sclist: "",
+		keyword: '',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      var that = this;
+      that.st = st;
+      that.getdata();
+    },
+    getdata: function (loadmore,keyword) {
+     if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminProduct/index', {keyword:keyword,pagenum: pagenum,st: that.st}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1){
+					that.countall = res.countall;
+					that.count0 = res.count0;
+					that.count1 = res.count1;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该商品吗?', function () {
+        app.post('ApiAdminProduct/del', {id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要' + (st == 0 ? '下架' : '上架') + '吗?', function () {
+        app.post('ApiAdminProduct/setst', {st: st,id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    },
+		searchConfirm:function(e){
+			var keyword = e.detail.value;
+      this.getdata(false,keyword);
+		}
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:110rpx}
+
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.order-box{ width: 94%;margin:0 3%;padding:3px 3%; background: #fff; margin-bottom:12rpx;border-radius:16rpx}
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;min-height:50rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height:36rpx;line-height:36rpx;color: #999;overflow: hidden;font-size: 24rpx;}
+.order-box .content .detail .t3{display:flex;height: 36rpx;line-height: 36rpx;color: #ff4246;}
+.order-box .content .detail .x1{ font-size:30rpx;margin-right:5px}
+.order-box .content .detail .x2{ font-size:24rpx;text-decoration:line-through;color:#999}
+
+.order-box .bottom{ width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.order-box .op{ display:flex;align-items:center;width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.btn1{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/booking.vue b/admin/restaurant/booking.vue
new file mode 100644
index 0000000..e7d061f
--- /dev/null
+++ b/admin/restaurant/booking.vue
@@ -0,0 +1,244 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="content">
+				<view class="info-item">
+					<view class="t1">预定时间</view>
+					<view class="t2" @tap="chooseTime"><input type="text" placeholder="请选择时间" name="time" :value="chooseTimeStr"></view>
+					<image class="t3" @tap="chooseTime" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+				<view class="info-item">
+					<view class="t1">人数</view>
+					<view class="t2">
+						<picker @change="numChange" :value="nindex" :range="numArr" name="renshu">
+							<view class="picker">{{numArr[nindex]}}</view>
+						</picker>
+					</view>
+					<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+				<view class="info-item">
+					<view class="t1">餐桌</view>
+					<view class="t2" @tap="goto" :data-url="'bookingTableList?bid='+opt.bid"><input type="text" :value="tableName" placeholder="请选择"></view>
+					<image class="t3" @tap="goto" :data-url="'bookingTableList?bid='+opt.bid" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			<view class="content">
+				<view class="info-item">
+					<view class="t1">顾客姓名</view>
+					<view class="t2"><input type="text" @input="input" data-name="linkman" name="linkman" :value="linkman" placeholder="请输入姓名"></view>
+				</view>
+				<view class="info-item">
+					<view class="t1">手机号</view>
+					<view class="t2"><input type="number" @input="input" data-name="tel" name="tel" :value="tel" placeholder="请输入手机号"></view>
+				</view>
+			</view>
+			
+			<view class="content">
+				<view class=" remark" >
+					<view class="t1">备注</view>
+					<view class="">
+					<textarea @input="input" data-name="message" name="message" :value="message" placeholder="如您有其他需求请填写" placeholder-style="color:#ABABABFF"></textarea>
+					</view>
+				</view>
+			</view>
+			
+			<view style="padding:30rpx 0">
+				<button form-type="submit" class="set-btn" style="background:#FE5B07">添加预定</button>
+			</view>
+		</form>
+		
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hideTimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hideTimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in timeArr" :key="index" @tap="timeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo:{},
+		pstimeDialogShow: false,
+		timeArr:[],
+		chooseTimeStr:'',
+		chooseTimeIndex:0,
+		nindex:0,
+		numArr:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20],
+		tableName:'',
+		linkman:'',
+		tel:'',
+		message:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		if(uni.getStorageSync('restaurant_booking') == '') {
+			uni.setStorageSync('restaurant_booking', {})
+		}
+		this.opt = app.getopts(opt);
+		this.opt.bid = this.opt.bid ? this.opt.bid : 0;
+		var tempdata = uni.getStorageSync('restaurant_booking');
+		this.chooseTimeStr = tempdata.chooseTimeStr;
+		this.chooseTimeIndex = tempdata.chooseTimeIndex;
+		this.nindex = tempdata.nindex;
+		this.linkman = tempdata.linkman;
+		this.tel = tempdata.tel;
+		this.message = tempdata.message;
+		
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantBooking/add', {bid:that.opt.bid,tableId:that.opt.tableId}, function (data) {
+				that.loading = false;
+				that.timeArr = data.timeArr;
+				that.tableName = data.table ? data.table.name : '';
+				that.loaded();
+			});
+		},
+		subform: function (e) {
+			var that = this;
+			var info = e.detail.value;
+			info.tableId = that.opt.tableId;
+			info.bid = that.opt.bid;
+			info.renshu = that.numArr[that.nindex]
+			// console.log(info);return;
+			if (info.time == '') {
+				app.error('请选择时间');
+				return false;
+			}
+			if (info.renshu <= 0) {
+				app.error('请选择人数');
+				return false;
+			}
+			if (info.tableId == 0) {
+				app.error('请选择餐桌');
+				return false;
+			}
+			if (info.linkman == '') {
+				app.error('请填写姓名');
+				return false;
+			}
+			if (info.tel == '') {
+				app.error('请填写手机号');
+				return false;
+			}
+			app.showLoading('提交中');
+			app.post("ApiRestaurantBooking/add", {info: info}, function (res) {
+				app.showLoading(false);
+				if(res.status == 0) {
+					app.alert(res.msg);
+				}
+				uni.removeStorageSync('restaurant_booking');
+				app.alert(res.msg,function(){
+					if(res.payorderid)
+					app.goto('/pages/pay/pay?id='+res.payorderid);
+					else
+					app.goto('detail?id='+res.id);
+				});
+		  });
+		},
+		chooseTime: function (e) {
+		  var that = this;
+		  var allbuydata = that.allbuydata;
+		  var bid = e.currentTarget.dataset.bid;
+		  var timeArr = that.timeArr;
+		  var itemlist = [];
+		  for (var i = 0; i < timeArr.length; i++) {
+		    itemlist.push(timeArr[i].title);
+		  }
+		  if (itemlist.length == 0) {
+		    app.alert('当前没有可选时间段');
+		    return;
+		  }
+		  that.nowbid = bid;
+		  that.pstimeDialogShow = true;
+		  that.pstimeIndex = -1;
+		},
+		timeRadioChange: function (e) {
+		  var that = this;
+			var allbuydata = that.allbuydata;
+		  var pstimeIndex = e.currentTarget.dataset.index;
+			console.log(pstimeIndex)
+			var nowbid = that.nowbid;
+			var chooseTime = that.timeArr[pstimeIndex];
+			that.chooseTimeIndex = pstimeIndex;
+			that.chooseTimeStr = that.timeArr[pstimeIndex].value;
+			var tempdata = uni.getStorageSync('restaurant_booking');
+			tempdata.chooseTimeIndex = pstimeIndex;
+			tempdata.chooseTimeStr = that.timeArr[pstimeIndex].value;
+			uni.setStorageSync('restaurant_booking', tempdata);
+		  that.pstimeDialogShow = false;
+		},
+    hideTimeDialog: function () {
+      this.pstimeDialogShow = false;
+    },
+		numChange: function (e) {
+		  this.nindex = e.detail.value;
+			var tempdata = uni.getStorageSync('restaurant_booking');
+			tempdata.nindex = this.nindex;
+			uni.setStorageSync('restaurant_booking', tempdata);
+		},
+		input: function(e){
+			var value = e.target.value;
+			// console.log(value)
+			var name = e.currentTarget.dataset.name;
+			// console.log(e)
+			var tempdata = uni.getStorageSync('restaurant_booking');
+			tempdata[name] = value;
+			uni.setStorageSync('restaurant_booking', tempdata);
+		}
+  }
+};
+</script>
+<style>
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:0 20rpx;}
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid;height:120rpx;line-height:96rpx}
+.info-item:last-child{border:none}
+ .t1{ width: 200rpx;color: #333;font-weight:bold;height:96rpx;line-height:96rpx}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+.remark {
+	height: 320rpx;padding:0 3%; 
+}
+.remark .t1 {width: 100%; flex: inherit;}
+.remark textarea { height: 100px;}
+.set-btn{width: 90%;margin:0 5%;height:96rpx;line-height:96rpx;font-size:34rpx;border-radius:10rpx;color:#FFFFFF;}
+picker {height: 96rpx;}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/bookingTableList.vue b/admin/restaurant/bookingTableList.vue
new file mode 100644
index 0000000..379b049
--- /dev/null
+++ b/admin/restaurant/bookingTableList.vue
@@ -0,0 +1,144 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+		<view class="tab-box shopping">
+			<view class="page-tab">
+				<view class="page-tab2">
+					<view :class="'item ' + (curTopIndex == -1 ? 'on' : '')" @tap="switchTopTab" :data-index="-1" :data-id="0">全部</view>
+					<block v-for="(item, index) in clist" :key="index">
+						<view :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id">{{item.name}}</view>
+					</block>
+				</view>
+			</view>
+			<view class="shop-box">
+				<view class="shop-item" v-for="item in contentList">
+					<image class="shop-img" :src="item.pic ? item.pic : logo" mode="aspectFill"> </image>
+					<view class="f2 flex-col flex1">
+						<view class="shop-name multi-ellipsis-2">
+							{{item.name}}
+						</view>
+						<view class="desc">人数：{{item.seat}}</view>
+						<view class="desc">预定费：{{item.booking_fee}} 最低消费：{{item.limit_fee}}</view>
+					</view>
+					<view class="f3 button" @click="goto" :data-url="'booking?bid='+opt.bid+'&tableId=' + item.id">
+						预定
+					</view>
+				</view>
+			</view>
+		</view>
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				
+				pagenum:1,
+				contentList:[],
+				clist:[],
+				curCid:0,
+				curTopIndex: -1,
+				curIndex: -1,
+				logo:''
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.opt.bid = this.opt.bid ? this.opt.bid : 0;
+			this.logo = app.globalData.initdata.logo;
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				var nowcid = that.opt.cid;
+				if (!nowcid) nowcid = 0;
+				app.get('ApiRestaurantBooking/tableCategory', {}, function (res) {
+					that.loading = false;
+					var data = res.data;
+					that.clist = data;
+					// that.curCid = data[0]['id'];
+					if (nowcid) {
+						for (var i = 0; i < data.length; i++) {
+							if (data[i]['id'] == nowcid) {
+								that.curTopIndex = i;
+								that.curCid = nowcid;
+								break;
+							}
+						}
+					}
+					that.getTabContentList();
+					that.loaded();
+				});
+			},
+			
+			switchTopTab: function (e) {
+			  var that = this;
+			  var id = e.currentTarget.dataset.id;
+			  var index = parseInt(e.currentTarget.dataset.index);
+			  this.curTopIndex = index;
+			  this.curIndex = -1;
+			  this.contentList = [];
+			  this.curCid = id;
+				this.pagenum = 1;
+			  this.getTabContentList();
+			},
+			getTabContentList:function(){
+				var that = this;
+				var pagenum = that.pagenum;
+				that.nodata = false;
+				that.nomore = false;
+				that.loading = true;
+				app.post('ApiRestaurantBooking/tableList', {cid: that.curCid,pagenum: pagenum}, function (res) {
+					that.loading = false;
+					var data = res.data;
+					if (pagenum == 1) {
+						that.contentList = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+						that.loaded();
+					}else{
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var contentList = that.contentList;
+							var newdata = contentList.concat(data);
+							that.contentList = newdata;
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+.page-tab{display:flex;width:100%;overflow-x:scroll;border-bottom: 1px #f5f5f5 solid;padding:0 10rpx; background-color: #FFFFFF;}
+.page-tab2{display:flex;width:auto;min-width:100%}
+.page-tab2 .item{width:auto;padding:0 20rpx;font-size:28rpx;text-align: center; color:#333; height:90rpx; line-height:90rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.page-tab2 .on{color:#FE5B07; font-size: 30rpx;}
+
+.shop-box {padding: 0 30rpx 30rpx;}
+.shop-box .shop-item {width: 100%;margin-top: 20rpx; display: flex;background: #fff;border-radius: 8rpx; padding: 20rpx;}
+.shop-box .shop-item .shop-img {width: 200rpx;height: 200rpx;border-radius: 8rpx; background-color: #eee;}
+.shop-box .shop-item .f2 {margin-top: 12rpx;justify-content: space-between; padding: 10rpx;}
+.shop-box .shop-item .shop-name {font-size: 32rpx;color: #333;}
+.shop-box .shop-item .desc {color: #999;}
+.shop-box .shop-item .f3 {width: 120rpx; align-items: center;}
+.button{width: 100rpx;height:70rpx;line-height:70rpx;font-size:28rpx;color:#FFFFFF;  background: linear-gradient(90deg, #FF7D15 0%, #FC5729 100%);
+border-radius: 10rpx; text-align: center;}
+
+</style>
diff --git a/admin/restaurant/bookingorder.vue b/admin/restaurant/bookingorder.vue
new file mode 100644
index 0000000..bb0feab
--- /dev/null
+++ b/admin/restaurant/bookingorder.vue
@@ -0,0 +1,167 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" :placeholderText="'请输入预订人姓名或手机号搜索'" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','待审核','已完成','退款']" :itemst="['all','0','1','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'bookingorderdetail?id=' + item.id">
+					<view class="head">
+						<view><text class="bold">{{item.linkman}}</text>{{item.tel}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.check_status==0" class="st0">待审核</text>
+						<text v-if="item.status==1 && item.check_status==-1" class="st4">驳回</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+					<view class="h60">预定时间：{{item.booking_time}}</view>
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view @tap.stop="goto" :data-url="'/restaurant/shop/product?id=' + item2.proid">
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3"><text class="x1 flex1">￥{{item2.sell_price}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text><!-- 共计{{item.procount}}件菜品 --> 桌号：{{item.tableName}} 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:''
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantBookingOrder/index', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+	.h60 { line-height: 60rpx;}
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden;}
+.order-box .head .bold {font-size: 34rpx; color: #333; margin-right: 20rpx; font-weight: bold;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/bookingorderdetail.vue b/admin/restaurant/bookingorderdetail.vue
new file mode 100644
index 0000000..d41e97c
--- /dev/null
+++ b/admin/restaurant/bookingorderdetail.vue
@@ -0,0 +1,483 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择'+codtxt : '已成功付款'}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.check_status == 0">
+				<view class="t1">待审核</view>
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.check_status == -1">
+				<view class="t1 color-red">驳回预约</view>
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.check_status == 1">
+				<view class="t1">审核通过</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="product" v-if="prolist.length >0">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'/restaurant/shop/product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">联系人</text>
+				<text class="flex1"></text>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.linkman}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">电话</text>
+				<text class="t2">{{detail.tel}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">桌号</text>
+				<text class="t2">{{detail.tableName}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{detail.message ? detail.message : '无'}}</text>
+			</view>
+			<view class="item" v-if="detail.field1">
+				<text class="t1">{{detail.field1data[0]}}</text>
+				<text class="t2 red">{{detail.field1data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field2">
+				<text class="t1">{{detail.field2data[0]}}</text>
+				<text class="t2 red">{{detail.field2data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field3">
+				<text class="t1">{{detail.field3data[0]}}</text>
+				<text class="t2 red">{{detail.field3data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field4">
+				<text class="t1">{{detail.field4data[0]}}</text>
+				<text class="t2 red">{{detail.field4data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field5">
+				<text class="t1">{{detail.field5data[0]}}</text>
+				<text class="t2 red">{{detail.field5data[1]}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+			
+			<view v-if="detail.status==1 && detail.check_status == 0" class="btn2 color-red" @tap="refuse" :data-id="detail.id">驳回</view>
+			<view v-if="detail.status==1 && detail.check_status == 0" class="btn2" @tap="access" :data-id="detail.id">审核通过</view>
+			
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+			expressdata:[],
+			express_index:0,
+			express_no:'',
+      prodata: '',
+      djs: '',
+      detail: "",
+      prolist: "",
+      shopset: "",
+      storeinfo: "",
+      lefttime: "",
+      codtxt: "",
+			peisonguser:[],
+			peisonguser2:[],
+			index2:0,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminRestaurantBookingOrder/detail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminRestaurantOrderCommon/setremark', { type:'restaurant_booking',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminRestaurantOrderCommon/ispay', { type:'restaurant_booking',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminRestaurantOrderCommon/delOrder', { type:'restaurant_booking',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminRestaurantOrderCommon/closeOrder', { type:'restaurant_booking',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminRestaurantOrderCommon/refundnopass', { type:'restaurant_booking',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminRestaurantOrderCommon/refundpass', { type:'restaurant_booking',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refuse: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回吗？如有预定费将进行退款', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminRestaurantBookingOrder/check', { type:'refuse',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		access: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('提交中');
+			app.post('ApiAdminRestaurantBookingOrder/check', { type:'access',orderid: orderid }, function (data) {
+				app.showLoading(false);
+				app.success(data.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.color-red {color: red;}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/category/edit.vue b/admin/restaurant/category/edit.vue
new file mode 100644
index 0000000..2aa2de8
--- /dev/null
+++ b/admin/restaurant/category/edit.vue
@@ -0,0 +1,156 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">菜品分类名称<text style="color:red"> *</text></view>
+					<view class="f2"><input type="text" name="name" :value="info.name" placeholder="请填写名称" placeholder-style="color:#888"></input></view>
+				</view>
+
+				<view class="form-item">
+					<view class="f1">排序</view>
+					<view class="f2"><input type="text" name="sort" :value="info.sort" placeholder="用于排序,越大越靠前" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<text>支持店内<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="is_shop" @change="">
+							<label><radio value="1" :checked="info.is_shop==1?true:false"></radio> 显示</label> 
+							<label><radio value="0" :checked="!info || info.is_shop==0?true:false"></radio> 隐藏</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<text>支持外卖<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="is_takeaway" @change="">
+							<label><radio value="1" :checked="info.is_takeaway==1?true:false"></radio> 显示</label> 
+							<label><radio value="0" :checked="!info || info.is_takeaway==0?true:false"></radio> 隐藏</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<text>支持预定<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="is_booking" @change="">
+							<label><radio value="1" :checked="info.is_booking==1?true:false"></radio> 显示</label> 
+							<label><radio value="0" :checked="!info || info.is_booking==0?true:false"></radio> 隐藏</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<text>状态<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="status" @change="">
+							<label><radio value="1" :checked="info.status==1?true:false"></radio> 显示</label> 
+							<label><radio value="0" :checked="!info || info.status==0?true:false"></radio> 隐藏</label>
+						</radio-group>
+					</view>
+				</view>
+			</view>
+
+
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">提交</button>
+			<button class="button text-btn" @tap="todel" v-if="info.id">删除</button>
+			<view style="height:50rpx"></view>
+		</form>
+
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			isload:false,
+			loading:false,
+			pre_url:app.globalData.pre_url,
+      info:{},
+		}
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id ? that.opt.id : '';
+			that.loading = true;
+			app.get('ApiAdminRestaurantCategory/edit',{id:id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+
+				that.loaded();
+			});
+		},
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+
+      var id = that.opt.id ? that.opt.id : '';
+      app.post('ApiAdminRestaurantCategory/save', {id:id,info:formdata}, function (res) {
+        if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('index', 'redirect');
+          }, 1000);
+        }
+      });
+    },
+		todel: function (e) {
+		  var that = this;
+		  var id = that.opt.id ? that.opt.id : '';
+		  app.confirm('确定要删除吗?分类下菜品也会删除', function () {
+		    app.post('ApiAdminRestaurantCategory/del', {id: id}, function (res) {
+		      if (res.status == 1) {
+		        app.success(res.msg);
+		        app.goback(true)
+		      } else {
+		        app.error(res.msg);
+		      }
+		    });
+		  });
+		},
+		bindStatusChange:function(e){
+			this.info.status = e.detail.value;
+		},
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.form-box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.form-item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.form-item .f1{color:#222;width:200rpx;flex-shrink:0}
+.form-item .f2{display:flex;align-items:center}
+.form-box .form-item:last-child{ border:none}
+.form-box .flex-col{padding-bottom:20rpx}
+.form-item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.form-item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.form-item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.form-item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+
+
+.clist-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.radio .radio-img{width:100%;height:100%;display:block}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/category/index.vue b/admin/restaurant/category/index.vue
new file mode 100644
index 0000000..230f5e2
--- /dev/null
+++ b/admin/restaurant/category/index.vue
@@ -0,0 +1,141 @@
+<template>
+<view>
+	<view class="container" id="datalist">
+			<view>
+				<view class="info-item">
+					<view class="t1">分类名称</view>
+					<view class="t2">店内</view>
+					<view class="t2">外卖</view>
+					<view class="t2">预定</view>
+					<view class="t2">排序</view>
+				</view>
+				<view class="info-item" v-for="(item,index) in datalist">
+					<view class="t1">{{item.name}}<text v-if="item.status == 0" style="color: #DBAA83;">(隐藏)</text></view>
+					<view class="t2"><text v-if="item.is_shop == 1">开</text><text v-else>关</text></view>
+					<view class="t2"><text v-if="item.is_takeaway == 1">开</text><text v-else>关</text></view>
+					<view class="t2"><text v-if="item.is_booking == 1">开</text><text v-else>关</text></view>
+					<view class="t2">{{item.sort}}</view>
+					<image class="t3" @tap="goto" :data-url="'edit?id=' + item.id" :src="event_rul + '/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+	
+	</view>
+
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      count0: 0,
+      count1: 0,
+      countall: 0,
+      sclist: "",
+	  
+	  event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      var that = this;
+      that.st = st;
+      that.getdata();
+    },
+    getdata: function (loadmore) {
+     if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantCategory/index', {pagenum: pagenum}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1){
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除吗?', function () {
+        app.post('ApiAdminRestaurantCategory/del', {id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要' + (st == 0 ? '下架' : '上架') + '吗?', function () {
+        app.post('ApiAdminRestaurantCategory/setst', {st: st,id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;}
+
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid;height:96rpx;line-height:96rpx}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 300rpx;font-weight:bold;height:auto;line-height:48rpx;}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+
+.btn1{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/depositorder.vue b/admin/restaurant/depositorder.vue
new file mode 100644
index 0000000..c745ef3
--- /dev/null
+++ b/admin/restaurant/depositorder.vue
@@ -0,0 +1,181 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" :placeholderText="'请输入寄存名称、寄存人姓名或手机号搜索'" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待审核','寄存中','已取出','驳回']" :itemst="['all','0','1','2','3']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block>
+				<view class="order-box" v-for="(item2, idx) in datalist" :key="idx">
+					<block>
+						<view class="content">
+							<view class="pic" @tap="goto" :data-url="'depositorderdetail?id=' + item2.id">
+								<image :src="item2.pic" class="img"></image>
+							</view>
+							<view class="detail" @tap="goto" :data-url="'depositorderdetail?id=' + item2.id">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">寄存人：{{item2.linkman}} {{item2.tel}}</text>
+								<text class="t2">数量：{{item2.num}}</text>
+								<text class="t2">存入时间：{{date(item2.createtime)}}</text>
+							</view>
+							<view v-if="item2.status==0" class="takeout st0" :data-orderid="item2.id">待审核</view>
+							<view v-if="item2.status==1" class="takeout" @tap="takeout" :data-orderid="item2.id"><image :src="event_rul + '/static/img/static/restaurant/deposit_takeout.png'" class="img"/>取出</view>
+							<view v-if="item2.status==2" class="takeout st2" :data-orderid="item2.id">已取走</view>
+							<view v-if="item2.status==3" class="takeout st3" :data-orderid="item2.id">未通过</view>
+						</view>
+					</block>
+				</view>
+			</block>
+			<!-- <view class="">
+				<view class="op">
+					<view @tap.stop="goto" :data-url="'orderdetail?bid='" class="btn2">寄存记录</view>
+					<view @tap.stop="goto" :data-url="'add?bid='" class="btn2">我要寄存</view>
+					<view @tap.stop="takeout" data-orderid="0" class="btn1" :style="{background:t('color1')}">一键取出</view>
+				</view>
+			</view> -->
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		takeoutshow:false,
+		keyword:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onShow:function (opt) {
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantDepositOrder/index', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    takeout: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.orderid;
+			app.confirm('确定要取出吗?', function () {
+			  app.post('ApiAdminRestaurantDepositOrder/takeout', {orderid: orderid}, function (data) {
+					if(data.status== 0){
+						app.alert(data.msg);return;
+					}
+			    app.success(data.msg);
+			    setTimeout(function () {
+			      that.getdata();
+			    }, 1000);
+			  });
+			});
+    },
+		changetab: function (st) {
+		  this.st = st;
+		  uni.pageScrollTo({
+		    scrollTop: 0,
+		    duration: 0
+		  });
+		  this.getdata(false);
+		},
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx; }
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:0 3%;margin-top:20rpx;padding:6rpx 0; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width: 94%;margin:0 3%;border-bottom: 1px #f4f4f4 solid; height:90rpx; line-height: 90rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{flex:1;display:flex;align-items:center;color:#222;font-weight:bold}
+.order-box .head .f1 image{width:56rpx;height:56rpx;margin-right:20rpx;border-radius:50%}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px 16rpx 20rpx;border-bottom: 0 #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content .pic{ width: 140rpx; height: 140rpx;}
+.order-box .content .pic .img{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:20rpx;flex:1;margin-top:6rpx;}
+.order-box .content .detail .t1{font-size:28rpx;font-weight:bold;height:40rpx;line-height:40rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .detail .t2{height: 36rpx;line-height: 36rpx;color: #999;overflow: hidden;font-size: 22rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .takeout{display:flex;align-items:center;justify-content:center;padding:0 24rpx;height:52rpx;position:absolute;top:50%;margin-top:-26rpx;right:0;border-radius:26rpx 0 0 26rpx;background:#FFE8E1;color:#222222;font-size:24rpx;font-weight:bold}
+.order-box .content .takeout .img{width:28rpx;height:28rpx;margin-right:6rpx}
+.order-box .content .takeout.st0{color:#f55}
+.order-box .content .takeout.st2{background:#F7F7F7;color:#BBBBBB}
+.order-box .content .takeout.st3{background:#F7F7F7;color:#888}
+
+.order-box .bottom{ width:100%; padding:20rpx; border-top: 0 #f4f4f4 solid; color: #555;}
+.op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding:20rpx; border-top: 0 #f4f4f4 solid; color: #555; position: fixed; bottom: 0; left: 0; background-color: #fff;}
+
+.btn1{margin-left:20rpx;width:200rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:44rpx;text-align:center;font-weight:bold}
+.btn2{margin-left:20rpx;width:200rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;font-weight:bold;border-radius:44rpx;text-align:center}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/depositorderdetail.vue b/admin/restaurant/depositorderdetail.vue
new file mode 100644
index 0000000..f07d625
--- /dev/null
+++ b/admin/restaurant/depositorderdetail.vue
@@ -0,0 +1,154 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form">
+			<view class="form-item">
+				<text class="label">寄存名称</text>
+				<text class="flex1"></text>
+				<text>{{info.name}}</text>
+			</view>
+			<view class="form-item">
+				<text class="label">寄存数量</text>
+				<text class="flex1"></text>
+				<text>{{info.num}}</text>
+			</view>
+			<view class="form-item">
+				<text class="label">寄存人</text>
+				<text class="flex1"></text>
+				<text>{{info.linkman}}</text>
+			</view>
+			<view class="form-item">
+				<text class="label">手机号</text>
+				<text class="flex1"></text>
+				<text>{{info.tel}}</text>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">寄存备注</text>
+				<text class="flex1"></text>
+				<text>{{info.message}}</text>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">状态</text>
+				<text class="flex1"></text>
+				<text>{{info.statusLabel}}</text>
+			</view>
+		</view>
+		<view class="form">
+			<view class="flex-col">
+				<text class="label" style="height:98rpx;line-height:98rpx;font-size:30rpx">寄存拍照</text>
+				<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					
+						<view class="layui-imgbox-img"><image :src="info.pic" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					
+				</view>
+				<input type="text" hidden="true" name="pic" :value="pic.join(',')" maxlength="-1"></input>
+			</view>
+		</view>
+		<button class="btn" v-if="info.status == 1" @tap="takeout" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'">取出</button>
+		<button class="btn" v-if="info.status == 0" @tap="check" data-type="access" data-operate="通过审核" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'">通过审核</button>
+		<button class="btn btn2" v-if="info.status == 0" @tap="check"  data-type="refuse" data-operate="驳回">驳回</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			pre_url:app.globalData.pre_url,
+
+			pic:[],
+			info:{}
+			
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminRestaurantDepositOrder/detail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				var data = res.detail;
+				that.info = data;
+				that.loaded();
+			  
+			});
+		},
+		takeout: function (e) {
+		  var that = this;
+		  app.confirm('确定要取出吗?', function () {
+		    app.post('ApiAdminRestaurantDepositOrder/takeout', {orderid: that.info.id}, function (data) {
+					if(data.status== 0){
+						app.alert(data.msg);return;
+					}
+		      app.success(data.msg);
+		      setTimeout(function () {
+		        that.getdata();
+		      }, 1000);
+		    });
+		  });
+		},
+		check: function(e){
+			var that = this;
+			var type = e.currentTarget.dataset.type;
+			var operate = e.currentTarget.dataset.operate;
+			app.confirm('确定要'+operate+'吗?', function () {
+			  app.post('ApiAdminRestaurantDepositOrder/check', {orderid: that.info.id, type:type}, function (data) {
+					if(data.status== 0){
+						app.alert(data.msg);return;
+					}
+			    app.success(data.msg);
+			    setTimeout(function () {
+			      that.getdata();
+			    }, 1000);
+			  });
+			});
+		}
+		
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+.container{height:100%;overflow:hidden;position: relative;}
+
+.form{ width:94%;margin:0 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;margin-top:20rpx}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;font-size:30rpx}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;text-align:right}
+.form-item .f2{flex:1;color: #000;text-align:right}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 0;flex:1;color: #000;}
+
+.btn{width:94%;margin:0 3%;margin-top:40rpx;height:90rpx;line-height:90rpx;text-align:center;background: linear-gradient(90deg, #FF7D15 0%, #FC5729 100%);color:#fff;font-size:32rpx;font-weight:bold;border-radius:10rpx}
+.btn2 {background: #FFEEEE;border: 1px solid #FF9595;border-radius: 8rpx; color: #E34242;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/product/edit.vue b/admin/restaurant/product/edit.vue
new file mode 100644
index 0000000..420d4da
--- /dev/null
+++ b/admin/restaurant/product/edit.vue
@@ -0,0 +1,854 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">菜品名称<text style="color:red"> *</text></view>
+					<view class="f2"><input type="text" name="name" :value="info.name" placeholder="请填写菜品名称" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">菜品分类<text style="color:red"> *</text></view>
+					<view class="f2" @tap="changeClistDialog"><text v-if="cids.length>0">{{cnames}}</text><text v-else style="color:#888">请选择</text><image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+				</view>
+			</view>
+			<view class="form-box">
+				<view class="form-item flex-col" style="border-bottom:0">
+					<view class="f1">菜品主图<text style="color:red"> *</text></view>
+					<view class="f2">
+						<view v-for="(item, index) in pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pic"><image style="display:block" :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pic" data-pernum="1" v-if="pic.length==0"></view>
+					</view>
+					<input type="text" hidden="true" name="pic" :value="pic.join(',')" maxlength="-1"/>
+				</view>
+				<view class="form-item flex-col">
+					<view class="f1">菜品图片</view>
+					<view class="f2" style="flex-wrap:wrap">
+						<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image style="display:block" :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" data-pernum="9" v-if="pics.length<5"></view>
+					</view>
+					<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+				</view>
+			</view>
+			<view class="form-box">
+				<view class="form-item flex-col">
+					<view class="f1">设置规格</view>
+					<view class="flex-col">
+						<view class="ggtitle">
+							<view class="t1">规格分组</view>
+							<view class="t2">规格名称</view>
+						</view>
+						<view class="ggcontent" v-for="(gg,index) in guigedata">
+							<view class="t1" @tap="delgggroupname" :data-index="index" :data-title="gg.title">{{gg.title}}<image class="edit" :src="event_rul +'/static/img/static/img/edit2.png'"/></view>
+							<view class="t2">
+								<view class="ggname" v-for="(ggitem,index2) in gg.items" @tap="delggname" :data-index="index" :data-index2="index2" :data-title="ggitem.title" :data-k="ggitem.k">{{ggitem.title}}<image class="close" :src="event_rul +'/static/img/static/img/ico-del.png'"/></view>
+								<view class="ggnameadd" @tap="addggname" :data-index="index">+</view>
+							</view>
+						</view>
+						<view class="ggcontent">
+							<view class="ggadd" @tap="addgggroupname">添加分组</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<!-- 规格列表 -->
+			<view class="form-box" v-for="(item,index) in gglist">
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">规格</view>
+					<view class="f2" style="font-weight:bold">{{item.name}}</view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">市场价（元）</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="market_price" :name="'market_price['+index+']'" :value="item.market_price" placeholder="请填写市场价" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">成本价（元）</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="cost_price" :name="'cost_price['+index+']'" :value="item.cost_price" placeholder="请填写成本价" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">销售价（元）</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="sell_price" :name="'sell_price['+index+']'" :value="item.sell_price" placeholder="请填写销售价" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">库存</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="stock" :name="'stock['+index+']'" :value="item.stock" placeholder="请填写库存" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">赠{{t('积分')}}(个)</view>
+					<view class="f2"><input type="text" @input="gglistInput" :data-index="index" data-field="givescore" :name="'givescore['+index+']'" :value="item.givescore" placeholder="请填写赠送数量" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">规格图片</view>
+					<view class="f2" style="flex-wrap:wrap;margin-top:20rpx;margin-bottom:20rpx">
+						<view class="layui-imgbox" v-if="item.pic!=''">
+							<view class="layui-imgbox-close" @tap="removeimg2" :data-index="index"><image style="display:block" :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item.pic" @tap="previewImage" :data-url="item.pic" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" v-else :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg2" :data-index="index"></view>
+					</view>
+				</view>
+			</view>
+
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">销量</view>
+					<view class="f2"><input type="text" name="sales" :value="info.sales" placeholder="请填写销量" placeholder-style="color:#888"></input></view>
+					<input type="text" hidden="true" name="oldsales" :value="info.id?info.sales:'0'">
+				</view>
+				<view class="form-item">
+					<view class="f1">每人限购</view>
+					<view class="f2"><input type="text" name="limit_pre" :value="info.limit_pre" placeholder="0表示不限购" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">序号</view>
+					<view class="f2"><input type="text" name="sort" :value="info.sort" placeholder="用于排序,越大越靠前" placeholder-style="color:#888"></input></view>
+				</view>
+			</view>
+
+			<view class="form-box">
+				<view class="form-item">
+					<text>状态<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="status" @change="bindStatusChange">
+							<label><radio value="1" :checked="info.status==1?true:false"></radio> 上架</label> 
+							<label><radio value="0" :checked="!info || info.status==0?true:false"></radio> 下架</label>
+							<label><radio value="2" :checked="info.status==2?true:false"></radio> 上架时间</label>
+							<label><radio value="3" :checked="info.status==3?true:false"></radio> 上架周期</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item flex-col" v-if="info.status==2">
+					<view class="f1">上架时间</view>
+					<view class="f2" style="line-height:30px">
+						 <picker mode="date" :value="start_time1" @change="bindStartTime1Change">
+               <view class="picker">{{start_time1}}</view>
+             </picker>
+						 <picker mode="time" :value="start_time2" @change="bindStartTime2Change">
+               <view class="picker" style="padding-left:10rpx">{{start_time2}}</view>
+             </picker>
+						 <view style="padding:0 10rpx;color:#222;font-weight:bold">到</view>
+						 <picker mode="date" :value="end_time1" @change="bindEndTime1Change">
+               <view class="picker">{{end_time1}}</view>
+             </picker>
+						 <picker mode="time" :value="end_time2" @change="bindEndTime2Change">
+               <view class="picker" style="padding-left:10rpx">{{end_time2}}</view>
+             </picker>
+					</view>
+				</view>
+				<view class="form-item flex-col" v-if="info.status==3">
+					<view class="f1">上架周期</view>
+					<view class="f2" style="line-height:30px">
+						 <picker mode="time" :value="start_hours" @change="bindStartHoursChange">
+               <view class="picker">{{start_hours}}</view>
+             </picker>
+						 <view style="padding:0 10rpx;color:#222;font-weight:bold">到</view>
+						 <picker mode="time" :value="end_hours" @change="bindEndHoursChange">
+               <view class="picker">{{end_hours}}</view>
+             </picker>
+					</view>
+				</view>
+			</view>
+			<view class="form-box">
+				<view class="form-item flex-col">
+					<text>菜品详情</text>
+					<view class="detailop"><view class="btn" @tap="detailAddtxt">+文本</view><view class="btn" @tap="detailAddpic">+图片</view></view>
+					<view>
+						<block v-for="(setData, index) in pagecontent" :key="index">
+							<view class="detaildp">
+							<view class="op"><view class="flex1"></view><view class="btn" @tap="detailMoveup" :data-index="index">上移</view><view class="btn" @tap="detailMovedown" :data-index="index">下移</view><view class="btn" @tap="detailMovedel" :data-index="index">删除</view></view>
+							<view class="detailbox">
+								<block v-if="setData.temp=='notice'">
+									<dp-notice :params="setData.params" :data="setData.data"></dp-notice>
+								</block>
+								<block v-if="setData.temp=='banner'">
+									<dp-banner :params="setData.params" :data="setData.data"></dp-banner> 
+								</block>
+								<block v-if="setData.temp=='search'">
+									<dp-search :params="setData.params" :data="setData.data"></dp-search>
+								</block>
+								<block v-if="setData.temp=='text'">
+									<dp-text :params="setData.params" :data="setData.data"></dp-text>
+								</block>
+								<block v-if="setData.temp=='title'">
+									<dp-title :params="setData.params" :data="setData.data"></dp-title>
+								</block>
+								<block v-if="setData.temp=='dhlist'">
+									<dp-dhlist :params="setData.params" :data="setData.data"></dp-dhlist>
+								</block>
+								<block v-if="setData.temp=='line'">
+									<dp-line :params="setData.params" :data="setData.data"></dp-line>
+								</block>
+								<block v-if="setData.temp=='blank'">
+									<dp-blank :params="setData.params" :data="setData.data"></dp-blank>
+								</block>
+								<block v-if="setData.temp=='menu'">
+									<dp-menu :params="setData.params" :data="setData.data"></dp-menu> 
+								</block>
+								<block v-if="setData.temp=='map'">
+									<dp-map :params="setData.params" :data="setData.data"></dp-map> 
+								</block>
+								<block v-if="setData.temp=='cube'">
+									<dp-cube :params="setData.params" :data="setData.data"></dp-cube> 
+								</block>
+								<block v-if="setData.temp=='picture'">
+									<dp-picture :params="setData.params" :data="setData.data"></dp-picture> 
+								</block>
+								<block v-if="setData.temp=='pictures'"> 
+									<dp-pictures :params="setData.params" :data="setData.data"></dp-pictures> 
+								</block>
+								<block v-if="setData.temp=='video'">
+									<dp-video :params="setData.params" :data="setData.data"></dp-video> 
+								</block>
+								<block v-if="setData.temp=='shop'">
+									<dp-shop :params="setData.params" :data="setData.data" :shopinfo="setData.shopinfo"></dp-shop> 
+								</block>
+								<block v-if="setData.temp=='product'">
+									<dp-product :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-product> 
+								</block>
+								<block v-if="setData.temp=='collage'">
+									<dp-collage :params="setData.params" :data="setData.data"></dp-collage> 
+								</block>
+								<block v-if="setData.temp=='kanjia'">
+									<dp-kanjia :params="setData.params" :data="setData.data"></dp-kanjia> 
+								</block>
+								<block v-if="setData.temp=='seckill'">
+									<dp-seckill :params="setData.params" :data="setData.data"></dp-seckill> 
+								</block>
+								<block v-if="setData.temp=='scoreshop'">
+									<dp-scoreshop :params="setData.params" :data="setData.data"></dp-scoreshop> 
+								</block>
+								<block v-if="setData.temp=='coupon'">
+									<dp-coupon :params="setData.params" :data="setData.data"></dp-coupon> 
+								</block>
+								<block v-if="setData.temp=='article'">
+									<dp-article :params="setData.params" :data="setData.data"></dp-article> 
+								</block>
+								<block v-if="setData.temp=='business'">
+									<dp-business :params="setData.params" :data="setData.data"></dp-business> 
+								</block>
+								<block v-if="setData.temp=='liveroom'">
+									<dp-liveroom :params="setData.params" :data="setData.data"></dp-liveroom> 
+								</block>
+								<block v-if="setData.temp=='button'">
+									<dp-button :params="setData.params" :data="setData.data"></dp-button> 
+								</block>
+								<block v-if="setData.temp=='hotspot'">
+									<dp-hotspot :params="setData.params" :data="setData.data"></dp-hotspot> 
+								</block>
+								<block v-if="setData.temp=='cover'">
+									<dp-cover :params="setData.params" :data="setData.data"></dp-cover> 
+								</block>
+								<block v-if="setData.temp=='richtext'">
+									<dp-richtext :params="setData.params" :data="setData.data" :content="setData.content"></dp-richtext> 
+								</block>
+								<block v-if="setData.temp=='form'">
+									<dp-form :params="setData.params" :data="setData.data" :content="setData.content"></dp-form> 
+								</block>
+								<block v-if="setData.temp=='userinfo'">
+									<dp-userinfo :params="setData.params" :data="setData.data" :content="setData.content"></dp-userinfo> 
+								</block>
+							</view>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+
+
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">提交</button>
+			<view style="height:50rpx"></view>
+		</form>
+
+		
+		<view class="popup__container" v-if="clistshow">
+			<view class="popup__overlay" @tap.stop="changeClistDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择菜品分类</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="changeClistDialog"/>
+				</view>
+				<view class="popup__content">
+					<block v-for="(item, index) in clist" :key="item.id">
+						<view class="clist-item" @tap="cidsChange" :data-id="item.id">
+							<view class="flex1">{{item.name}}</view>
+							<view class="radio" :style="inArray(item.id,cids) ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		
+		<uni-popup id="dialogInput" ref="dialogInput" type="dialog">
+			<uni-popup-dialog mode="input" title="输入规格名称" :value="ggname" placeholder="请输入规格名称" @confirm="setggname"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="dialogInput2" ref="dialogInput2" type="dialog">
+			<uni-popup-dialog mode="input" title="输入规格分组" :value="ggname" placeholder="请输入规格分组" @confirm="setgggroupname"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="dialogDetailtxt" ref="dialogDetailtxt" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请输入文本内容</text>
+				</view>
+				<view class="uni-dialog-content">
+					<textarea value="" placeholder="请输入文本内容" @input="catcheDetailtxt"></textarea>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogDetailtxtClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="dialogDetailtxtConfirm">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+				<view class="uni-popup-dialog__close" @click="dialogDetailtxtClose">
+					<span class="uni-popup-dialog__close-icon "></span>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			isload:false,
+			loading:false,
+			pre_url:app.globalData.pre_url,
+			info:{},
+			pagecontent:[],
+			aglevellist:[],
+			levellist:[],
+			clist:[],
+			cateArr:[],
+			groupArr:[],
+			freighttypeArr:['全部模板','指定模板','自动发货','在线卡密'],
+			freightindex:0,
+			freightdata:[],
+			freightIds:[],
+			guigedata:[],
+			pic:[],
+			pics:[],
+			cids:[],
+			gids:[],
+			cnames:'',
+			gnames:'',
+			clistshow:false,
+			glistshow:false,
+			ggname:'',
+			ggindex:0,
+			ggindex2:0,
+			oldgglist:[],
+			gglist:[],
+			catche_detailtxt:'',
+			start_time1:'-选择日期-',
+			start_time2:'-选择时间-',
+			end_time1:'-选择日期-',
+			end_time2:'-选择时间-',
+			start_hours:'-开始时间-',
+			end_hours:'-结束时间-',
+			gettjArr:['-1'],
+			
+			event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id ? that.opt.id : '';
+			that.loading = true;
+			app.get('ApiAdminRestaurantProduct/edit',{id:id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+				if(that.info.start_time){
+					var start_times = (that.info.start_time).split(' ');
+					that.start_time1 = start_times[0];
+					that.start_time2 = start_times[1];
+				}
+				if(that.info.end_time){
+					var end_times = (that.info.end_time).split(' ');
+					that.end_time1 = end_times[0];
+					that.end_time2 = end_times[1];
+				}
+				if(that.info.start_hours){
+					that.start_hours = that.info.start_hours;
+				}
+				if(that.info.end_hours){
+					that.end_hours = that.info.end_hours;
+				}
+				that.pagecontent = res.pagecontent;
+				that.aglevellist = res.aglevellist;
+				that.levellist = res.levellist;
+				that.oldgglist = res.newgglist;
+				that.clist = res.clist;
+				that.cateArr = res.cateArr;
+				that.groupArr = res.groupArr;
+				that.pic = res.pic;
+				that.pics = res.pics;
+				that.cids = res.cids;
+				that.gids = res.gids;
+				that.guigedata = res.guigedata;
+				that.getcnames();
+				that.getgnames();
+				that.getgglist();
+				that.loaded();
+			});
+		},
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+      formdata.cid = that.cids.join(',');
+      formdata.gid = that.gids;
+			var guigedata = that.guigedata;
+			if(guigedata.length == 0){
+				app.alert('至少需要添加一个规格');
+				return;
+			}
+			for(var i in guigedata){
+				if(guigedata[i].items.length==0){
+					app.alert('规格分组['+guigedata[i].title+']至少需要添加一个规格');
+					return;
+				}
+			}
+			
+			if(formdata.status==2){
+				formdata.start_time = that.start_time1 + ' '+that.start_time2;
+				formdata.end_time = that.end_time1 + ' '+that.end_time2;
+			}
+			if(formdata.status==3){
+				formdata.start_hours = that.start_hours;
+				formdata.end_hours = that.end_hours;
+			}
+
+      var id = that.opt.id ? that.opt.id : '';
+      app.post('ApiAdminRestaurantProduct/save', {id:id,info:formdata,guigedata:guigedata,gglist:that.gglist,pagecontent:that.pagecontent}, function (res) {
+        if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('index', 'redirect');
+          }, 1000);
+        }
+      });
+    },
+		detailAddtxt:function(){
+			this.$refs.dialogDetailtxt.open();
+		},
+		dialogDetailtxtClose:function(){
+			this.$refs.dialogDetailtxt.close();
+		},
+		catcheDetailtxt:function(e){
+			console.log(e)
+			this.catche_detailtxt = e.detail.value;
+		},
+		dialogDetailtxtConfirm:function(e){
+			var detailtxt = this.catche_detailtxt;
+			console.log(detailtxt)
+			var Mid = 'M' + new Date().getTime() + parseInt(Math.random() * 1000000);
+			var pagecontent = this.pagecontent;
+			pagecontent.push({"id":Mid,"temp":"text","params":{"content":detailtxt,"showcontent":detailtxt,"bgcolor":"#ffffff","fontsize":"14","lineheight":"20","letter_spacing":"0","bgpic":"","align":"left","color":"#000","margin_x":"0","margin_y":"0","padding_x":"5","padding_y":"5","quanxian":{"all":true},"platform":{"all":true}},"data":"","other":"","content":""});
+			this.pagecontent = pagecontent;
+			this.$refs.dialogDetailtxt.close();
+		},
+		detailAddpic:function(){
+			var that = this;
+			app.chooseImage(function(urls){
+				var Mid = 'M' + new Date().getTime() + parseInt(Math.random() * 1000000);
+				var pics = [];
+				for(var i in urls){
+					var picid = 'p' + new Date().getTime() + parseInt(Math.random() * 1000000);
+					pics.push({"id":picid,"imgurl":urls[i],"hrefurl":"","option":"0"})
+				}
+				var pagecontent = that.pagecontent;
+				pagecontent.push({"id":Mid,"temp":"picture","params":{"bgcolor":"#FFFFFF","margin_x":"0","margin_y":"0","padding_x":"0","padding_y":"0","quanxian":{"all":true},"platform":{"all":true}},"data":pics,"other":"","content":""});
+				that.pagecontent = pagecontent;
+			},9);
+		},
+		detailMoveup:function(e){
+			var index = e.currentTarget.dataset.index;
+			var pagecontent = this.pagecontent;
+			pagecontent[index] = pagecontent.splice(index-1, 1, pagecontent[index])[0];
+		},
+		detailMovedown:function(e){
+			var index = e.currentTarget.dataset.index;
+			var pagecontent = this.pagecontent;
+			pagecontent[index] = pagecontent.splice(index+1, 1, pagecontent[index])[0];
+		},
+		detailMovedel:function(e){
+			var index = e.currentTarget.dataset.index;
+			var pagecontent = this.pagecontent;
+			pagecontent.splice(index,1);
+		},
+		bindStatusChange:function(e){
+			this.info.status = e.detail.value;
+		},
+		bindStartTime1Change:function(e){
+			this.start_time1 = e.target.value
+		},
+		bindStartTime2Change:function(e){
+			this.start_time2 = e.target.value
+		},
+		bindEndTime1Change:function(e){
+			this.end_time1 = e.target.value
+		},
+		bindEndTime2Change:function(e){
+			this.end_time2 = e.target.value
+		},
+		bindStartHoursChange:function(e){
+			this.start_hours = e.target.value
+		},
+		bindEndHoursChange:function(e){
+			this.end_hours = e.target.value
+		},
+		gglistInput:function(e){
+			var index = e.currentTarget.dataset.index;
+			var field = e.currentTarget.dataset.field;
+			var gglist = this.gglist;
+			gglist[index][field] = e.detail.value;
+			this.gglist = gglist;
+			console.log(gglist)
+		},
+		getgglist:function(){
+			var oldgglist = this.oldgglist;
+			var guigedata = this.guigedata;
+			var gglist = [];
+			var len = guigedata.length;
+			var newlen = 1; 
+			var h = new Array(len); 
+			for(var i=0;i<len;i++){
+				var itemlen = guigedata[i].items.length;
+				if(itemlen<=0) { return; };
+				newlen*=itemlen;
+				h[i] = new Array(newlen);
+				for(var j=0;j<newlen;j++){
+					h[i][j] = new Array();
+				}
+			}
+			for(var m=0;m<len;m++){
+				var k = 0,kid = 0;
+				for(var j=0;j<newlen;j++){
+					h[m][j]={ k:guigedata[m].items[kid].k,title:guigedata[m].items[kid].title,id: guigedata[m].items[kid].id};
+					kid++; 
+					if(kid>guigedata[m].items.length-1) { kid=0; }
+				}
+			}
+			for(var i=0;i<newlen;i++){
+				var ks = [];
+				var titles = [];
+				for(var j=0;j<len;j++){
+					ks.push( h[j][i].k);
+					titles.push( h[j][i].title);
+				}
+				var ks2 =ks.join('_');
+				ks =ks.join(',');
+				titles =titles.join(',');
+				if(typeof(oldgglist[ks])!='undefined'){
+					var val = oldgglist[ks];
+				}else{
+					var val = { ks:ks,name:titles,market_price:'',cost_price:'',sell_price:'',stock:'1000',pic:'',givescore:'0',lvprice_data:null};
+				}
+				gglist.push(val);
+			}
+			this.gglist = gglist;
+			console.log(gglist);
+		},
+		addgggroupname:function(e){
+			this.ggname = '';
+			this.ggindex = -1;
+			this.$refs.dialogInput2.open();
+		},
+		delgggroupname:function(e){
+			var that = this;
+			var ggindex = e.currentTarget.dataset.index;
+			var title = e.currentTarget.dataset.title;
+			uni.showActionSheet({
+        itemList: [ '修改','删除'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) { //修改规格项
+							that.ggname = title;
+							that.ggindex = ggindex;
+							that.$refs.dialogInput2.open();return;
+						}else if (res.tapIndex == 1) { //删除规格项
+							var guigedata = that.guigedata;
+							var newguigedata = [];
+							for(var i in guigedata){
+								if(i != ggindex){
+									newguigedata.push(guigedata[i]);
+								}
+							}
+							that.guigedata = newguigedata;
+							console.log(newguigedata);
+							that.getgglist();
+						}
+					}
+				}
+			});
+		},
+		setgggroupname:function(done,val){
+			var guigedata = this.guigedata;
+			var ggindex = this.ggindex;
+			if(ggindex == -1){ //新增规格分组
+				ggindex = guigedata.length;
+				guigedata.push({k:ggindex,title:val,items:[]});
+				this.guigedata = guigedata;
+			}else{ //修改规格分组名称
+				guigedata[ggindex].title = val;
+				this.guigedata = guigedata;
+			}
+			this.$refs.dialogInput2.close();
+			this.getgglist();
+		},
+		addggname:function(e){
+			var ggindex = e.currentTarget.dataset.index;
+			this.ggname = '';
+			this.ggindex = ggindex;
+			this.ggindex2 = -1;
+			this.$refs.dialogInput.open();
+		},
+		delggname:function(e){
+			var that = this;
+			var ggindex = e.currentTarget.dataset.index;
+			var ggindex2 = e.currentTarget.dataset.index2;
+			var k = e.currentTarget.dataset.k;
+			var title = e.currentTarget.dataset.title;
+			uni.showActionSheet({
+        itemList: [ '修改','删除'],
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						if (res.tapIndex == 0) { //修改规格项
+							that.ggname = title;
+							that.ggindex = ggindex;
+							that.ggindex2 = ggindex2;
+							that.$refs.dialogInput.open();return;
+						}else if (res.tapIndex == 1) { //删除规格项
+							var guigedata = that.guigedata;
+							var newguigedata = [];
+							for(var i in guigedata){
+								if(i == ggindex){
+									var newitems = [];
+									var index2 = 0;
+									for(var j in guigedata[i].items){
+										if(j!=ggindex2){
+											newitems.push({k:index2,title:guigedata[i].items[j].title});
+											index2++;
+										}
+									}
+									guigedata[i].items = newitems;
+								}
+								newguigedata.push(guigedata[i]);
+							}
+							that.guigedata = newguigedata;
+							console.log(newguigedata)
+							that.getgglist();
+						}
+					}
+				}
+			});
+		},
+		setggname:function(done,val){
+			var guigedata = this.guigedata;
+			var ggindex = this.ggindex;
+			var ggindex2 = this.ggindex2;
+			if(ggindex2 == -1){ //新增规格名称
+				var items = guigedata[ggindex].items;
+				ggindex2 = items.length;
+				items.push({k:ggindex2,title:val});
+				guigedata[ggindex].items = items;
+				this.guigedata = guigedata;
+			}else{ //修改规格名称
+				guigedata[ggindex].items[ggindex2].title = val;
+				this.guigedata = guigedata;
+			}
+			this.$refs.dialogInput.close();
+			this.getgglist();
+		},
+		cidsChange:function(e){
+			var clist = this.clist;
+			var cids = this.cids;
+			var cid = e.currentTarget.dataset.id;
+			var newcids = [];
+			var ischecked = false;
+			for(var i in cids){
+				if(cids[i] != cid){
+					newcids.push(cids[i]);
+				}else{
+					ischecked = true;
+				}
+			}
+			if(ischecked==false){
+				if(newcids.length >= 5){
+					app.error('最多只能选择五个分类');return;
+				}
+				newcids.push(cid);
+			}
+			this.cids = newcids;
+			this.getcnames();
+		},
+		getcnames:function(){
+			var cateArr = this.cateArr;
+			var cids = this.cids;
+			var cnames = [];
+			for(var i in cids){
+				cnames.push(cateArr[cids[i]]);
+			}
+			this.cnames = cnames.join(',');
+		},
+		gidsChange:function(e){
+			var gids = this.gids;
+			var gid = e.currentTarget.dataset.id;
+			var newgids = [];
+			var ischecked = false;
+			for(var i in gids){
+				if(gids[i] != gid){
+					newgids.push(gids[i]);
+				}else{
+					ischecked = true;
+				}
+			}
+			if(ischecked==false){
+				newgids.push(gid);
+			}
+			this.gids = newgids;
+			this.getgnames();
+		},
+		getgnames:function(){
+			var groupArr = this.groupArr;
+			var gids = this.gids;
+			var gnames = [];
+			for(var i in gids){
+				gnames.push(groupArr[gids[i]]);
+			}
+			this.gnames = gnames.join(',');
+		},
+		changeClistDialog:function(){
+			this.clistshow = !this.clistshow
+		},
+		changeGlistDialog:function(){
+			this.glistshow = !this.glistshow
+		},
+		uploadimg:function(e){
+			var that = this;
+			var pernum = parseInt(e.currentTarget.dataset.pernum);
+			if(!pernum) pernum = 1;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+			},pernum);
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'pic'){
+				var pics = that.pic
+				pics.splice(index,1);
+				that.pic = pics;
+			}else if(field == 'pics'){
+				var pics = that.pics
+				pics.splice(index,1);
+				that.pics = pics;
+			}
+		},
+		uploadimg2:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			app.chooseImage(function(urls){
+				that.gglist[index].pic = urls[0];
+			},1);
+		},
+		removeimg2:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			that.gglist[index].pic = '';
+		},
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.form-box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.form-item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.form-item .f1{color:#222;width:200rpx;flex-shrink:0}
+.form-item .f2{display:flex;align-items:center}
+.form-box .form-item:last-child{ border:none}
+.form-box .flex-col{padding-bottom:20rpx}
+.form-item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.form-item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.form-item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.form-item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+
+.ggtitle{height:60rpx;line-height:60rpx;color:#111;font-weight:bold;font-size:26rpx;display:flex;border-bottom:1px solid #f4f4f4}
+.ggtitle .t1{width:200rpx;}
+.ggcontent{line-height:60rpx;margin-top:10rpx;color:#111;font-size:26rpx;display:flex}
+.ggcontent .t1{width:200rpx;display:flex;align-items:center;flex-shrink:0}
+.ggcontent .t1 .edit{width:40rpx;height:40rpx}
+.ggcontent .t2{display:flex;flex-wrap:wrap;align-items:center}
+.ggcontent .ggname{background:#f55;color:#fff;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:8rpx;margin-right:20rpx;margin-bottom:10rpx;font-size:24rpx;position:relative}
+.ggcontent .ggname .close{position:absolute;top:-14rpx;right:-14rpx;background:#fff;height:28rpx;width:28rpx;border-radius:14rpx}
+.ggcontent .ggnameadd{background:#ccc;font-size:36rpx;color:#fff;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:8rpx;margin-right:20rpx;margin-left:10rpx;position:relative}
+.ggcontent .ggadd{font-size:26rpx;color:#558}
+
+.ggbox{line-height:50rpx;}
+
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+
+
+.clist-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.radio .radio-img{width:100%;height:100%;display:block}
+
+.freightitem{width:100%;height:60rpx;display:flex;align-items:center;margin-left:40rpx}
+.freightitem .f1{color:#666;flex:1}
+
+.detailop{display:flex;line-height:60rpx}
+.detailop .btn{border:1px solid #ccc;margin-right:10rpx;padding:0 16rpx;color:#222;border-radius:10rpx}
+.detaildp{position:relative;line-height:50rpx}
+.detaildp .op{width:100%;display:flex;justify-content:flex-end;font-size:24rpx;height:60rpx;line-height:60rpx;margin-top:10rpx}
+.detaildp .op .btn{background:rgba(0,0,0,0.4);margin-right:10rpx;padding:0 10rpx;color:#fff}
+.detaildp .detailbox{border:2px dashed #00a0e9}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/product/index.vue b/admin/restaurant/product/index.vue
new file mode 100644
index 0000000..620e23d
--- /dev/null
+++ b/admin/restaurant/product/index.vue
@@ -0,0 +1,160 @@
+<template>
+<view>
+	<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+	<dd-tab style="top: 84rpx;" :itemdata="['全部('+countall+')','已上架('+count1+')','未上架('+count0+')']" :itemst="['all','1','0']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+	<view class="container" id="datalist">
+	<block v-for="(item, index) in datalist" :key="index">
+		<view class="order-box">
+			<view class="content" style="border-bottom:none">
+				<view>
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">剩余：{{item.stock}}<text style="color:#a88;padding-left:20rpx">已售：{{item.sales}}</text></text>
+					<view class="t3"><text class="x1">￥{{item.sell_price}}</text><text class="x2">￥{{item.market_price}}</text></view>
+				</view>
+			</view>
+			<view class="op">
+				<text style="color:red" class="flex1" v-if="!item.status || item.status==0">未上架</text>
+				<text style="color:green" class="flex1" v-else>已上架</text>
+				<text style="color:orange" class="flex1" v-if="!item.ischecked">待审核</text>
+				<view class="btn1" :style="{background:t('color1')}" @tap="setst" data-st="1" :data-id="item.id" v-if="!item.status || item.status==0">上架</view>
+				<view class="btn1" :style="{background:t('color2')}" @tap="setst" data-st="0" :data-id="item.id" v-else>下架</view>
+				<view @tap="goto" :data-url="'edit?id='+item.id" class="btn2">编辑</view>
+				<view class="btn2" @tap="todel" :data-id="item.id">删除</view>
+			</view>
+		</view>
+	</block>
+	</view>
+
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      count0: 0,
+      count1: 0,
+      countall: 0,
+      sclist: "",
+			keyword: ''
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      var that = this;
+      that.st = st;
+      that.getdata();
+    },
+    getdata: function (loadmore,keyword) {
+     if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      if(typeof keyword =='undefined') {
+      	keyword = that.keyword;
+      } else {
+      	that.keyword = keyword;
+      }
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantProduct/index', {keyword:keyword,pagenum: pagenum,st: that.st}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1){
+					that.countall = res.countall;
+					that.count0 = res.count0;
+					that.count1 = res.count1;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该菜品吗?', function () {
+        app.post('ApiAdminRestaurantProduct/del', {id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要' + (st == 0 ? '下架' : '上架') + '吗?', function () {
+        app.post('ApiAdminRestaurantProduct/setst', {st: st,id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:186rpx}
+.order-box{ width: 94%;margin:0 3%;padding:3px 3%; background: #fff; margin-bottom:12rpx;border-radius:16rpx}

+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;min-height:50rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height:36rpx;line-height:36rpx;color: #999;overflow: hidden;font-size: 24rpx;}
+.order-box .content .detail .t3{display:flex;height: 36rpx;line-height: 36rpx;color: #ff4246;}
+.order-box .content .detail .x1{ font-size:30rpx;margin-right:5px}
+.order-box .content .detail .x2{ font-size:24rpx;text-decoration:line-through;color:#999}
+
+.order-box .bottom{ width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.order-box .op{ display:flex;align-items:center;width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.btn1{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/queue.vue b/admin/restaurant/queue.vue
new file mode 100644
index 0000000..51ea381
--- /dev/null
+++ b/admin/restaurant/queue.vue
@@ -0,0 +1,250 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topbannerbg" :style="business.pic?'background:url('+business.pic+') 100%':''"></view>
+		<view class="topbannerbg2"></view>
+		<view class="topbanner">
+			<view class="left"><image class="img" :src="business.logo"/></view>
+			<view class="right">
+				<view class="f1">{{business.name}}</view>
+				<view class="f2">{{business.desc}}</view>
+			</view>
+		</view>
+		<!-- <view class="notice">
+			<view class="content">
+				<image :src="event_rul + '/static/img/static/restaurant/queue-notice.png'" class="f1"/>
+				<view class="f2">{{notice}}</view>
+			</view>
+		</view> -->
+		
+		<view class="myqueue" v-if="1">
+			<view class="title"><text class="t1">当前叫号</text><!-- <text class="t2" @tap="cancel">取消排队</text> --></view>
+			<view class="head">
+				<view class="f1" v-if="lastQueue">{{lastQueue.queue_no}}</view>
+				<view class="f2" v-else>暂无</view>
+				<view class="flex" v-if="lastQueue"><button class="btn-mini" @tap="guohao" :data-id="lastQueue.id">过号</button> <button class="btn-mini" @tap="repeat" :data-id="lastQueue.id" :data-queue_no="lastQueue.queue_no">重复</button></view>
+			</view>
+			<view class="content">
+				<view class="item" v-for="item in clist">
+					<view class="f1">
+						<view class="t1">{{item.name}}</view>
+						<view class="t2">{{item.seat_min}}-{{item.seat_max}}人</view>
+					</view>
+					<view class="f2">等待<text style="color:#FC5729;padding:0 6rpx;font-size:28rpx">{{item.waitnum}}</text>桌</view>
+					<view class="f3"><button class="btn-mini" @tap="jiaohao" :data-cid="item.id" v-if="item.waitnum">下一桌</button><button class="btn-mini" disabled="true" v-else>下一桌</button></view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- <view class="btn" v-if="!myqueue" @tap="goto" :data-url="'quhao?bid='+bid">取号排队</view>
+		<view class="log" v-if="!myqueue" @tap="goto" :data-url="'record?bid='+bid">我的排队记录</view> -->
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var intervel;
+var socketMsgQueue = [];
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		business:{},
+		clist: [],
+		myqueue:'',
+		myjustqueue:'',
+		lastQueue:{},
+		bid:'',
+		socketOpen:false,
+		token:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid || 0;
+		
+		this.getdata();
+  },
+	onShow:function() {
+		
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(intervel);
+    if(this.socketOpen) uni.closeSocket();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			app.get('ApiAdminRestaurantQueue/index', {}, function (res) {
+				if(res.status == 0) {
+					app.alert(res.msg,function(){
+						app.goback();
+					});
+				}
+				that.business = res.business
+				that.clist = res.clist;
+				that.lastQueue = res.lastQueue;
+				that.myqueue = res.myqueue;
+				that.myjustqueue = res.myjustqueue;
+				that.token = res.token
+				that.loaded();
+			
+				if(!that.socketOpen){
+					var pre_url = app.globalData.pre_url;
+					var wssurl = pre_url.replace('https://', "wss://") + '/wss';
+					uni.closeSocket();
+					uni.connectSocket({
+						url: wssurl
+					});
+					uni.onSocketOpen(function (res) {
+						console.log(res)
+						that.socketOpen = true;
+						for (var i = 0; i < socketMsgQueue.length; i++) {
+							that.sendSocketMessage(socketMsgQueue[i]);
+						}
+						socketMsgQueue = [];
+					});
+					that.sendSocketMessage({type: 'restaurant_queue',token: that.token,data:{ aid:app.globalData.aid,bid:that.bid }});
+					intervel = setInterval(function () {
+						that.sendSocketMessage({type: 'connect',token: that.token});
+					}, 25000);
+					
+					uni.onSocketMessage(function (res) {
+						try {
+							var data = JSON.parse(res.data);
+							that.receiveMessage(data);
+						} catch (e) {}
+					});
+				}
+			});
+		},
+		sendSocketMessage:function(msg) {
+			if (this.socketOpen) {
+				console.log(msg)
+				uni.sendSocketMessage({
+					data: JSON.stringify(msg)
+				});
+			} else {
+				console.log('111')
+				socketMsgQueue.push(msg);
+			}
+		},
+    receiveMessage: function (data) {
+			console.log(data);
+			if(data.type == 'restaurant_queue_add' || data.type == 'restaurant_queue_cancel' || data.type == 'restaurant_queue_callno'){
+				this.getdata();
+			}
+    },
+		jiaohao:function(e){
+			var that = this;
+			var cid = e.currentTarget.dataset.cid;
+			var queue_no = e.currentTarget.dataset.queue_no;
+			app.showLoading();
+			app.get('ApiAdminRestaurantQueue/jiaohao', {cid:cid}, function (res) {
+				app.showLoading(false);
+				if(res.status == 0) {
+					app.alert(res.msg,function(){
+						that.getdata();
+					});
+				}
+				if(res.status == 1) {
+					app.success(res.msg,function(){
+						//that.getdata();
+					});
+					that.sendSocketMessage({ type:'restaurant_queue_callno',token:that.token,data:{ call_id:res.queue.id,aid:app.globalData.aid,bid:that.bid } })
+				}
+			})
+		},
+		repeat:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			var queue_no = e.currentTarget.dataset.queue_no;
+			app.showLoading();
+			app.get('ApiAdminRestaurantQueue/jiaohao', {id:id}, function (res) {
+				app.showLoading(false);
+				if(res.status == 0) {
+					app.alert(res.msg,function(){
+						that.getdata();
+					});
+				}
+				if(res.status == 1) {
+					app.success(res.msg,function(){
+						//that.getdata();
+					});
+					that.sendSocketMessage({ type:'restaurant_queue_callno',token:that.token,data:{ call_id:res.queue.id,aid:app.globalData.aid,bid:that.bid } })
+				};
+			})
+		},
+		guohao:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			app.confirm('确定要过号吗?',function(){
+				app.showLoading();
+				app.get('ApiAdminRestaurantQueue/guohao', {id:id}, function (res) {
+					app.showLoading(false);
+					app.alert(res.msg,function(){
+						//that.getdata();
+					});
+					that.sendSocketMessage({type: 'restaurant_queue_cancel',token: that.token,data:{ aid:app.globalData.aid,bid:that.bid,queue_id:id }});
+				})
+			})
+		}
+  }
+};
+</script>
+<style>
+.container{height:100%;overflow:hidden;position: relative;}
+
+.topbannerbg{width:100%;height:280rpx;background:#fff;}
+.topbannerbg2{position:absolute;z-index:7;width:100%;height:280rpx;background:rgba(0,0,0,0.7);top:0}
+.topbanner{position:absolute;z-index:8;width:100%;display:flex;padding:60rpx;top:0;align-items:center}
+.topbanner .left{width:100rpx;height:100rpx;flex-shrink:0;margin-right:20rpx;}
+.topbanner .left .img{width:100%;height:100%;border-radius:50%}
+.topbanner .right{display:flex;flex-direction:column;padding:20rpx 0}
+.topbanner .right .f1{font-size:32rpx;font-weight:bold;color:#fff}
+.topbanner .right .f2{font-size:22rpx;color:#fff;opacity:0.7;margin-top:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;line-height:30rpx;}
+.topbanner .right .f3{width:100%;display:flex;padding-right:20rpx;margin-top:10rpx}
+.topbanner .right .f3 .t2{display:flex;align-items:center;font-size:24rpx;color:rgba(255,255,255,0.9)}
+.topbanner .right .f3 .img{width:32rpx;height:32rpx;margin-left:10rpx}
+
+.notice{display:flex;width:94%;margin:0 3%;height:120rpx;background: #fff;position:absolute;z-index:11;padding:0 50rpx;border-radius:10rpx;margin-top:-70rpx;}
+.notice .content{display:flex;width:100%;align-items:center}
+.notice .content .f1{width:40rpx;height:40rpx;margin-right:20rpx}
+.notice .content .f2{flex:1;color:#FC5729;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+ .content{display:flex;flex-direction:column;margin:20rpx 0}
+ .content .item{background:#FFF6F3;border-radius:10rpx;display:flex;align-items:center;width:100%;height:130rpx;margin-bottom:16rpx;padding:0 20rpx}
+ .content .item .f1{display:flex;flex-direction:column;width:50%;padding-left:20rpx}
+ .content .item .f1 .t1{color:#222222; font-size: 32rpx;}
+ .content .item .f1 .t2{color:#999999;}
+ .content .item .f2{display:flex;width:30%;align-items:center;}
+ .content .item .f3{display:flex;width:20%;align-items:center;font-size:24rpx;justify-content:flex-end}
+
+.myqueue{display:flex;flex-direction:column;width:94%;margin:0 3%;margin-top:20rpx;background: #fff;padding:20rpx;border-radius:10rpx;}
+.myqueue .title{display:flex;align-items:center;justify-content:space-between}
+.myqueue .title .t1{color:#161616;font-weight:bold}
+.myqueue .title .t2{color:#FC5729;font-size:24rpx}
+.myqueue .head{display:flex;flex-direction:column;align-items:center;width:100%;margin:40rpx 0; position: relative;}
+.myqueue .head .f1{font-size:64rpx;font-weight:bold;color:#564B4B}
+.myqueue .head .f2{font-size:24rpx;color:#A29E9E;margin-top:10rpx}
+.myqueue .bottom{display:flex;align-items:center;width:100%;color:#564B4B;justify-content:space-between}
+
+.btn{width:94%;margin:0 3%;margin-top:40rpx;height:90rpx;line-height:90rpx;text-align:center;background: linear-gradient(90deg, #FF7D15 0%, #FC5729 100%);color:#fff;font-size:32rpx;font-weight:bold;border-radius:10rpx}
+.log{width:100%;text-align:center;margin-top:30rpx;margin-bottom:40rpx;color:#888}
+.btn-mini {width: 200rpx;height: 60rpx;line-height: 60rpx;background: #E34242;border-radius: 8rpx; color: #fff;}
+/* .head .btn-mini { position: absolute; right: 20rpx;width: 120rpx; bottom: 40rpx;} */
+.head .btn-mini {margin: 10rpx 30rpx;}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/queueCategory.vue b/admin/restaurant/queueCategory.vue
new file mode 100644
index 0000000..0b9b19a
--- /dev/null
+++ b/admin/restaurant/queueCategory.vue
@@ -0,0 +1,128 @@
+<template>
+<view>
+	<view class="container" id="datalist">
+			<view>
+				<view class="info-item">
+					<view class="t1">队列名称</view>
+					<view class="t2">前缀</view>
+					<view class="t2">座位数</view>
+					<view class="t2">排序</view>
+				</view>
+				<view class="info-item" v-for="(item,index) in datalist">
+					<view class="t1">{{item.name}}<text v-if="item.status == 0" style="color: #DBAA83;">(隐藏)</text></view>
+					<view class="t2">{{item.code}}</view>
+					<view class="t2">{{item.seat_min}}-{{item.seat_max}}</view>
+					<view class="t2">{{item.sort}}</view>
+					<image class="t3" @tap="goto" :data-url="'queueCategoryEdit?id=' + item.id" :src="event_rul + '/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			<view style="margin-top: 40rpx;">
+				<view style="text-align: center;">排队开关：<text v-if="set.status == 1" style="color: #008000;">开启</text><text v-else style="color: #CA2428;">关闭</text></view>
+				<button class="btn1" @tap="setst" v-if="set.status == 1" data-st="0" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" >关闭</button>
+				<button class="btn1" @tap="setst" v-else data-st="1" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" >开启</button>
+			
+			</view>
+			<button class="savebtn" @tap="goto" data-url="queueCategoryEdit" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" >添加</button>
+	
+	</view>
+
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		set: {},
+		count1: 0,
+		countall: 0,
+		sclist: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onShow: function () {
+		this.getdata();
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      var that = this;
+      that.st = st;
+      that.getdata();
+    },
+    getdata: function (loadmore) {
+     if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantQueue/categoryList', {}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+				that.datalist = data;
+				that.set = res.set;
+				console.log(that.set.status)
+				if (data.length == 0) {
+					that.nodata = true;
+				}
+				that.loaded();
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要' + (st == 0 ? '关闭' : '开启') + '吗?', function () {
+        app.post('ApiAdminRestaurantQueue/setst', {st: st}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%; padding-bottom: 100rpx;}
+
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid;height:96rpx;line-height:96rpx}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 300rpx;font-weight:bold;height:auto;line-height:48rpx;}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+.savebtn{ width: 90%; height:80rpx; line-height: 80rpx; text-align:center;border-radius:8rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none;
+ position: fixed; bottom: 10rpx;}
+
+.btn1{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center; margin: 15rpx auto;}
+.btn2{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/queueCategoryEdit.vue b/admin/restaurant/queueCategoryEdit.vue
new file mode 100644
index 0000000..72c6e08
--- /dev/null
+++ b/admin/restaurant/queueCategoryEdit.vue
@@ -0,0 +1,150 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">队列名称<text style="color:red"> *</text></view>
+					<view class="f2"><input type="text" name="name" :value="info.name" placeholder="请填写名称" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">前缀</view>
+					<view class="f2"><input type="text" name="code" :value="info.code" placeholder="前缀,如A 大桌" placeholder-style="color:#888"></input></view>
+				</view><view class="form-item">
+					<view class="f1">最少座位数</view>
+					<view class="f2"><input type="text" name="seat_min" :value="info.seat_min" placeholder="" placeholder-style="color:#888"></input></view>
+				</view><view class="form-item">
+					<view class="f1">最大座位数</view>
+					<view class="f2"><input type="text" name="seat_max" :value="info.seat_max" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">等待时间</view>
+					<view class="f2"><input type="text" name="per_minute" :value="info.per_minute" placeholder="每个号等待时间(分)" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">叫号语音文字</view>
+					<view class="f2"><input type="text" name="call_text" :value="info.call_text" placeholder="排队号用'[排队号]'代替" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">排序</view>
+					<view class="f2"><input type="text" name="sort" :value="info.sort" placeholder="用于排序,越大越靠前" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<text>状态<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="status" @change="">
+							<label><radio value="1" :checked="info.status==1?true:false"></radio> 显示</label> 
+							<label><radio value="0" :checked="!info || info.status==0?true:false"></radio> 隐藏</label>
+						</radio-group>
+					</view>
+				</view>
+			</view>
+
+
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">提交</button>
+			<button class="button text-btn" @tap="todel" v-if="info.id">删除</button>
+			<view style="height:50rpx"></view>
+		</form>
+
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			isload:false,
+			loading:false,
+			pre_url:app.globalData.pre_url,
+      info:{},
+		}
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id ? that.opt.id : '';
+			that.loading = true;
+			app.get('ApiAdminRestaurantQueue/categoryEdit',{id:id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+
+				that.loaded();
+			});
+		},
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+			
+			if(formdata.name == '') {
+				app.error('请输入名称');return;
+			}
+
+      var id = that.opt.id ? that.opt.id : '';
+      app.post('ApiAdminRestaurantQueue/categorySave', {id:id,info:formdata}, function (res) {
+        if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('queueCategory', 'redirect');
+          }, 1000);
+        }
+      });
+    },
+		todel: function (e) {
+		  var that = this;
+		  var id = that.opt.id ? that.opt.id : '';
+		  app.confirm('确定要删除吗?队列下排队号也会删除', function () {
+		    app.post('ApiAdminRestaurantQueue/categoryDel', {id: id}, function (res) {
+		      if (res.status == 1) {
+		        app.success(res.msg);
+		        app.goback(true)
+		      } else {
+		        app.error(res.msg);
+		      }
+		    });
+		  });
+		},
+		bindStatusChange:function(e){
+			this.info.status = e.detail.value;
+		},
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.form-box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.form-item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.form-item .f1{color:#222;width:200rpx;flex-shrink:0}
+.form-item .f2{display:flex;align-items:center}
+.form-box .form-item:last-child{ border:none}
+.form-box .flex-col{padding-bottom:20rpx}
+.form-item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.form-item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.form-item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.form-item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+
+
+.clist-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.radio .radio-img{width:100%;height:100%;display:block}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/shoporder.vue b/admin/restaurant/shoporder.vue
new file mode 100644
index 0000000..9dc9990
--- /dev/null
+++ b/admin/restaurant/shoporder.vue
@@ -0,0 +1,164 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','已支付','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'shoporderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.paytypeid != 4" class="st1">已付款</text>
+						<text v-if="item.status==1 && item.paytypeid == 4" class="st1">线下付款</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view @tap.stop="goto" :data-url="'/restaurant/shop/product?id=' + item2.proid">
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3"><text class="x1 flex1">￥{{item2.sell_price}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text>共计{{item.procount}}个菜品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantShopOrder/index', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/shoporderEdit.vue b/admin/restaurant/shoporderEdit.vue
new file mode 100644
index 0000000..a7b0391
--- /dev/null
+++ b/admin/restaurant/shoporderEdit.vue
@@ -0,0 +1,217 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">桌台<text style="color:red"> </text></view>
+					<view class="f2">{{info.tableName}}</view>
+				</view>
+				<view class="form-item">
+					<view class="f1">订单号<text style="color:red"> </text></view>
+					<view class="f2" >{{info.ordernum}}</view>
+				</view>
+			</view>
+
+			<!-- 列表 -->
+			<view class="form-box" v-for="(item,index) in ordergoods">
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">菜品名称</view>
+					<view class="f2 product-name" style="font-weight:bold">{{item.name}}</view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">规格</view>
+					<view class="f2">{{item.ggname}}</view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">价格（元）</view>
+					<view class="f2"><input type="text" @input="ginput" :data-index="index" data-field="sell_price" :name="'sell_price['+index+']'" :value="item.sell_price" placeholder="请填写销售价" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item" style="height:80rpx;line-height:80rpx">
+					<view class="f1">数量</view>
+					<view class="f2"><input type="text" @input="ginput" :data-index="index" data-field="num" :name="'num['+index+']'" :value="item.num" placeholder="请填写数量" placeholder-style="color:#888"></input></view>
+				</view>
+				<!-- <view class="form-item">
+					<view class="f1">规格图片</view>
+					<view class="f2" style="flex-wrap:wrap;margin-top:20rpx;margin-bottom:20rpx">
+						<view class="layui-imgbox" v-if="item.pic!=''">
+							<view class="layui-imgbox-close" @tap="removeimg2" :data-index="index"><image style="display:block" :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item.pic" @tap="previewImage" :data-url="item.pic" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" v-else :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg2" :data-index="index"></view>
+					</view>
+				</view> -->
+			</view>
+
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">菜品总价</view>
+					<view class="f2"><input type="number" name="product_price" @input="input" disabled="true" data-field="product_price" :value="info.product_price" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">会员折扣</view>
+					<view class="f2"><input type="number" name="leveldk_money" @input="input" data-field="leveldk_money" :value="info.leveldk_money" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">优惠券抵扣</view>
+					<view class="f2"><input type="number" name="coupon_money" @input="input" data-field="coupon_money" :value="info.coupon_money" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">优惠券抵扣</view>
+					<view class="f2"><input type="number" name="scoredk_money" @input="input" data-field="scoredk_money" :value="info.scoredk_money" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">实付款</view>
+					<view class="f2"><input type="number" name="totalprice" @input="input" data-field="totalprice" :value="info.totalprice" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+			</view>
+	
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">提交</button>
+			<view style="height:50rpx"></view>
+		</form>
+		
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		isload:false,
+		loading:false,
+		pre_url:app.globalData.pre_url,
+		info:{},
+		ordergoods:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id ? that.opt.id : '';
+			that.loading = true;
+			app.get('ApiAdminRestaurantShopOrder/edit',{id:id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+				that.ordergoods = res.order_goods;
+				that.loaded();
+			});
+		},
+		ginput: function (e) {
+			var that = this;
+		  var value = e.detail.value;
+			var index = e.currentTarget.dataset.index;
+			var field = e.currentTarget.dataset.field;
+			var ordergoods = that.ordergoods;
+			var total = 0;
+			if(value < 0 || value == '') {
+				app.error('请输入正确的数值');return;
+			}
+			ordergoods[index][field] = value;
+			for (var i in ordergoods) {
+				total += ordergoods[i].num * ordergoods[i].sell_price;
+			}
+			
+			that.info.product_price = total;
+			var totalprice = total - that.info.leveldk_money - that.info.coupon_money - that.info.scoredk_money;
+			totalprice = parseFloat(totalprice);
+			totalprice = totalprice.toFixed(2)
+			if(totalprice < 0) {
+				app.error('总金额不能小于0');return;
+			}
+			
+			that.info.totalprice = totalprice;
+		},
+		input: function (e) {
+			var that = this;
+		  var value = e.detail.value;
+			var field = e.currentTarget.dataset.field;
+			if(value < 0 || value =='') {
+				app.error('请输入正确的金额');return;
+			}
+			that.info[field] = value;
+			
+			var totalprice = that.info.product_price - that.info.leveldk_money - that.info.coupon_money - that.info.scoredk_money;
+			totalprice = parseFloat(totalprice);
+			totalprice = totalprice.toFixed(2)
+			if(totalprice < 0) {
+				app.error('总金额不能小于0');return;
+			}
+			that.info.totalprice = totalprice;
+		},
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+			if(that.info.totalprice < 0) {
+				app.error('总金额不能小于0');return;
+			}
+      var id = that.opt.id ? that.opt.id : '';
+      app.post('ApiAdminRestaurantShopOrder/edit', {id:id,info:formdata,goods:that.ordergoods}, function (res) {
+        if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('tableWaiterDetail?id=' + that.info.tableid, 'redirect');
+          }, 1000);
+        }
+      });
+    },
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.form-box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.form-item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.form-item .f1{color:#222;width:200rpx;flex-shrink:0}
+.form-item .f2{display:flex;align-items:center;}
+.form-item .product-name {display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.form-box .form-item:last-child{ border:none}
+.form-box .flex-col{padding-bottom:20rpx}
+.form-item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.form-item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.form-item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.form-item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+
+.ggtitle{height:60rpx;line-height:60rpx;color:#111;font-weight:bold;font-size:26rpx;display:flex;border-bottom:1px solid #f4f4f4}
+.ggtitle .t1{width:200rpx;}
+.ggcontent{line-height:60rpx;margin-top:10rpx;color:#111;font-size:26rpx;display:flex}
+.ggcontent .t1{width:200rpx;display:flex;align-items:center;flex-shrink:0}
+.ggcontent .t1 .edit{width:40rpx;height:40rpx}
+.ggcontent .t2{display:flex;flex-wrap:wrap;align-items:center}
+.ggcontent .ggname{background:#f55;color:#fff;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:8rpx;margin-right:20rpx;margin-bottom:10rpx;font-size:24rpx;position:relative}
+.ggcontent .ggname .close{position:absolute;top:-14rpx;right:-14rpx;background:#fff;height:28rpx;width:28rpx;border-radius:14rpx}
+.ggcontent .ggnameadd{background:#ccc;font-size:36rpx;color:#fff;height:40rpx;line-height:40rpx;padding:0 20rpx;border-radius:8rpx;margin-right:20rpx;margin-left:10rpx;position:relative}
+.ggcontent .ggadd{font-size:26rpx;color:#558}
+
+.ggbox{line-height:50rpx;}
+
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+
+
+.clist-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.radio .radio-img{width:100%;height:100%;display:block}
+
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/shoporderdetail.vue b/admin/restaurant/shoporderdetail.vue
new file mode 100644
index 0000000..144c30d
--- /dev/null
+++ b/admin/restaurant/shoporderdetail.vue
@@ -0,0 +1,458 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<!-- <view class="t2" v-if="djs">剩余时间：{{djs}}</view> -->
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.paytypeid != 4">
+				<view class="t1">已支付</view>
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.paytypeid == 4">
+				<view class="t1">线下支付，请收款</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="info">
+				<text class="t1">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" >桌号：{{detail.tableName}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'/restaurant/shop/product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">菜品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item" v-if="detail.tea_fee > 0">
+				<text class="t1">{{shopset.tea_fee_text}}</text>
+				<text class="t2 red">+¥{{detail.tea_fee}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.discount_money > 0">
+				<text class="t1">优惠</text>
+				<text class="t2 red">-¥{{detail.discount_money}}</text>
+			</view>
+			
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1 && detail.paytypeid != 4">已付款</text>
+				<text class="t2" v-if="detail.status==1 && detail.paytypeid == 4">线下支付</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已完成</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{detail.message ? detail.message : '无'}}</text>
+			</view>
+			<view class="item" v-if="detail.field1">
+				<text class="t1">{{detail.field1data[0]}}</text>
+				<text class="t2 red">{{detail.field1data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field2">
+				<text class="t1">{{detail.field2data[0]}}</text>
+				<text class="t2 red">{{detail.field2data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field3">
+				<text class="t1">{{detail.field3data[0]}}</text>
+				<text class="t2 red">{{detail.field3data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field4">
+				<text class="t1">{{detail.field4data[0]}}</text>
+				<text class="t2 red">{{detail.field4data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field5">
+				<text class="t1">{{detail.field5data[0]}}</text>
+				<text class="t2 red">{{detail.field5data[1]}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<!-- <view v-if="detail.status==1" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="detail.status==1 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="detail.status==2 || detail.status==3" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view> -->
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+			expressdata:[],
+			express_index:0,
+			express_no:'',
+      prodata: '',
+      djs: '',
+      detail: "",
+      prolist: "",
+      shopset: "",
+      storeinfo: "",
+      lefttime: "",
+      codtxt: "",
+			peisonguser:[],
+			peisonguser2:[],
+			index2:0,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminRestaurantShopOrder/detail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'restaurant_shop',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			this.$refs.dialogExpress.open();
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'restaurant_shop',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'restaurant_shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'restaurant_shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('shoporder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'restaurant_shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'restaurant_shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'restaurant_shop',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		print: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('打印中');
+			app.post('ApiAdminOrder/print', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+				app.showLoading(false);
+				app.success(data.msg);
+			})
+		},
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/table.vue b/admin/restaurant/table.vue
new file mode 100644
index 0000000..7046a3b
--- /dev/null
+++ b/admin/restaurant/table.vue
@@ -0,0 +1,170 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<view  @confirm="searchConfirm" @input="searchChange" :value="keyword" class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<view class="search-text">输入关键词或餐桌号码</view>
+				</view>
+			</view>
+		<view class="tab-box shopping">
+			<view class="page-tab">
+				<view class="page-tab2">
+					<view :class="'item ' + (curTopIndex == -1 ? 'on' : '')" @tap="switchTopTab" :data-index="-1" :data-id="0">全部</view>
+					<block v-for="(item, index) in clist" :key="index">
+						<view :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id">{{item.name}}</view>
+					</block>
+				</view>
+			</view>
+			<view class="table-box">
+				<view class="table-item bg-green" v-for="item in contentList" @tap="goto" :data-url="'tableEdit?id='+item.id" :class="{'bg-orange': item.status == 2,'bg-blue':item.status == 3}">
+					<view class="shop-name multi-ellipsis-2">
+						{{item.name}}
+					</view>
+					<view class="color-fff line40">座位：{{item.seat}}</view>
+					<view class="color-fff" v-if="item.status == 0">空闲</view>
+					<view class="color-fff" v-if="item.status == 2">用餐</view>
+					<view class="color-fff" v-if="item.status == 3">清台</view>
+				</view>
+			</view>
+		</view>
+		</block>
+		
+		<view class="bottom-view">
+			<view class="button" @tap="goto" :data-url="'tableEdit'">添加餐桌</view>
+		</view>
+		
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				
+				pagenum:1,
+				contentList:[],
+				clist:[],
+				curCid:0,
+				curTopIndex: -1,
+				curIndex: -1,
+				keyword:'',
+				logo:'',
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.opt.bid = this.opt.bid ? this.opt.bid : 0;
+			this.logo = app.globalData.initdata.logo;
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				var nowcid = that.opt.cid;
+				if (!nowcid) nowcid = 0;
+				app.get('ApiAdminRestaurantTableCategory/index', {}, function (res) {
+					that.loading = false;
+					var data = res.datalist;
+					that.clist = data;
+					// that.curCid = data[0]['id'];
+					if (nowcid) {
+						for (var i = 0; i < data.length; i++) {
+							if (data[i]['id'] == nowcid) {
+								that.curTopIndex = i;
+								that.curCid = nowcid;
+								break;
+							}
+						}
+					}
+					that.getTabContentList();
+					that.loaded();
+				});
+			},
+			
+			switchTopTab: function (e) {
+			  var that = this;
+			  var id = e.currentTarget.dataset.id;
+			  var index = parseInt(e.currentTarget.dataset.index);
+			  this.curTopIndex = index;
+			  this.curIndex = -1;
+			  this.contentList = [];
+			  this.curCid = id;
+				this.pagenum = 1;
+			  this.getTabContentList();
+			},
+			getTabContentList:function(){
+				var that = this;
+				var pagenum = that.pagenum;
+				that.nodata = false;
+				that.nomore = false;
+				that.loading = true;
+				app.post('ApiAdminRestaurantTable/index', {cid: that.curCid,pagenum: pagenum,keyword:that.keyword}, function (res) {
+					that.loading = false;
+					var data = res.datalist;
+					if (pagenum == 1) {
+						that.contentList = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+						that.loaded();
+					}else{
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var contentList = that.contentList;
+							var newdata = contentList.concat(data);
+							that.contentList = newdata;
+						}
+					}
+				});
+			},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.getTabContentList();
+    },
+		}
+	}
+</script>
+
+<style>
+	.container { padding-bottom: 120rpx;}
+	.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;}
+	.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+	.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+	.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+.page-tab{display:flex;width:100%;overflow-x:scroll;border-bottom: 1px #f5f5f5 solid;padding:0 10rpx; background-color: #FFFFFF;}
+.page-tab2{display:flex;width:auto;min-width:100%}
+.page-tab2 .item{width:auto;padding:0 20rpx;font-size:28rpx;text-align: center; color:#333; height:90rpx; line-height:90rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.page-tab2 .on{color:#007AFF; font-size: 30rpx;}
+
+.table-box {padding: 0 ; display: flex; flex-wrap: wrap;align-items: center;}
+.table-item {background-color: #FFF; width: 220rpx;height: 220rpx; border-radius: 8rpx; align-items: center; margin: 10rpx; padding: 10rpx; text-align: center;display:flex; flex-direction: column;justify-content: center;}
+.table-item .shop-name {font-size: 34rpx;}
+.color-fff {color: #fff;}
+.bg-green { background-color: #15BC84;}
+.bg-orange { background-color: #FD943E;}
+.bg-blue {background-color: #007AFF;}
+.line40 {line-height: 40rpx;}
+
+.button{width: 100rpx;height:70rpx;line-height:70rpx;font-size:28rpx;color:#FFFFFF;  background: #007AFF;border-radius: 10rpx; text-align: center;}
+.bottom-view {position: fixed; bottom: 0; width: 100%; height: 100rpx; background-color: #fff; padding: 20rpx;display: flex; flex-direction: row-reverse; align-items: center; box-shadow: 0px -10rpx 20rpx 0rpx rgb(0 0 0 / 20%);}
+
+.button{margin:0 20rpx;width:220rpx;line-height:70rpx;color:#fff;border-radius:3px;text-align:center; background-color: #007AFF;}
+
+</style>
diff --git a/admin/restaurant/tableCategory.vue b/admin/restaurant/tableCategory.vue
new file mode 100644
index 0000000..7bb3a2d
--- /dev/null
+++ b/admin/restaurant/tableCategory.vue
@@ -0,0 +1,119 @@
+<template>
+<view>
+	<view class="container" id="datalist">
+			<view>
+				<view class="info-item" v-for="(item,index) in datalist">
+					<view class="t1">
+						<view class="info-title">{{item.name}}<text v-if="item.status == 0" style="color: #DBAA83;">(隐藏)</text></view>
+						<view class="info-item-child">
+							<view class="">服务费：{{item.service_fee}}</view>
+							<view class="">预定费：{{item.booking_fee}}</view>
+							<view class="">最低消费：{{item.limit_fee}}</view>
+							<view class="">座位数：{{item.seat}}</view>
+						</view>
+						</view>
+					<image class="t3" @tap="goto" :data-url="'tableCategoryEdit?id=' + item.id" :src="event_rul + '/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			
+			<view class="bottom-view">
+				<view class="button" @tap="goto" :data-url="'tableCategoryEdit'">添加分类</view>
+			</view>
+	
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</view>
+
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+      count0: 0,
+      count1: 0,
+      countall: 0,
+      sclist: "",
+	  event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onShow(opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      var that = this;
+      that.st = st;
+      that.getdata();
+    },
+    getdata: function (loadmore) {
+     if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var keyword = that.keyword;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantTableCategory/index', {pagenum: pagenum}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1){
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;	 padding-bottom: 100rpx;}
+
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid;line-height:96rpx}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 300rpx;height:auto;line-height:48rpx;flex:1;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+.info-title {font-weight:bold;font-size: 32rpx; line-height: 80rpx;}
+.info-item-child { display: flex; flex-wrap: wrap;}
+.info-item-child view { width: 300rpx; color: #666; }
+
+.bottom-view {position: fixed; bottom: 0; width: 100%; height: 100rpx; background-color: #fff; padding: 20rpx;display: flex; flex-direction: row-reverse; align-items: center; box-shadow: 0px -10rpx 20rpx 0rpx rgb(0 0 0 / 20%);}
+
+.button{margin:0 20rpx;width:220rpx;line-height:70rpx;color:#fff;border-radius:3px;text-align:center; background-color: #007AFF;}
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/tableCategoryEdit.vue b/admin/restaurant/tableCategoryEdit.vue
new file mode 100644
index 0000000..3495cc7
--- /dev/null
+++ b/admin/restaurant/tableCategoryEdit.vue
@@ -0,0 +1,151 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">餐桌分类名称<text style="color:red"> *</text></view>
+					<view class="f2"><input type="text" name="name" :value="info.name" placeholder="请填写餐桌分类名称" placeholder-style="color:#888"></input></view>
+				</view>
+
+				<view class="form-item">
+					<view class="f1">服务费</view>
+					<view class="f2"><input type="text" name="service_fee" :value="info.service_fee" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">最低消费</view>
+					<view class="f2"><input type="text" name="limit_fee" :value="info.limit_fee" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">预定费</view>
+					<view class="f2"><input type="text" name="booking_fee" :value="info.booking_fee" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<view class="f1">座位数</view>
+					<view class="f2"><input type="text" name="seat" :value="info.seat" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				
+			</view>
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">排序</view>
+					<view class="f2"><input type="text" name="sort" :value="info.sort" placeholder="用于排序,越大越靠前" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<text>状态<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="status" @change="">
+							<label><radio value="1" :checked="info.status==1?true:false"></radio> 显示</label> 
+							<label><radio value="0" :checked="!info || info.status==0?true:false"></radio> 隐藏</label>
+						</radio-group>
+					</view>
+				</view>
+			</view>
+
+
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">提交</button>
+			<button class="button text-btn" @tap="todel" v-if="info.id">删除</button>
+			<view style="height:50rpx"></view>
+		</form>
+
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			isload:false,
+			loading:false,
+			pre_url:app.globalData.pre_url,
+      info:{},
+		}
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id ? that.opt.id : '';
+			that.loading = true;
+			app.get('ApiAdminRestaurantTableCategory/edit',{id:id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+
+				that.loaded();
+			});
+		},
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+			if(formdata.name == '') {
+				app.error('请填写分类名');return;
+			}
+
+      var id = that.opt.id ? that.opt.id : '';
+      app.post('ApiAdminRestaurantTableCategory/save', {id:id,info:formdata}, function (res) {
+        if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('tableCategory', 'redirect');
+          }, 1000);
+        }
+      });
+    },
+		todel: function (e) {
+		  var that = this;
+		  var id = that.opt.id ? that.opt.id : '';
+		  app.confirm('确定要删除吗?分类下餐桌也会删除', function () {
+		    app.post('ApiAdminRestaurantTableCategory/del', {id: id}, function (res) {
+		      if (res.status == 1) {
+		        app.success(res.msg);
+		        app.goback(true)
+		      } else {
+		        app.error(res.msg);
+		      }
+		    });
+		  });
+		},
+		bindStatusChange:function(e){
+			this.info.status = e.detail.value;
+		},
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.form-box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.form-item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.form-item .f1{color:#222;width:200rpx;flex-shrink:0}
+.form-item .f2{display:flex;align-items:center}
+.form-box .form-item:last-child{ border:none}
+.form-box .flex-col{padding-bottom:20rpx}
+.form-item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.form-item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.form-item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.form-item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+
+
+.clist-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.radio .radio-img{width:100%;height:100%;display:block}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/tableEdit.vue b/admin/restaurant/tableEdit.vue
new file mode 100644
index 0000000..8979b46
--- /dev/null
+++ b/admin/restaurant/tableEdit.vue
@@ -0,0 +1,176 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">餐桌名称<text style="color:red"> *</text></view>
+					<view class="f2"><input type="text" name="name" :value="info.name" placeholder="请填写餐桌名称" placeholder-style="color:#888"></input></view>
+				</view>
+
+				<view class="form-item">
+					<view class="f1">分类</view>
+					<view class="f2">
+						<picker @change="pickerCate" :value="nindex" :range="clist" name="cid">
+							<view class="picker">{{clist[nindex]}}</view>
+						</picker>
+					</view>
+					
+				</view>
+				<view class="form-item">
+					<view class="f1">座位数</view>
+					<view class="f2"><input type="number" name="seat" :value="info.seat" placeholder="" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<text>支持预定<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="canbook" @change="">
+							<label><radio value="1" :checked="info.canbook==1?true:false"></radio> 支持</label> 
+							<label><radio value="0" :checked="!info || info.canbook==0?true:false"></radio> 不支持</label>
+						</radio-group>
+					</view>
+				</view>
+				
+			</view>
+			<view class="form-box">
+				<view class="form-item">
+					<view class="f1">排序</view>
+					<view class="f2"><input type="text" name="sort" :value="info.sort" placeholder="用于排序,越大越靠前" placeholder-style="color:#888"></input></view>
+				</view>
+				<view class="form-item">
+					<text>状态<text style="color:red"> *</text></text>
+					<view>
+						<radio-group class="radio-group" name="status" @change="">
+							<label><radio value="-1" :checked="info.status==-1?true:false"></radio> 禁用</label> 
+							<label><radio value="2" :checked="info.status==2?true:false"></radio> 用餐</label> 
+							<label><radio value="1" :checked="info.status==1?true:false"></radio> 预定</label> 
+							<label><radio value="0" :checked="!info || info.status==0?true:false"></radio> 空闲</label>
+						</radio-group>
+					</view>
+				</view>
+			</view>
+
+
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">提交</button>
+			<button class="button text-btn" @tap="todel" v-if="info.id">删除</button>
+			<view style="height:50rpx"></view>
+		</form>
+
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			isload:false,
+			loading:false,
+			pre_url:app.globalData.pre_url,
+      info:{},
+			clist:[],
+			clistArr:[],
+			nindex:0
+		}
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id ? that.opt.id : '';
+			that.loading = true;
+			app.get('ApiAdminRestaurantTable/edit',{id:id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+				app.get('ApiAdminRestaurantTableCategory/index',{id:id,status:1}, function (res) {
+						for(var i in res.datalist){ 
+							if(that.info.cid == res.datalist[i]['id']) {
+								that.nindex = i;
+							}
+							that.clist.push(res.datalist[i]['name'])
+							that.clistArr.push(res.datalist[i])
+						}
+				});
+
+				that.loaded();
+			});
+		},
+    subform: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+			if(formdata.name == '') {
+				app.error('请填写名称');return;
+			}
+			formdata.cid = that.clistArr[formdata.cid]['id']
+
+      var id = that.opt.id ? that.opt.id : '';
+      app.post('ApiAdminRestaurantTable/save', {id:id,info:formdata}, function (res) {
+        if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('table', 'redirect');
+          }, 1000);
+        }
+      });
+    },
+		todel: function (e) {
+		  var that = this;
+		  var id = that.opt.id ? that.opt.id : '';
+		  app.confirm('确定要删除吗?', function () {
+		    app.post('ApiAdminRestaurantTable/del', {id: id}, function (res) {
+		      if (res.status == 1) {
+		        app.success(res.msg);
+		        app.goback(true)
+		      } else {
+		        app.error(res.msg);
+		      }
+		    });
+		  });
+		},
+		
+		pickerCate: function (e) {
+		  this.nindex = e.detail.value;
+		},
+		bindStatusChange:function(e){
+			this.info.status = e.detail.value;
+		},
+  }
+};
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.form-box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.form-item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.form-item .f1{color:#222;width:200rpx;flex-shrink:0}
+.form-item .f2{display:flex;align-items:center}
+.form-box .form-item:last-child{ border:none}
+.form-box .flex-col{padding-bottom:20rpx}
+.form-item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.form-item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.form-item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.form-item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none; }
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:5;color:#999;font-size:32rpx;background:#fff;border-radius:50%}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+
+
+.clist-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.radio .radio-img{width:100%;height:100%;display:block}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/tableWaiter.vue b/admin/restaurant/tableWaiter.vue
new file mode 100644
index 0000000..420d512
--- /dev/null
+++ b/admin/restaurant/tableWaiter.vue
@@ -0,0 +1,194 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<view  @confirm="searchConfirm" @input="searchChange" :value="keyword" class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<view class="search-text">输入关键词或餐桌号码</view>
+				</view>
+			</view>
+		<view class="tab-box shopping">
+			<view class="page-tab">
+				<view class="page-tab2">
+					<view :class="'item ' + (curTopIndex == -1 ? 'on' : '')" @tap="switchTopTab" :data-index="-1" :data-id="0">全部</view>
+					<block v-for="(item, index) in clist" :key="index">
+						<view :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id">{{item.name}}</view>
+					</block>
+				</view>
+			</view>
+			<view class="table-box">
+				<view class="table-item bg-green" v-for="item in contentList" @tap="selectTable" :class="{'bg-orange': item.status == 2,'bg-blue':item.status == 3}" :data-id="item.id" :data-tablename="item.name">
+					<view class="shop-name multi-ellipsis-2">
+						{{item.name}}
+					</view>
+					<view class="color-fff line40">座位：{{item.seat}}</view>
+					<view class="color-fff" v-if="item.status == 0">空闲</view>
+					<view class="color-fff" v-if="item.status == 2">用餐</view>
+					<view class="color-fff" v-if="item.status == 3">清台</view>
+				</view>
+			</view>
+		</view>
+		</block>
+		
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				
+				pagenum:1,
+				contentList:[],
+				clist:[],
+				curCid:0,
+				curTopIndex: -1,
+				curIndex: -1,
+				keyword:'',
+				logo:'',
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.opt.bid = this.opt.bid ? this.opt.bid : 0;
+			this.logo = app.globalData.initdata.logo;
+			this.getdata();
+		},
+		onShow: function (opt) {
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				var nowcid = that.opt.cid;
+				if (!nowcid) nowcid = 0;
+				app.get('ApiAdminRestaurantTableCategory/index', {}, function (res) {
+					that.loading = false;
+					var data = res.datalist;
+					that.clist = data;
+					// that.curCid = data[0]['id'];
+					if (nowcid) {
+						for (var i = 0; i < data.length; i++) {
+							if (data[i]['id'] == nowcid) {
+								that.curTopIndex = i;
+								that.curCid = nowcid;
+								break;
+							}
+						}
+					}
+					that.getTabContentList();
+					that.loaded();
+				});
+			},
+			
+			switchTopTab: function (e) {
+			  var that = this;
+			  var id = e.currentTarget.dataset.id;
+			  var index = parseInt(e.currentTarget.dataset.index);
+			  this.curTopIndex = index;
+			  this.curIndex = -1;
+			  this.contentList = [];
+			  this.curCid = id;
+				this.pagenum = 1;
+			  this.getTabContentList();
+			},
+			getTabContentList:function(){
+				var that = this;
+				var pagenum = that.pagenum;
+				var postdata = {cid: that.curCid,pagenum: pagenum,keyword:that.keyword,tableStatus:''};
+				if(that.opt.operate == 'change') {
+					postdata.tableStatus = 0;
+				}
+				that.nodata = false;
+				that.nomore = false;
+				that.loading = true;
+				app.post('ApiAdminRestaurantTable/index', postdata , function (res) {
+					that.loading = false;
+					var data = res.datalist;
+					if (pagenum == 1) {
+						that.contentList = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+						that.loaded();
+					}else{
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var contentList = that.contentList;
+							var newdata = contentList.concat(data);
+							that.contentList = newdata;
+						}
+					}
+				});
+			},
+			searchChange: function (e) {
+				this.keyword = e.detail.value;
+			},
+			searchConfirm: function (e) {
+				var that = this;
+				var keyword = e.detail.value;
+				that.getTabContentList();
+			},
+			selectTable: function(e) {
+				var that = this;
+				var id = e.currentTarget.dataset.id;
+				var newname = e.currentTarget.dataset.tablename;
+				if(that.opt.operate == 'change') {
+					app.confirm('您确定更换为' + newname + '吗？', function(){
+						that.loading = true;
+						app.post('ApiAdminRestaurantTable/change', {origin: that.opt.origin,new: id}, function (res) {
+							that.loading = false;
+							if(res.status == 0){
+								app.alert(res.msg);return;
+							}
+							if(res.status == 1){
+								app.goto('tableWaiterDetail?id='+id)
+							}
+						});
+					})
+				} else {
+					app.goto('tableWaiterDetail?id='+id)
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;}
+	.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+	.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+	.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+.page-tab{display:flex;width:100%;overflow-x:scroll;border-bottom: 1px #f5f5f5 solid;padding:0 10rpx; background-color: #FFFFFF;}
+.page-tab2{display:flex;width:auto;min-width:100%}
+.page-tab2 .item{width:auto;padding:0 20rpx;font-size:28rpx;text-align: center; color:#333; height:90rpx; line-height:90rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.page-tab2 .on{color:#007AFF; font-size: 30rpx;}
+
+.table-box {padding: 0 ; display: flex; flex-wrap: wrap;align-items: center;}
+.table-item {background-color: #FFF; width: 220rpx;height: 220rpx; border-radius: 8rpx; align-items: center; margin: 10rpx; padding: 10rpx; text-align: center;display:flex; flex-direction: column;justify-content: center;}
+.table-item .shop-name {font-size: 34rpx;}
+.color-fff {color: #fff;}
+.bg-green { background-color: #15BC84;}
+.bg-orange { background-color: #FD943E;}
+.bg-blue {background-color: #007AFF;}
+.line40 {line-height: 40rpx;}
+
+.button{width: 100rpx;height:70rpx;line-height:70rpx;font-size:28rpx;color:#FFFFFF;  background: #007AFF;border-radius: 10rpx; text-align: center;}
+.bottom-view {position: fixed; bottom: 0; width: 100%; height: 100rpx; background-color: #fff; padding: 20rpx;display: flex; flex-direction: row-reverse; align-items: center; box-shadow: 0px -10rpx 20rpx 0rpx rgb(0 0 0 / 20%);}
+
+.button{margin:0 20rpx;width:220rpx;line-height:70rpx;color:#fff;border-radius:3px;text-align:center; background-color: #007AFF;}
+
+</style>
diff --git a/admin/restaurant/tableWaiterDetail.vue b/admin/restaurant/tableWaiterDetail.vue
new file mode 100644
index 0000000..dbfb045
--- /dev/null
+++ b/admin/restaurant/tableWaiterDetail.vue
@@ -0,0 +1,295 @@
+<template><!-- todo 展示关联的预约信息 -->
+	<view class="container">
+		<block v-if="isload">
+			<view class="head-bg">
+				<h1 class="text-center">{{detail.name}}</h1>
+				<h2 class="title flex" v-if="detail.status == 2 && order.status != 3"><image :src="event_rul +'/static/img/static/restaurant/fork.png'" class="image"></image><view>用餐中</view></h2>
+				<h2 class="title flex" v-else-if="detail.status == 0"><image :src="event_rul +'/static/img/static/restaurant/fork.png'" class="image"></image><view>空闲中</view></h2>
+				<h2 class="title flex" v-else-if="order.status == 3"><image :src="event_rul +'/static/img/static/restaurant/fork.png'" class="image"></image><view>已结算，待清台</view></h2>
+				<h2 class="title flex" v-else-if="detail.status == 3"><image :src="event_rul +'/static/img/static/restaurant/fork.png'" class="image"></image><view>清台中</view></h2>
+				<!-- <view class="text-center mt20">请在预定时间20分钟内到店。</view> -->
+			</view>
+			<form @submit="subform">
+			<view class="card-view" v-if="detail.status == 0">
+				<view class="card-wrap">
+					<view class="card-title">餐桌信息</view>
+					<view class="info-item">
+						<view class="t1">桌台</view>
+						<view class="t2">{{detail.name}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">座位数</view>
+						<view class="t2">{{detail.seat}}</view>
+					</view>
+				</view>
+				<view class="card-wrap">
+					<view class="card-title ">用餐信息</view>
+					<view class="info-item">
+						<view class="t1">人数</view>
+						<view class="t2">
+							<picker @change="numChange" :value="nindex" :range="numArr" name="renshu">
+								<view class="picker">{{numArr[nindex]}}</view>
+							</picker>
+						</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">顾客姓名</view>
+						<view class="t2"><input type="text" data-name="linkman" name="linkman" placeholder="选填"></view>
+					</view>
+					<view class="info-item">
+						<view class="t1">手机号</view>
+						<view class="t2"><input type="number" data-name="tel" name="tel" placeholder="选填"></view>
+					</view>
+					<view class="info-item info-textarea">
+						<view class=" remark" >
+							<view class="t1">备注</view>
+							<view class="">
+							<textarea data-name="message" name="message" placeholder="如您有其他需求请填写" placeholder-style="color:#ABABABFF"></textarea>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="btn-view button-sp-area">
+				<!-- <button type="default" class="btn-default">取消</button> -->
+				<button type="primary" form-type="submit" v-if="detail.status == 0">开始用餐</button>
+			</view>
+			</form>
+			
+			<view class="card-view" v-if="detail.status == 2">
+				<view class="card-wrap">
+					<view class="content">
+						 <view class="item" v-if="orderGoodsSum == 0 && order.status != 3" @tap="goto" :data-url="'/restaurant/shop/index?type=admin&tableId='+detail.id + '&bid=' + detail.bid">
+								<image :src="event_rul +'/static/img/static/restaurant/dish.png'" class="image"/>
+								<text class="t3">点餐</text>
+						 </view>
+						 <view class="item" v-if="orderGoodsSum > 0 && order.status != 3" @tap="goto" :data-url="'/restaurant/shop/index?type=admin&tableId='+detail.id + '&bid=' + detail.bid">
+								<image :src="event_rul +'/static/img/static/restaurant/dish.png'" class="image"/>
+								<text class="t3">加菜</text>
+						 </view>
+						 <view class="item" v-if="orderGoodsSum > 0 && order.status != 3" @tap="goto" :data-url="'tableWaiterPay?id='+detail.id">
+								<image :src="event_rul +'/static/img/static/restaurant/money.png'" class="image"/>
+								<text class="t3">结算</text>
+						 </view>
+						 <view class="item" v-if="order.status != 3" @tap="goto" :data-url="'tableWaiter?operate=change&origin='+detail.id">
+								<image :src="event_rul +'/static/img/static/restaurant/change.png'" class="image"/>
+								<text class="t3">换桌</text>
+						 </view>
+						 <view class="item" @tap="clean">
+								<image :src="event_rul +'/static/img/static/restaurant/clean.png'" class="image"/>
+								<text class="t3">清台</text>
+						 </view>
+					</view>
+				</view>
+				<view class="card-wrap">
+					<view class="card-title">餐桌信息</view>
+					<view class="info-item">
+						<view class="t1">桌台</view>
+						<view class="t2">{{detail.name}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">人数/座位数</view>
+						<view class="t2">{{order.renshu}}/{{detail.seat}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">客户信息</view>
+						<view class="t2">{{order.linkman}} {{order.tel}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">时间</view>
+						<view class="t2">{{date(order.createtime)}}</view>
+					</view>
+					<view class="info-item info-textarea">
+						<view class="t1">备注信息</view>
+						<view class="t2">{{order.message}}</view>
+					</view>
+				</view>
+				
+				<view class="card-wrap card-goods" v-if="orderGoods.length > 0">
+					<view class="flex">
+						<view class="card-title">已点菜品({{orderGoodsSum}})</view>
+						<view class="flex1"></view>
+						<view class="btn-text" @tap="goto" :data-url="'shoporderEdit?id='+order.id">修改菜品</view>
+					</view>
+					<view class="info-item" v-for="(item,index) in orderGoods">
+						<view class="t1">{{item.name}}[{{item.ggname}}]</view>
+						<view class="t2">x{{item.num}}</view>
+						<view class="t3">￥{{item.real_totalprice}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">合计</view>
+						<view class="t2">x{{orderGoodsSum}}</view>
+						<view class="t3">￥{{order.totalprice}}</view>
+					</view>
+				</view>
+				<view class="card-wrap" v-else>
+					<view class="info-item">
+						<view class="t1">还未点菜</view>
+					</view>
+				</view>
+			</view>
+			<view class="btn-view button-sp-area mb">
+				<button type="primary" @tap="cleanOver" v-if="detail.status == 3">清理完成</button>
+			</view>
+			<view class="btn-view button-sp-area mb">
+				<button type="default" class="btn-default" @tap="goto" data-url="tableWaiter">返回餐桌列表</button>
+			</view>
+			
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				
+				detail:{},
+				order:{},
+				orderGoods:[],
+				business:{},
+				nindex:0,
+				orderGoodsSum:0,
+				numArr:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20],
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+		},
+		onShow:function(){
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				app.get('ApiAdminRestaurantTable/detail', {id:that.opt.id}, function (res) {
+					that.loading = false;
+					if(res.status == 0){
+						app.alert(res.msg,function(){
+							app.goback();
+						});return;
+					}
+					that.detail = res.info;
+					that.order = res.order;
+					that.orderGoods = res.order_goods;
+					that.orderGoodsSum = res.order_goods_sum;
+					
+					that.loaded();
+					//
+				});
+			},
+			subform: function (e) {
+				var that = this;
+				var info = e.detail.value;
+				info.tableId = that.opt.id;
+				info.renshu = that.numArr[that.nindex]
+				// console.log(info);return;
+				if (info.renshu <= 0) {
+					app.error('请选择人数');
+					return false;
+				}
+				if (info.tableId == 0) {
+					app.error('请选择餐桌');
+					return false;
+				}
+				that.loading = true;
+				app.post("ApiAdminRestaurantShopOrder/add", {info: info}, function (res) {
+					that.loading = false;
+					if(res.status == 0) {
+						app.alert(res.msg);return;
+					}
+					app.alert(res.msg,function(){
+						that.getdata();
+					});
+			  });
+			},
+			clean: function() {
+				var that = this;
+				var tableId = that.opt.id;
+				that.loading = true;
+				app.post("ApiAdminRestaurantTable/clean", {tableId: tableId}, function (res) {
+					that.loading = false;
+					if(res.status == 0) {
+						app.alert(res.msg);return;
+					}
+					app.alert(res.msg,function(){
+						that.getdata();
+					});
+				});
+			},
+			cleanOver: function() {
+				var that = this;
+				var tableId = that.opt.id;
+				that.loading = true;
+				app.post("ApiAdminRestaurantTable/cleanOver", {tableId: tableId}, function (res) {
+					that.loading = false;
+					if(res.status == 0) {
+						app.alert(res.msg);return;
+					}
+					app.alert(res.msg,function(){
+						that.getdata();
+					});
+				});
+			},
+			
+			numChange: function (e) {
+			  this.nindex = e.detail.value;
+			},
+		}
+	}
+</script>
+
+<style>
+	.btn-text { color: #007AFF;}
+	.mb {margin-bottom: 10rpx;}
+	.text-center {text-align: center;}
+	.container {padding-bottom: 20rpx;}
+	.head-bg {width: 100%;height: 320rpx; background: linear-gradient(-90deg, #FFCF34 0%, #FFD75F 100%); color: #333;}
+	.head-bg h1 { line-height: 100rpx; font-size: 42rpx;}
+	.head-bg .title { align-items: center; width: 94%; margin: 0 auto;}
+	.head-bg .image{ width:80rpx;height:80rpx; margin: 0 10rpx;}
+	
+	.card-wrap { background-color: #FFFFFF; border-radius: 10rpx;padding: 30rpx; margin: 30rpx auto 0; width: 94%;}
+	.card-view{ margin-top: -140rpx; }
+	.card-wrap .card-title {font-size: 34rpx; color: #333; font-weight: bold;}
+
+	
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff; /* border-bottom: 1px #f3f3f3 solid; */height:70rpx;line-height:70rpx}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx;color: #8B8B8B;line-height:30rpx; height: auto;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+form .info-item .t1 {color: #333; font-size: 30rpx;}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden; padding-right: 10rpx;}
+.info-item .t3{ }
+.card-goods .t1 {width: 70%;}
+.card-goods .t2 {width: 8%; padding-right: 2%;}
+.card-goods .t3 {width: 20%;}
+.info-textarea { height: auto; line-height: 40rpx;}
+.info-textarea textarea {height: 80rpx;}
+.info-textarea .t2{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp: unset;overflow: scroll;}
+
+.btn-view { display: flex;justify-content: space-between; margin: 30rpx 0;}
+.btn-view button{ width: 90%; border-radius: 10rpx;background: linear-gradient(-90deg, #F7D156 0%, #F9D873 100%); color: #333; font-weight: bold;}
+.btn-view .btn-default {background: #FFFFFF;}
+
+.content{ display:flex;width:100%;padding:0 0 10rpx 0;align-items:center;font-size:24rpx}
+.content .item{padding:10rpx 0;flex:1;display:flex;flex-direction:column;align-items:center;position:relative}
+.content .item .image{ width:80rpx;height:80rpx}
+.content .item .iconfont{font-size:60rpx}
+.content .item .t3{ padding-top:3px}
+.content .item .t2{display:flex;align-items:center;justify-content:center;background: red;color: #fff;border-radius:50%;padding: 0 10rpx;position: absolute;top: 0px;right:20rpx;width:35rpx;height:35rpx;text-align:center;}
+
+
+</style>
diff --git a/admin/restaurant/tableWaiterPay.vue b/admin/restaurant/tableWaiterPay.vue
new file mode 100644
index 0000000..c250cdd
--- /dev/null
+++ b/admin/restaurant/tableWaiterPay.vue
@@ -0,0 +1,182 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<view class="head-bg">
+				<h1 class="text-center">{{detail.name}}</h1>
+			</view>
+			<form @submit="subform">
+			<view class="card-view" v-if="detail.status == 2">
+				<view class="card-wrap">
+					<view class="card-title">餐桌信息</view>
+					<view class="info-item">
+						<view class="t1">桌台</view>
+						<view class="t2">{{detail.name}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">人数/座位数</view>
+						<view class="t2">{{order.renshu}}/{{detail.seat}}</view>
+					</view>
+				</view>
+				<view class="card-wrap card-goods" v-if="orderGoods.length > 0">
+					<view class="card-title">已点菜品({{orderGoodsSum}})</view>
+					<view class="info-item" v-for="(item,index) in orderGoods">
+						<view class="t1">{{item.name}}[{{item.ggname}}]</view>
+						<view class="t2">x{{item.num}}</view>
+						<view class="t3">￥{{item.real_totalprice}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">合计</view>
+						<view class="t2">x{{orderGoodsSum}}</view>
+						<view class="t3">￥{{order.totalprice}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">优惠</view>
+						<view class="t2" style="text-align: right;"><input type="number" @input="input" data-name="discount" name="discount" placeholder="输入优惠金额"></view>
+					</view>
+					<view class="info-item">
+						<view class="t1">实付</view>
+						<view class="t2">￥{{real_totalprice}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="btn-view button-sp-area">
+				<!-- <button type="default" class="btn-default">取消</button> -->
+				<button type="primary" form-type="submit" v-if="detail.status == 2">确认用户已支付</button>
+			</view>
+			</form>
+				
+			<view class="btn-view button-sp-area mb">
+				<button type="default" class="btn-default" @tap="goto" data-url="tableWaiter">返回餐桌列表</button>
+			</view>
+			
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				
+				detail:{},
+				order:{},
+				orderGoods:[],
+				business:{},
+				nindex:0,
+				orderGoodsSum:0,
+				real_totalprice:0,
+				numArr:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20],
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				app.get('ApiAdminRestaurantTable/detail', {id:that.opt.id}, function (res) {
+					that.loading = false;
+					if(res.status == 0){
+						app.alert(res.msg,function(){
+							app.goback();
+						});return;
+					}
+					that.detail = res.info;
+					that.order = res.order;
+					that.orderGoods = res.order_goods;
+					that.orderGoodsSum = res.order_goods_sum;
+					that.real_totalprice = res.order.totalprice;
+					
+					that.loaded();
+					//
+				});
+			},
+			subform: function (e) {
+				var that = this;
+				var info = e.detail.value;
+				info.tableId = that.opt.id;
+				app.showLoading('提交中');
+				app.confirm('请确认用户已完成支付', function(){
+					app.post("ApiAdminRestaurantShopOrder/pay", {info: info}, function (res) {
+						app.showLoading(false);
+						if(res.status == 0) {
+							app.alert(res.msg);
+						}
+						if(res.status == 1) {
+							app.alert(res.msg,function(){
+								app.goback();
+							});
+						}
+					});
+				})
+			},
+			
+			input: function (e) {
+			  var discount = e.detail.value;
+				if(discount < 0) {
+					app.error('请输入正确的金额');return;
+				}
+				if(discount > this.real_totalprice) {
+					app.error('优惠金额不能大于订单金额');return;
+				}
+				if(discount == '') {
+					discount = 0;
+					this.real_totalprice = this.order.totalprice;
+				}
+				this.real_totalprice = this.real_totalprice - discount;
+			},
+		}
+	}
+</script>
+
+<style>
+	.mb {margin-bottom: 10rpx;}
+	.text-center {text-align: center;}
+	.container {padding-bottom: 20rpx;}
+	.head-bg {width: 100%;height: 320rpx; background: linear-gradient(-90deg, #FFCF34 0%, #FFD75F 100%); color: #333;}
+	.head-bg h1 { line-height: 100rpx; font-size: 42rpx;}
+	.head-bg .title { align-items: center; width: 94%; margin: 0 auto;}
+	.head-bg .image{ width:80rpx;height:80rpx; margin: 0 10rpx;}
+	
+	.card-wrap { background-color: #FFFFFF; border-radius: 10rpx;padding: 30rpx; margin: 30rpx auto 0; width: 94%;}
+	.card-view{ margin-top: -140rpx; }
+	.card-wrap .card-title {font-size: 34rpx; color: #333; font-weight: bold;}
+
+	
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff; /* border-bottom: 1px #f3f3f3 solid; */height:70rpx;line-height:70rpx}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx;color: #8B8B8B;line-height:70rpx;line-height:70rpx}
+form .info-item .t1 {color: #333; font-size: 30rpx;}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden; padding-right: 10rpx;}
+.info-item .t3{ }
+.card-goods .t1 {width: 70%;}
+.card-goods .t2 {width: 8%; padding-right: 2%;}
+.card-goods .t3 {width: 20%;}
+.info-textarea { height: auto; line-height: 40rpx;}
+.info-textarea textarea {height: 80rpx;}
+.info-textarea .t2{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp: unset;overflow: scroll;}
+
+.btn-view { display: flex;justify-content: space-between; margin: 30rpx 0;}
+.btn-view button{ width: 90%; border-radius: 10rpx;background: linear-gradient(-90deg, #F7D156 0%, #F9D873 100%); color: #333; font-weight: bold;}
+.btn-default {background-color: #FFFFFF;}
+
+.content{ display:flex;width:100%;padding:0 0 10rpx 0;align-items:center;font-size:24rpx}
+.content .item{padding:10rpx 0;flex:1;display:flex;flex-direction:column;align-items:center;position:relative}
+.content .item .image{ width:80rpx;height:80rpx}
+.content .item .iconfont{font-size:60rpx}
+.content .item .t3{ padding-top:3px}
+.content .item .t2{display:flex;align-items:center;justify-content:center;background: red;color: #fff;border-radius:50%;padding: 0 10rpx;position: absolute;top: 0px;right:20rpx;width:35rpx;height:35rpx;text-align:center;}
+
+
+</style>
diff --git a/admin/restaurant/takeawayorder.vue b/admin/restaurant/takeawayorder.vue
new file mode 100644
index 0000000..bf89779
--- /dev/null
+++ b/admin/restaurant/takeawayorder.vue
@@ -0,0 +1,165 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+		<dd-tab style="top: 84rpx;" :itemdata="['全部','待付款','待发货','待收货','已完成','退款']" :itemst="['all','0','1','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'takeawayorderdetail?id=' + item.id">
+					<view class="head">
+						<view>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.freight_type!=1" class="st1">待发货</text>
+						<text v-if="item.status==1 && item.freight_type==1" class="st1">待提货</text>
+						<text v-if="item.status==2" class="st2">待收货</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view @tap.stop="goto" :data-url="'/restaurant/shop/product?id=' + item2.proid">
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3"><text class="x1 flex1">￥{{item2.sell_price}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text>共计{{item.procount}}个菜品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="bottom flex-y-center">
+						<image :src="item.member.headimg" style="width:40rpx;height:40rpx;border-radius:50%;margin-right:10rpx"/><text style="font-weight:bold;color:#333;margin-right:8rpx">{{item.member.nickname}}</text>(ID:{{item.mid}})
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+      codtxt: "",
+			keyword:""
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore,keyword) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminRestaurantTakeawayOrder/index', {keyword:keyword,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:174rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:16rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/admin/restaurant/takeawayorderdetail.vue b/admin/restaurant/takeawayorderdetail.vue
new file mode 100644
index 0000000..cbe538c
--- /dev/null
+++ b/admin/restaurant/takeawayorderdetail.vue
@@ -0,0 +1,611 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择'+codtxt : '已成功付款'}}</view>
+				<view class="t2">请尽快接单</view>
+			</view>
+			<view class="f1" v-if="detail.status==12">
+				<view class="t1">{{detail.paytype=='货到付款' ? '已选择'+codtxt : '已成功付款'}}</view>
+				<view class="t2" v-if="detail.freight_type!=1">请尽快发货</view>
+				<view class="t2" v-if="detail.freight_type==1">待提货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单已发货</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul + '/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view>
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">下单人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+		</view>
+		<view class="orderinfo" v-if="detail.remark">
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2">{{detail.remark}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.jianmoney > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{detail.message ? detail.message : '无'}}</text>
+			</view>
+			<view class="item" v-if="detail.field1">
+				<text class="t1">{{detail.field1data[0]}}</text>
+				<text class="t2 red">{{detail.field1data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field2">
+				<text class="t1">{{detail.field2data[0]}}</text>
+				<text class="t2 red">{{detail.field2data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field3">
+				<text class="t1">{{detail.field3data[0]}}</text>
+				<text class="t2 red">{{detail.field3data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field4">
+				<text class="t1">{{detail.field4data[0]}}</text>
+				<text class="t2 red">{{detail.field4data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field5">
+				<text class="t1">{{detail.field5data[0]}}</text>
+				<text class="t2 red">{{detail.field5data[1]}}</text>
+			</view>
+			<view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:400rpx;height:400rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+			</view>
+		</view>
+
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundnopass" :data-id="detail.id">退款驳回</view>
+			<view v-if="detail.refund_status==1" class="btn2" @tap="refundpass" :data-id="detail.id">退款通过</view>
+			<view v-if="detail.status==0" class="btn2" @tap="closeOrder" :data-id="detail.id">关闭订单</view>
+			<view v-if="detail.status==0 && detail.bid==0" class="btn2" @tap="ispay" :data-id="detail.id">改为已支付</view>
+			<view v-if="detail.status==1" class="btn2" @tap="refund" :data-id="detail.id">拒单退款</view>
+			<view v-if="detail.status==1" class="btn2" @tap="jiedan" :data-id="detail.id">接单</view>
+			<view v-if="detail.status==12" class="btn2" @tap="fahuo" :data-id="detail.id">发货</view>
+			<view v-if="detail.status==12 && detail.canpeisong" class="btn2" @tap="peisong" :data-id="detail.id">配送</view>
+			<view v-if="detail.status==2 || detail.status==3" class="btn2" @tap="goto" :data-url="'/pages/order/logistics?express_com='+detail.express_com+'&express_no='+detail.express_no">查物流</view>
+			<view v-if="detail.status==4" class="btn2" @tap="delOrder" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="setremark" :data-id="detail.id">设置备注</view>
+			<view class="btn2" @tap="print" :data-id="detail.id">打印小票</view>
+		</view>
+		<uni-popup id="dialogSetremark" ref="dialogSetremark" type="dialog">
+			<uni-popup-dialog mode="input" title="设置备注" :value="detail.remark" placeholder="请输入备注" @confirm="setremarkconfirm"></uni-popup-dialog>
+		</uni-popup>
+
+		<uni-popup id="dialogExpress" ref="dialogExpress" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">发货</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx">
+							<text style="font-size:28rpx;color:#000">快递公司：</text>
+							<picker @change="expresschange" :value="express_index" :range="expressdata" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+								<view class="picker">{{expressdata[express_index]}}</view>
+							</picker>
+						</view> 
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 20rpx;">
+							<view style="font-size:28rpx;color:#555">快递单号：</view>
+							<input type="text" placeholder="请输入快递单号" @input="setexpressno" style="border: 1px #eee solid;padding: 10rpx;height:70rpx;border-radius:4px;flex:1;font-size:28rpx;"/>
+						</view>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogExpressClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmfahuo">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup id="dialogPeisong" ref="dialogPeisong" type="dialog">
+			<view class="uni-popup-dialog">
+				<view class="uni-dialog-title">
+					<text class="uni-dialog-title-text">请选择配送员</text>
+				</view>
+				<view class="uni-dialog-content">
+					<view>
+						<picker @change="peisongChange" :value="index2" :range="peisonguser2" style="font-size:28rpx;border: 1px #eee solid;padding:10rpx;height:70rpx;border-radius:4px;flex:1">
+							<view class="picker">{{peisonguser2[index2]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="uni-dialog-button-group">
+					<view class="uni-dialog-button" @click="dialogPeisongClose">
+						<text class="uni-dialog-button-text">取消</text>
+					</view>
+					<view class="uni-dialog-button uni-border-left" @click="confirmPeisong">
+						<text class="uni-dialog-button-text uni-button-color">确定</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		expressdata:[],
+		express_index:0,
+		express_no:'',
+		prodata: '',
+		djs: '',
+		detail: "",
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		peisonguser:[],
+		peisonguser2:[],
+		index2:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminRestaurantTakeawayOrder/detail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.expressdata = res.expressdata;
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+		setremark:function(){
+			this.$refs.dialogSetremark.open();
+		},
+		setremarkconfirm: function (done, remark) {
+			this.$refs.dialogSetremark.close();
+			var that = this
+			app.post('ApiAdminOrder/setremark', { type:'restaurant_takeaway',orderid: that.detail.id,content:remark }, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+    },
+		fahuo:function(){
+			this.$refs.dialogExpress.open();
+		},
+		dialogExpressClose:function(){
+			this.$refs.dialogExpress.close();
+		},
+		expresschange:function(e){
+			this.express_index = e.detail.value;
+		},
+		setexpressno:function(e){
+			this.express_no = e.detail.value;
+		},
+		confirmfahuo:function(){
+			this.$refs.dialogExpress.close();
+			var that = this
+			var express_com = this.expressdata[this.express_index]
+			app.post('ApiAdminOrder/sendExpress', { type:'restaurant_takeaway',orderid: that.detail.id,express_no:that.express_no,express_com:express_com}, function (res) {
+				app.success(res.msg);
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		},
+		ispay:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要改为已支付吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/ispay', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		jiedan:function(e){
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要接单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/jiedan', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refund: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要拒单并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/judan', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		delOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('删除中');
+			app.confirm('确定要删除该订单吗?', function () {
+				app.post('ApiAdminOrder/delOrder', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						app.goto('takeawayorder');
+					}, 1000)
+				});
+			})
+		},
+		closeOrder: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/closeOrder', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function (){
+						that.getdata();
+					}, 1000)
+				});
+			})
+		},
+		refundnopass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要驳回退款申请吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundnopass', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		refundpass: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.confirm('确定要审核通过并退款吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiAdminOrder/refundpass', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+					app.showLoading(false);
+					app.success(data.msg);
+					setTimeout(function () {
+						that.getdata();
+					}, 1000)
+				})
+			});
+		},
+		print: function (e) {
+			var that = this;
+			var orderid = e.currentTarget.dataset.id
+			app.showLoading('打印中');
+			app.post('ApiAdminOrder/print', { type:'restaurant_takeaway',orderid: orderid }, function (data) {
+				app.showLoading(false);
+				app.success(data.msg);
+			})
+		},
+		peisong:function(){
+			var that = this;
+			that.loading = true;
+			app.post('ApiAdminOrder/getpeisonguser',{type:'restaurant_takeaway_order',orderid:that.detail.id},function(res){
+				that.loading = false;
+				var peisonguser = res.peisonguser
+				var paidantype = res.paidantype
+				var psfee = res.psfee
+				var ticheng = res.ticheng
+
+				var peisonguser2 = [];
+				for(var i in peisonguser){
+					peisonguser2.push(peisonguser[i].title);
+				}
+				that.peisonguser = res.peisonguser;
+				that.peisonguser2 = peisonguser2;
+				if(paidantype==1){
+					that.$refs.dialogPeisong.open();
+				}else{
+					if(that.detail.bid == 0){
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，配送员提成￥'+ticheng+'，确定要配送员配送吗？';
+					}else{
+						var tips='选择配送员配送，订单将发布到抢单大厅由配送员抢单，需扣除配送费￥'+psfee+'，确定要配送员配送吗？';
+					}
+					if(paidantype == 2){
+						var psid = '-1';
+					}else{
+						var psid = '0';
+					}
+					app.confirm(tips,function(){
+						app.post('ApiAdminOrder/peisong', { type:'restaurant_takeaway_order',orderid: that.detail.id,psid:psid}, function (res) {
+							app.success(res.msg);
+							setTimeout(function () {
+								that.getdata();
+							}, 1000)
+						})
+					})
+				}
+			})
+		},
+		dialogPeisongClose:function(){
+			this.$refs.dialogPeisong.close();
+		},
+		peisongChange:function(e){
+			this.index2 = e.detail.value;
+		},
+		confirmPeisong:function(){
+			var that = this
+			var psid = this.peisonguser[this.index2].id
+			app.post('ApiAdminOrder/peisong', { type:'restaurant_takeaway_order',orderid: that.detail.id,psid:psid}, function (res) {
+				app.success(res.msg);
+				that.$refs.dialogPeisong.close();
+				setTimeout(function () {
+					that.getdata();
+				}, 1000)
+			})
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.picker{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.uni-popup-dialog {width: 300px;border-radius: 5px;background-color: #fff;}
+.uni-dialog-title {display: flex;flex-direction: row;justify-content: center;padding-top: 15px;padding-bottom: 5px;}
+.uni-dialog-title-text {font-size: 16px;font-weight: 500;}
+.uni-dialog-content {display: flex;flex-direction: row;justify-content: center;align-items: center;padding: 5px 15px 15px 15px;}
+.uni-dialog-content-text {font-size: 14px;color: #6e6e6e;}
+.uni-dialog-button-group {display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
+.uni-dialog-button {display: flex;flex: 1;flex-direction: row;justify-content: center;align-items: center;height: 45px;}
+.uni-border-left {border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;}
+.uni-dialog-button-text {font-size: 14px;}
+.uni-button-color {color: #007aff;}
+</style>
\ No newline at end of file
diff --git a/admin/shortvideo/myupload.vue b/admin/shortvideo/myupload.vue
new file mode 100644
index 0000000..8ea250b
--- /dev/null
+++ b/admin/shortvideo/myupload.vue
@@ -0,0 +1,164 @@
+<template>
+<view>
+	<dd-search :isfixed="true" @getdata="getdata"></dd-search>
+	<view class="container" id="datalist">
+	<block v-for="(item, index) in datalist" :key="index">
+		<view class="order-box">
+			<view class="content" style="border-bottom:none">
+				<view @tap="goto" :data-url="'/activity/shortvideo/detail?id=' + item.id">
+					<image :src="item.coverimg"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">播放量 {{item.view_num}}<text style="color:#a88;padding-left:20rpx">点赞数 {{item.zan_num}}</text></text>
+					<text class="t3" v-if="item.status==2">驳回原因：{{item.reason}}</text>
+				</view>
+			</view>
+			<view class="op">
+				<text style="color:orange" class="flex1" v-if="item.status==0">待审核</text>
+				<text style="color:red" class="flex1" v-if="item.status==2">未通过</text>
+				<text style="color:green" class="flex1" v-if="item.status==1">已通过</text>
+				<view class="btn2" @tap="todel" :data-id="item.id">删除</view>
+			</view>
+		</view>
+	</block>
+	</view>
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+	
+	<view style="height:140rpx"></view>
+	<view class="btn-add" :class="menuindex>-1?'tabbarbot':'notabbarbot3'" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" data-url="uploadvideo"><image :src="event_rul + '/static/img/static/img/add.png'" style="width:28rpx;height:28rpx;margin-right:6rpx"/>发布短视频</view>
+
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		count0: 0,
+		count1: 0,
+		countall: 0,
+		sclist: "",
+		keyword: '',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      var that = this;
+      that.st = st;
+      that.getdata();
+    },
+    getdata: function (loadmore,keyword) {
+     if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			if(typeof keyword =='undefined') {
+				keyword = that.keyword;
+			} else {
+				that.keyword = keyword;
+			}
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiAdminShortvideo/myupload', {keyword:keyword,pagenum: pagenum,st: that.st}, function (res) {
+        that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1){
+					that.countall = res.countall;
+					that.count0 = res.count0;
+					that.count1 = res.count1;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该短视频吗?', function () {
+        app.post('ApiAdminShortvideo/myuploaddel', {id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    },
+    setst: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var st = e.currentTarget.dataset.st;
+      app.confirm('确定要' + (st == 0 ? '下架' : '上架') + '吗?', function () {
+        app.post('ApiAdminShortvideo/setst', {st: st,id: id}, function (res) {
+          if (res.status == 1) {
+            app.success(res.msg);
+            that.getdata();
+          } else {
+            app.error(res.msg);
+          }
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:106rpx}
+.order-box{ width: 94%;margin:0 3%;padding:3px 3%; background: #fff; margin-bottom:12rpx;border-radius:16rpx}
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;min-height:50rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height:36rpx;line-height:36rpx;color: #999;overflow: hidden;font-size: 24rpx;}
+.order-box .content .detail .t3{display:flex;height: 36rpx;line-height: 36rpx;color: #ff4246;font-size: 24rpx;}
+.order-box .content .detail .x1{ font-size:30rpx;margin-right:5px}
+.order-box .content .detail .x2{ font-size:24rpx;text-decoration:line-through;color:#999}
+
+.order-box .bottom{ width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.order-box .op{ display:flex;align-items:center;width:100%; padding:10rpx 0px; border-top: 1px #e5e5e5 solid; color: #555;}
+.btn1{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:120rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:0;margin-bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/admin/shortvideo/uploadvideo.vue b/admin/shortvideo/uploadvideo.vue
new file mode 100644
index 0000000..ea88f51
--- /dev/null
+++ b/admin/shortvideo/uploadvideo.vue
@@ -0,0 +1,244 @@
+<template>
+<view>
+	<block v-if="isload">
+		<form @submit="formsubmit">
+		<view class="st_box">
+			<view class="st_form">
+				<view v-if="cateArr">
+					<picker @change="cateChange" :value="cindex" :range="cateArr" style="height:80rpx;line-height:80rpx;border-bottom:1px solid #EEEEEE;font-size:18px">
+						<view class="picker">{{cindex==-1? '请选择类型' : cateArr[cindex]}}</view>
+					</picker>
+				</view>
+				<!-- <view v-if="cateArr">
+					<picker @change="cateChange" :value="cindex" :range="cateArr" style="height:80rpx;line-height:80rpx;border-bottom:1px solid #EEEEEE;font-size:18px">
+						<view class="picker">{{cindex==-1? '请选择曝光标签' : cateArr[cindex]}}</view>
+					</picker>
+				</view> -->
+				<view><input placeholder="输入标题" name="title" maxlength="-1"/></view>
+				<view><textarea placeholder="输入简介" name="content" maxlength="-1" style="height:100rpx;"></textarea></view>
+				<view class="uploadbtn_ziti1">上传封面</view>
+				<view class="flex" style="flex-wrap:wrap;padding-top:20rpx;">
+					<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" @tap="xuanzhuan" :data-index="index" data-field="pics"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" v-if="pics.length<1">
+						
+					</view>
+					
+				</view>
+				
+				<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+			
+			<view class="uploadbtn_ziti2">上传短视频</view>
+				<view class="flex-y-center" style="width:100%;padding:20rpx 0;margin-top:20rpx;">
+					<image :src="event_rul + '/static/img/static/img/uploadvideo.png'" style="width:200rpx;height:200rpx;background:#eee;" @tap="uploadvideo"></image><text v-if="video" style="padding-left:20rpx;color:#333">已上传短视频</text></view>
+				<input type="text" hidden="true" name="video" :value="video" maxlength="-1"></input>
+			</view>
+		</view>
+		<view class="st_button flex-y-center">
+			<button form-type="submit" :style="{background:t('color1')}">发表</button>
+		</view>
+		<view style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="myupload">我的发表记录<image :src="event_rul + '/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+		<view style="width:100%;height:60rpx"></view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		datalist: [],
+		content_pic: [],
+		pagenum: 1,
+		cateArr: [],
+		cindex: -1,
+		pics:[],
+		video: '',
+		sysset:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminShortvideo/uploadvideo', {}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				that.clist = res.clist;
+				that.sysset = res.sysset;
+				var clist = res.clist;
+				if (clist.length > 0) {
+					var cateArr = [];
+					for (var i in clist) {
+						if (that.opt && that.opt.cid == clist[i].id) {
+							that.cindex = i;
+						}
+						cateArr.push(clist[i].name);
+					}
+				} else {
+					cateArr = false;
+				}
+				that.cateArr = cateArr
+				that.loaded();
+			});
+		},
+    cateChange: function (e) {
+      this.cindex = e.detail.value;
+    },
+    formsubmit: function (e) {
+      var that = this;
+      console.log(e);
+      var clist = that.clist;
+      if (clist.length > 0) {
+        if (that.cindex == -1) {
+          app.error('请选择分类');
+          return false;
+        }
+        var cid = clist[that.cindex].id;
+      } else {
+        var cid = 0;
+      }
+      var formdata = e.detail.value;
+      var title = formdata.title;
+			if (title == '') {
+        app.error('请输入标题');
+        return false;
+      }
+      var content = formdata.content;
+      var pics = formdata.pics;
+      var video = formdata.video;
+      if (pics == '') {
+        app.error('请上传封面');
+        return false;
+      }
+      if (video == '') {
+        app.error('请上传短视频');
+        return false;
+      }
+      app.post('ApiAdminShortvideo/uploadvideo', {title:title,cid: cid,pics: pics,content: content,video: video}, function (res) {
+        app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+    uploadvideo: function () {
+      var that = this;
+      var maxDuration = that.sysset.upload_maxduration;
+			if(!maxDuration) maxDuration = 999999;
+      var maxsize = that.sysset.upload_maxsize;
+			if(!maxsize) maxsize = 999999999999999;
+      uni.chooseVideo({
+        sourceType: ['album', 'camera'],
+        maxDuration: maxDuration,
+        success: function (res) {
+          var tempFilePath = res.tempFilePath;
+					var size = res.size;
+					if(size > maxsize * 1024){
+						app.alert('短视频文件过大');return;
+					}
+					//console.log(size);return;
+          app.showLoading('上传中');
+          uni.uploadFile({
+            url: app.globalData.baseurl + 'ApiImageupload/uploadImg/aid/' + app.globalData.aid + '/platform/' + app.globalData.platform + '/session_id/' + app.globalData.session_id,
+            filePath: tempFilePath,
+            name: 'file',
+            success: function (res) {
+              app.showLoading(false);
+              var data = JSON.parse(res.data);
+
+              if (data.status == 1) {
+                that.video = data.url;
+              } else {
+                app.alert(data.msg);
+              }
+            },
+            fail: function (res) {
+              app.showLoading(false);
+              app.alert(res.errMsg);
+            }
+          });
+        },
+        fail: function (res) {
+          console.log(res); //alert(res.errMsg);
+        }
+      });
+    },
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+page{background:#f7f7f7}
+.st_box{ padding:0rpx 0 }
+.st_button{ display: flex; justify-content: space-between;padding:24rpx 24rpx 10rpx 24rpx;}
+.st_button button{background: #1658c6;border-radius:6rpx;border: none;padding:0 20rpx;color: #fff;font-size:36rpx;text-align: center;width:100%;display: flex;height:100rpx;justify-content: center;align-items: center;}
+
+.st_form{ padding: 24rpx;background: #ffffff;margin: 10px;border-radius: 15px;}
+.st_form input{ width: 100%;height: 120rpx; border: none;border-bottom:1px solid #EEEEEE;}
+.st_form input::-webkit-input-placeholder { /* WebKit browsers */ color:    #BBBBBB; font-size: 24rpx}
+.st_form textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;border-bottom:1px solid #EEEEEE;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+.uploadbtn_ziti1{height:30rpx; line-height: 30rpx;font-size:30rpx; margin-top: 20rpx;}
+.uploadbtn_ziti2{height:30rpx; line-height: 30rpx;font-size:30rpx; padding-top: 20rpx; margin-top: 20rpx;border-top:1px solid #EEEEEE;}
+</style>
\ No newline at end of file
diff --git a/admin/workorder/add.vue b/admin/workorder/add.vue
new file mode 100644
index 0000000..75058ba
--- /dev/null
+++ b/admin/workorder/add.vue
@@ -0,0 +1,358 @@
+<template>
+<view class="container">
+
+			<form  @submit="editorFormSubmit" :data-formcontent="formdata.content" :data-formid="cateid"  >
+			<view class="content">
+				<view class="form-item flex">
+					<view class="title"> 工单类型:</view>
+					<view class="inputbox flex">
+						<picker class="picker" mode="selector" @change="BindPickerChange" :range="cate" :value="index" range-key="name">
+								<view class="uni-input">{{catename}}</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#ccc;font-weight:normal"></text>
+					</view>
+				</view>
+
+				<view class="form-item" v-for="(item,idx) in formdata.content" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input"  :placeholder="item.val2" :data-formidx="'form'+idx" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" :data-formidx="'form'+idx" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="radio-group" :name="'form'+idx" :data-formidx="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="checkbox-group" :data-formidx="'form'+idx">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector"  :name="'form'+idx"  :range="item.val2" @change="editorBindPickerChange" :data-idx="idx" :data-formidx="'form'+idx">		
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="formdata" :data-idx="idx"  :data-formidx="'form'+idx" >
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="formdata" :data-idx="idx" :data-formidx="'form'+idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+					</block>
+					
+					<block v-if="item.key=='region'">
+						<uni-data-picker :localdata="items"  popup-title="请选择省市区" :placeholder="formdata['form'+idx] || '请选择省市区'" @change="onchange" :data-formidx="'form'+idx"></uni-data-picker>
+						<!-- <picker class="picker" mode="region" :name="'form'+idx" value="" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view> 
+							<view v-else>请选择省市区</view>
+						</picker> -->
+						<input type="text" style="display:none" :name="'form'+idx" :value="regiondata ? regiondata : formdata['form'+idx]"/>
+					</block>
+					
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata['content_pics'+idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata['content_pic'+idx]" v-for="(item, index) in editorFormdata['content_pic'+idx]" :key="index">
+								<view class="form-imgbox-close" @tap="removeimg" :data-pindex="index" :data-field="'content_pic'+idx"  :data-idx="idx"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+								<view class="form-imgbox-img"><image  :src="item" @click="previewImage" :data-url="item" mode="widthFix" /></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-field="'content_pic'+idx"  :data-idx="idx" :data-formidx="'form'+idx"></view>
+						</view>
+					</block>
+				</view>
+				<view class="dp-form-item" v-if="formdata.payset==1">
+					<text class="label">支付金额：</text>
+					<input type="text" class="input" name="price" :value='formdata.price' v-if="formdata.priceedit==1" @input="setfield" data-formidx="price"/>
+					<text v-if="formdata.priceedit==0">{{formdata.price}}</text>
+					<text style="padding-left:10rpx">元</text>
+				</view>
+			</view>
+			<view style="height: 100rpx;"></view>
+			<view class="btnbox">	<button class="dp-form-btn" form-type="submit"  :data-formcontent="formdata.content"  :data-formid="cateid"  :style="{background:t('color1')}" >提交</button>	</view>
+		</form>
+	<!--悬浮按钮-->
+		<view class="myworkorder"  @tap="goto" data-url="formlog">我的工单</view>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+			isload: false,
+			cate:[],
+			nomore: false,
+			nodata:false,
+			index:0,
+			catename:'请选择',
+			pre_url:app.globalData.pre_url,
+			editorFormdata:[],
+			formdata:{},
+			formvaldata:{},
+			regiondata:'',
+			cateid:'',
+
+			event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.cateid = this.opt.cateid || '';
+		this.getdata();
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		onchange(e) {
+		  const value = e.detail.value
+			//console.log(value[0].text + ',' + value[1].text + ',' + value[2].text)
+			this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text;
+		},
+    getdata: function () {
+			var that = this;
+			app.get('ApiIndex/getCustom',{}, function (customs) {
+				var url = app.globalData.pre_url+'/static/area.json';
+				uni.request({
+					url: app.globalData.pre_url+'/static/area.json',
+					data: {},
+					method: 'GET',
+					header: { 'content-type': 'application/json' },
+					success: function(res2) {
+						that.items = res2.data
+					}
+				});
+			});
+      app.post('ApiAdminWorkorder/getcategory', { }, function (res) {
+					that.isload = true;
+					var cate = res.data;
+					that.cate = cate;
+					if(that.cateid){
+								that.BindPickerChanges();
+					}
+			})
+			
+    },
+		BindPickerChanges:function(){
+			var that = this;
+			var index = that.index;
+			that.catename = that.cate[index].name
+			var cateid = that.cate[index].id
+			that.cateid = cateid
+			that.formdata = that.cate[index]
+		},
+		BindPickerChange:function(e){
+			var that = this;
+			var index = e.detail.value;
+			that.index = index
+			that.catename = that.cate[index].name
+			var cateid = that.cate[index].id
+			that.cateid = cateid
+			/*app.post('ApiWorkorder/getform', {id:cateid }, function (res) {
+					that.isload = true;
+					that.loading=false
+					if(res && res.status == 1 && res.data){
+						var formcontent = res.data;
+						that.formdata = formcontent
+						console.log(formdata);
+					}
+			})*/
+			that.formdata = that.cate[index]
+		
+		},
+		editorChooseImage: function (e) {
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var field = e.currentTarget.dataset.field;
+			var pics = that.editorFormdata[field]
+			//console.log(field);
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				that.editorFormdata[field] = pics;
+				that.editorFormdata['content_pics'+idx] = that.editorFormdata[field].join(',');
+				that.formvaldata[field] = pics;
+				//that.editorFormdata = editorFormdata
+				that.getdata();
+			},5)
+		},
+		removeimg:function(e){
+			var that = this;
+			var idx = e.currentTarget.dataset.idx;
+			var pindex= e.currentTarget.dataset.pindex
+			var field= e.currentTarget.dataset.field
+			var pics = that.editorFormdata[field]
+			that.editorFormdata[field].splice(pindex,1)
+			that.editorFormdata['content_pics'+idx] = that.editorFormdata[field].join(',');
+			//console.log(that.editorFormdata[field]);
+			that.getdata();
+		},
+		editorBindPickerChange:function(e){
+			var that=this
+			var idx = e.currentTarget.dataset.idx;
+			var val = e.detail.value;
+			var editorFormdata = that.editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			this.editorFormdata = editorFormdata
+			//console.log(this.editorFormdata);
+		
+			this.test = Math.random();			
+			var field = e.currentTarget.dataset.formidx;
+			this.formvaldata[field] = val;
+			that.getdata();
+		},
+		editorFormSubmit:function(e){
+			console.log(e);
+			var that = this;
+			if(this.submitDisabled) return ;
+			//console.log('form发生了submit事件，携带数据为：', e.detail.value)
+			//var subdata = e.detail.value;
+			var formcontent = e.currentTarget.dataset.formcontent;
+			var formid = e.currentTarget.dataset.formid;
+			console.log(formid);
+			var formdataval = e.detail.value;
+			//console.log(formdataval);
+			var newformdata = {};
+			for (var i = 0; i < formcontent.length;i++){
+				//console.log(subdata['form' + i]);
+				if (formcontent[i].key == 'region') {
+						formdataval['form' + i] = that.regiondata;
+				}
+				if (formcontent[i].val3 == 1 && (formdataval['form' + i] === '' || formdataval['form' + i] === null || formdataval['form' + i] === undefined || formdataval['form' + i].length==0)){
+						app.alert(formcontent[i].val1+' 必填');return;
+				}
+				if (formcontent[i].key =='switch'){
+						if (subdata['form' + i]==false){
+								subdata['form' + i] = '否'
+						}else{
+								subdata['form' + i] = '是'
+						}
+				}
+			
+
+				if (formcontent[i].key == 'input' && formcontent[i].val4 && formdataval['form' + i]!==''){
+					if(formcontent[i].val4 == '2'){ //手机号
+						if (!/^1[3456789]\d{9}$/.test(formdataval['form' + i])) {
+							app.alert(formcontent[i].val1+' 格式错误');return;
+						}
+					}
+					if(formcontent[i].val4 == '3'){ //身份证号
+						if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(formdataval['form' + i])) {
+							app.alert(formcontent[i].val1+' 格式错误');return;
+						}
+					}
+					if(formcontent[i].val4 == '4'){ //邮箱
+						if (!/^(.+)@(.+)$/.test(formdataval['form' + i])) {
+							app.alert(formcontent[i].val1+' 格式错误');return;
+						}
+					}
+				}
+				newformdata['form'+i] = formdataval['form' + i];
+			}
+			that.submitDisabled = true;
+			app.showLoading('提交中');
+		
+			var pages = getCurrentPages(); //获取加载的页面
+			var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+			var thispath = '/' + (currentPage.route ? currentPage.route : currentPage.__route__); //当前页面url 
+			var opts = currentPage.$vm.opt;
+		
+			app.post('ApiAdminWorkorder/formsubmit', {formid:formid,formdata:newformdata,price:that.cate[that.index].price},function(data){
+				app.showLoading(false);
+				if (data.status == 0) {
+					setTimeout(function () {
+						app.error(data.msg);
+					}, 100)
+					that.submitDisabled = false;
+					return;
+				}else if(data.status == 1) { //无需付款
+					that.subscribeMessage(function () {
+						setTimeout(function () {
+							app.success(data.msg);
+						}, 100)
+						setTimeout(function () {
+							app.goto('formlog');
+						}, 1000)
+					});
+					return;
+				}else if(data.status==2){
+					that.subscribeMessage(function () {
+						setTimeout(function () {
+							app.goto('/pages/pay/pay?id='+data.payorderid+'&tourl='+tourl);
+						}, 100);
+					});
+				}
+				that.submitDisabled = false;
+			});
+		},
+  }
+}
+</script>
+<style>
+	.content{ width:90%;margin-top:40rpx; background: #fff; margin: 40rpx; border-radius:10rpx; padding: 20rpx;}
+	.dp-form-btn{color:#fff;width:90%;height:66rpx;display:flex;align-items:center;justify-content:center;border-radius:50rpx}
+	.btnbox{ background: #fff; position: fixed; bottom: 0; width: 100%; padding: 20rpx 0;}
+	.form-item .inputbox{ align-items: center; color: #ccc}
+	.content .item .uni-input{ color: #ccc}
+	
+	.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between;border-bottom: 1px #ededed solid;}
+	.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+	.form-item .radio{transform:scale(.7);}
+	.form-item .checkbox{transform:scale(.7);}
+	.form-item .input {height: 70rpx;padding-left: 10rpx;text-align: right;flex:1;border:1px solid #eee;padding:0 8rpx;border-radius:2px;}
+	.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+	.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+	.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+	.form-item .radio2{display:flex;align-items:center;}
+	.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+	.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+	.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+	.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+	.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+	.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+	
+	
+	.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+	.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+	.form-imgbox-close image{width:100%;height:100%}
+	.form-imgbox-img{display: block;width:160rpx;height:160rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+	.form-imgbox-img>image{max-width:100%;}
+	.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+	.form-uploadbtn{position:relative;height:200rpx;width:200rpx}
+	
+	.myworkorder{ background: #fff; width: 150rpx; height: 70rpx; position: fixed; right: 0%; bottom: 20%; display: flex; align-items: center; border-top-left-radius: 30rpx; border-bottom-left-radius: 30rpx; justify-content: center;}
+</style>
\ No newline at end of file
diff --git a/admin/workorder/formdetail.vue b/admin/workorder/formdetail.vue
new file mode 100644
index 0000000..a3cadbc
--- /dev/null
+++ b/admin/workorder/formdetail.vue
@@ -0,0 +1,286 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">提交人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">标题</text>
+				<text class="t2">{{detail.title}}</text>
+			</view>
+			<view v-for="(item, index) in formcontent" :key="index" class="item">
+				<text class="t1">{{item.val1}}</text>
+				<text class="t2" v-if="item.key!='upload'">{{detail['form'+index]}}</text>
+				<view class="t2" style="display: flex; justify-content: flex-end;" v-else>
+					<view v-for="(sub, indx) in detail['form'+index]">
+						<image :src="sub" style="width:50px; margin-left: 10rpx;" mode="widthFix" @tap="previewImage" :data-url="sub"></image>
+					</view>	
+				</view>
+			</view>
+			<view class="item">
+				<text class="t1">提交时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">审核状态</text>
+				<text class="t2" v-if="detail.status==0 && (!detail.payorderid||detail.paystatus==1)" style="color:#88e">待处理</text>
+				<text class="t2" v-if="detail.status==0 && detail.payorderid && detail.paystatus==0" style="color:red">待支付</text>
+				<text class="t2" v-if="detail.status==1" style="color:green">处理中</text>
+				<text class="t2" v-if="detail.status==2" style="color:green">已完成</text>
+				<text class="t2" v-if="detail.status==-1" style="color:red">已驳回</text>
+				
+			</view>
+			<view class="item" v-if="detail.status==-1">
+				<text class="t1">驳回原因</text>
+				<text class="t2" style="color:red">{{detail.reason}}</text>
+			</view>
+			<block v-if="form.payset==1">
+			<view class="item">
+				<text class="t1">付款金额</text>
+				<text class="t2" style="font-size:32rpx;color:#e94745">￥{{detail.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款状态</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==0" style="color:green">已付款</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==1" style="color:red">已退款</text>
+				<text class="t2" v-if="detail.paystatus==0" style="color:red">未付款</text>
+			</view>
+			<view class="item" v-if="detail.paystatus>0 && detail.paytime">
+				<text class="t1">付款时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			</block>
+		</view>
+		<view style="width:100%;height:160rpx"></view>
+		<view class="bottom notabbarbot">
+			<view v-if="detail.status!=2" class="btn2" @tap="setst" :data-st="1" :data-id="detail.id">立即处理</view>
+			<view v-if="detail.status>0" class="btn2" @tap="jindu"  :data-id="detail.id">查看进度</view>
+			<view v-if="detail.status==0" class="btn2" @tap="setst2" :data-st="-1" :data-id="detail.id">驳回</view>
+			<view class="btn2" @tap="del" :data-id="detail.id">删除</view>
+		</view>
+		<uni-popup id="dialogSetst2" ref="dialogSetst2" type="dialog">
+			<uni-popup-dialog mode="input" title="驳回原因" :value="detail.reason" placeholder="请输入驳回原因" @confirm="setst2confirm"></uni-popup-dialog>
+		</uni-popup>
+	</block>
+	
+	<view class="modal" v-if="ishowjindu">
+		<view class="modal_jindu">
+				<view class="close" @tap="closejd"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+				<block v-if="jdlist.length>0">
+		
+					<view class="item " v-for="(item,index) in jdlist" style="display: flex;">
+						<view class="f1"><image :src="event_rul +'/static/img/static/img/jindu' + (index==0?'2':'1') + '.png'"></image></view>
+						<view class="f2">
+							<text class="t2"> 时间：{{item.time}}</text>
+							<text class="t1">{{item.desc}}({{item.remark}}) </text>
+						</view>
+					</view>
+				</block>
+				<block v-else>
+						<view style="font-size:14px;color:#f05555;padding:10px;">等待处理</view>
+				</block>
+		</view>
+	</view>
+	
+	
+	<view class="modal" v-if="showstatus">
+		<view class="modal_jindu">
+			<form   @submit="formsubmit">
+					<view class="close" @tap="close"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+					<view class="title">选择流程</view>
+					<view class="uni-list">
+							<radio-group name="liucheng">
+									<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in lclist">
+											<view>
+													<radio :value="''+item.id" style="transform:scale(0.7)"/>
+											</view>
+											<view>{{item.name}}</view>
+									</label>
+							</radio-group>
+							<view class="beizhu flex">
+									<label>备注:</label><textarea placeholder="输入内容" name="content" maxlength="-1"></textarea>
+							</view>
+					</view>
+					<button class="btn" form-type="submit">提交</button>
+			</form>
+		</view>
+	</view>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		detail:{},
+		formcontent:[],
+		showstatus:0,
+		ishowjindu:false,
+		jdlist:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+		this.getliucheng();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminWorkorder/formdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.form = res.form;
+				that.formcontent = res.formcontent;
+				that.detail = res.detail;
+				that.loaded();
+			});
+		},
+		getliucheng:function(e){
+			var that=this
+			app.post('ApiAdminWorkorder/getliucheng', {}, function (res) {
+					var lclist = res.datalist;
+					that.lclist = lclist;
+					
+			});
+		},
+		setst:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.id=id
+			that.showstatus=true;
+		},
+		close:function(e){
+			var that=this
+			that.showstatus=false
+		},
+		
+		formsubmit: function (e) {
+		  var that = this;		
+		  var formdata = e.detail.value;
+		  var content = formdata.content;
+		  var liucheng = formdata.liucheng;
+		  if (liucheng == '') {
+		    app.error('请选择流程');
+		    return false;
+		  }
+			app.showLoading();
+		  app.post('ApiAdminWorkorder/addjindu', {logid:that.id,lcid:liucheng,content: content}, function (res) {
+				var res  = res
+		  	app.showLoading(false);
+		    if (res.status == 1) {
+		      app.success('处理成功');
+					setTimeout(function () {
+					  that.getdata();
+						that.showstatus = false
+					}, 1000);
+		    } else {
+		      app.alert(res.msg);
+		    }
+
+		  });
+		},
+		
+		setst2:function(e){
+			this.$refs.dialogSetst2.open();
+		},
+		setst2confirm:function(done,value){
+			this.$refs.dialogSetst2.close();
+      var that = this;
+      app.post('ApiAdminWorkorder/formsetst', {id: that.opt.id,st:-1,reason:value}, function (data) {
+        app.success(data.msg);
+        setTimeout(function () {
+          that.getdata();
+        }, 1000);
+      });
+		},
+		del:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			app.confirm('确定要删除吗?',function(){
+				app.post('ApiAdminWorkorder/formdel', {id:id}, function (res) {
+					app.success(res.msg);
+					setTimeout(function () {
+						app.goto('/admin/index/index');
+					},1000);
+				})
+			});
+		},
+		jindu:function(e){
+			var that=this
+			that.ishowjindu=true
+			var id = e.currentTarget.dataset.id
+			//读取进度表
+			app.post('ApiWorkorder/selectjindu', { id: id }, function (res) {
+					if(res.status==1){
+						var data = res.data
+						that.jdlist =data
+					}
+				
+			})
+		},
+		closejd:function(e){
+			var that=this
+			that.ishowjindu=false
+		}
+  }
+};
+</script>
+<style>
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.modal{ position: fixed; background:rgba(0,0,0,0.3); width: 100%; height: 100%; top:0; z-index: 100;}
+.modal .modal_jindu{ background: #fff; position: absolute; top: 20%; align-items: center; margin: auto; width: 90%; left: 30rpx; border-radius: 10rpx; padding: 40rpx;}
+.modal_jindu .close image { width: 20rpx; height: 20rpx; position: absolute; top:10rpx; right: 20rpx;}
+.modal_jindu .title{ font-size: 32rpx; font-weight: bold;}
+.uni-list{ margin-top: 30rpx;}
+.uni-list-cell{ display: flex; height: 80rpx;}
+.beizhu label{ width: 100rpx;}
+.modal_jindu .btn{  background: #1658c6; border-radius: 3px;line-height: 24px; border: none; padding: 0 10px;color: #fff;font-size: 20px; text-align: center; width: 300px;  display: flex; height: 40px; justify-content: center;align-items: center;}
+
+
+.modal_jindu .item .f1{ width:60rpx;position:relative}
+/*.logistics img{width: 15px; height: 15px; position: absolute; left: -8px; top:11px;}*/
+.modal_jindu .item .f1 image{width: 30rpx; height: 100%; position: absolute; left: -16rpx; top: 0rpx;}
+.modal_jindu .item .f2{display:flex;flex-direction:column;flex:auto;padding:10rpx 0}
+.modal_jindu .item .f2 .t1{font-size: 30rpx;}
+.modal_jindu .item .f2 .t1{font-size: 26rpx;}
+
+</style>
\ No newline at end of file
diff --git a/admin/workorder/formlog.vue b/admin/workorder/formlog.vue
new file mode 100644
index 0000000..1657caa
--- /dev/null
+++ b/admin/workorder/formlog.vue
@@ -0,0 +1,180 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待处理','处理中','已处理','待支付']" :itemst="['all','0','1','2','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view style="width:100%;height:90rpx"></view>
+		<view class="content" id="datalist">
+			<view class="item"v-for="(item, index) in datalist" :key="index">
+				<view class="f1">
+
+						<view class="flex" style="justify-content: space-between;">
+							<text class="t1"  @tap="goto" :data-url="'myformdetail?id=' + item.id" >工单类型：{{item.title}}</text>	
+								<view class="f2">
+									<text class="t1" v-if="item.status==0 && (!item.payorderid||item.paystatus==1)" style="color:#88e">待处理</text>
+									<text class="t1" v-if="item.status==0 && item.payorderid && item.paystatus==0" style="color:red">待支付</text>
+									<text class="t1" v-if="item.status==1" style="color:green">处理中</text>
+									<text class="t1" v-if="item.status==2" style="color:red">已处理</text>
+									<text class="t1" v-if="item.status==-1" style="color:red">已驳回</text>
+								</view>
+						</view>
+						<view class="flex" style="justify-content: space-between;margin-top: 15rpx;">
+							<text class="t2"  @tap="goto" :data-url="'myformdetail?id=' + item.id" >提交时间：{{item.createtime}}</text>
+							<view class="jindu" @tap="jindu" :data-id="item.id"  v-if="!item.payorderid || (item.payorderid && item.paystatus==1)">查看进度</view>
+						</view>
+				</view>
+			
+			</view>
+		</view>
+	</block>
+	
+	
+	<view class="modal" v-if="ishowjindu">
+		<view class="modal_jindu">
+					<view class="close" @tap="close"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+					<block v-if="jdlist.length>0">
+						<view class="item " v-for="(item,index) in jdlist">
+							<view class="f1"><image :src="event_rul +'/static/img/static/img/jindu' + (index==0?'2':'1') + '.png'"></image></view>
+							<view class="f2">
+								<text class="t2"> 时间：{{item.time}}</text>
+								<text class="t1">{{item.desc}}({{item.remark}}) </text>
+							</view>
+						</view>
+					</block>
+					<block v-else>
+							<view style="font-size:14px;color:#f05555;padding:10px;">等待处理</view>
+					</block>
+		</view>
+	</view>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		ishowjindu:false,
+		jdlist:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.formid = this.opt.formid || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			this.nodata = false;
+			this.nomore = false;
+			this.loading = true;
+      app.post('ApiAdminWorkorder/myformlog', {formid:that.formid,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		jindu:function(e){
+			var that=this
+			that.ishowjindu=true
+			var id = e.currentTarget.dataset.id
+			//读取进度表
+			app.post('ApiWorkorder/selectjindu', { id: id }, function (res) {
+					if(res.status==1){
+						var data = res.data
+						that.jdlist =data
+					}
+				
+			})
+		},
+		close:function(e){
+			var that=this
+			that.ishowjindu=false
+		}
+  }
+}
+</script>
+<style>
+
+	.content{ width:100%;margin:0;}
+	.content .item{ width:94%;margin:20rpx 3%;;background:#fff;border-radius:16rpx;padding:30rpx 30rpx;display:flex;align-items:center;}
+	.content .item:last-child{border:0}
+	.content .item .f1{width:100%;display:flex;flex-direction:column}
+	.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+	.content .item .f1 .t2{color:#666666;margin-top:10rpx}
+	.content .item .f1 .t3{color:#666666}
+	.content .item .f2{width:20%;font-size:24rpx;text-align:right}
+	.content .item .f2 .t1{color:#03bc01;font-size:24rpx;}
+	.content .item .f2 .t2{color:#000000}
+	.content .item .f3{ flex:1;font-size:30rpx;text-align:right}
+	.content .item .f3 .t1{color:#03bc01}
+	.content .item .f3 .t2{color:#000000}
+	.jindu{ border: 1rpx solid #ccc; font-size: 24rpx; padding: 5rpx 10rpx; border-radius: 10rpx; color: #555;}
+	
+	
+	.modal{ position: fixed; background:rgba(0,0,0,0.3); width: 100%; height: 100%; top:0; z-index: 1000;}
+	.modal .modal_jindu{ background: #fff; position: absolute; top: 20%; align-items: center; margin: auto; width: 90%; left: 30rpx; border-radius: 10rpx; padding: 40rpx;}
+	.modal_jindu .close image { width: 20rpx; height: 20rpx; position: absolute; top:10rpx; right: 20rpx;}
+	.modal_jindu .on{color: #23aa5e;}
+	.modal_jindu .item{display:flex;width: 96%;  margin: 0 2%;/*border-left: 1px #dadada solid;*/padding:0 0}
+	.modal_jindu .item .f1{ width:60rpx;position:relative}
+	/*.logistics img{width: 15px; height: 15px; position: absolute; left: -8px; top:11px;}*/
+	.modal_jindu .item .f1 image{width: 30rpx; height: 100%; position: absolute; left: -16rpx; top: 0rpx;}
+	.modal_jindu .item .f2{display:flex;flex-direction:column;flex:auto;padding:10rpx 0}
+	.modal_jindu .item .f2 .t1{font-size: 30rpx;}
+	.modal_jindu .item .f2 .t1{font-size: 26rpx;}
+</style>
\ No newline at end of file
diff --git a/admin/workorder/myformdetail.vue b/admin/workorder/myformdetail.vue
new file mode 100644
index 0000000..fed4db7
--- /dev/null
+++ b/admin/workorder/myformdetail.vue
@@ -0,0 +1,246 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">提交人</text>
+				<text class="flex1"></text>
+				<image :src="detail.headimg" style="width:80rpx;height:80rpx;margin-right:8rpx"/>
+				<text  style="height:80rpx;line-height:80rpx">{{detail.nickname}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">{{t('会员')}}ID</text>
+				<text class="t2">{{detail.mid}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">标题</text>
+				<text class="t2">{{detail.title}}</text>
+			</view>
+			<view v-for="(item, index) in formcontent" :key="index" class="item">
+				<text class="t1">{{item.val1}}</text>
+				<text class="t2" v-if="item.key!='upload'">{{detail['form'+index]}}</text>
+				<view class="t2" style="display: flex; justify-content: flex-end;" v-else>
+					<view v-for="(sub, indx) in detail['form'+index]">
+						<image :src="sub" style="width:50px; margin-left: 10rpx;" mode="widthFix" @tap="previewImage" :data-url="sub"></image>
+					</view>
+				</view>
+			</view>
+			<view class="item">
+				<text class="t1">提交时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">审核状态</text>
+				<text class="t2" v-if="detail.status==0 && (!detail.payorderid||detail.paystatus==1)" style="color:#88e">待处理</text>
+				<text class="t2" v-if="detail.status==0 && detail.payorderid && detail.paystatus==0" style="color:red">待支付</text>
+				<text class="t2" v-if="detail.status==1" style="color:green">处理中</text>
+				<text class="t2" v-if="detail.status==2" style="color:green">已完成</text>
+				<text class="t2" v-if="detail.status==-1" style="color:red">已驳回</text>
+				
+			</view>
+			<view class="item" v-if="detail.status==-1">
+				<text class="t1">驳回原因</text>
+				<text class="t2" style="color:red">{{detail.reason}}</text>
+			</view>
+			<block v-if="form.payset==1">
+			<view class="item">
+				<text class="t1">付款金额</text>
+				<text class="t2" style="font-size:32rpx;color:#e94745">￥{{detail.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款状态</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==0" style="color:green">已付款</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==1" style="color:red">已退款</text>
+				<text class="t2" v-if="detail.paystatus==0" style="color:red">未付款</text>
+			</view>
+			<view class="item" v-if="detail.paystatus>0 && detail.paytime">
+				<text class="t1">付款时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			</block>
+		</view>
+		<view style="width:100%;height:160rpx"></view>
+		<view class="bottom notabbarbot">
+			<view v-if="detail.status>0" class="btn2" @tap="jindu"  :data-id="detail.id">查看进度</view>
+			<view class="btn2" @tap="del" :data-id="detail.id">删除</view>
+		</view>
+		<uni-popup id="dialogSetst2" ref="dialogSetst2" type="dialog">
+			<uni-popup-dialog mode="input" title="驳回原因" :value="detail.reason" placeholder="请输入驳回原因" @confirm="setst2confirm"></uni-popup-dialog>
+		</uni-popup>
+	</block>
+	
+	<view class="modal" v-if="ishowjindu">
+		<view class="modal_jindu">
+				<view class="close" @tap="closejd"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+				<block v-if="jdlist.length>0">
+		
+					<view class="item " v-for="(item,index) in jdlist" style="display: flex;">
+						<view class="f1"><image :src="event_rul +'/static/img/static/img/jindu' + (index==0?'2':'1') + '.png'"></image></view>
+						<view class="f2">
+							<text class="t2"> 时间：{{item.time}}</text>
+							<text class="t1">{{item.desc}}({{item.remark}}) </text>
+						</view>
+					</view>
+				</block>
+				<block v-else>
+						<view style="font-size:14px;color:#f05555;padding:10px;">等待处理</view>
+				</block>
+		</view>
+	</view>
+	
+	
+	<view class="modal" v-if="showstatus">
+		<view class="modal_jindu">
+			<form   @submit="formsubmit">
+					<view class="close" @tap="close"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+					<view class="title">选择流程</view>
+					<view class="uni-list">
+							<radio-group name="liucheng">
+									<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in lclist">
+											<view>
+													<radio :value="''+item.id" style="transform:scale(0.7)"/>
+											</view>
+											<view>{{item.name}}</view>
+									</label>
+							</radio-group>
+							<view class="beizhu flex">
+									<label>备注:</label><textarea placeholder="输入内容" name="content" maxlength="-1"></textarea>
+							</view>
+					</view>
+					<button class="btn" form-type="submit">提交</button>
+			</form>
+		</view>
+	</view>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		detail:{},
+		formcontent:[],
+		showstatus:0,
+		ishowjindu:false,
+		jdlist:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+		this.getliucheng();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAdminWorkorder/myformdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.form = res.form;
+				that.formcontent = res.formcontent;
+				that.detail = res.detail;
+				that.loaded();
+			});
+		},
+		getliucheng:function(e){
+			var that=this
+			app.post('ApiAdminWorkorder/getliucheng', {}, function (res) {
+					var lclist = res.datalist;
+					that.lclist = lclist;
+					
+			});
+		},
+		setst:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.id=id
+			that.showstatus=true;
+		},
+		close:function(e){
+			var that=this
+			that.showstatus=false
+		},
+		
+
+		del:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			app.confirm('确定要删除吗?',function(){
+				app.post('ApiAdminWorkorder/formdel', {id:id}, function (res) {
+					app.success(res.msg);
+					setTimeout(function () {
+						app.goto('/admin/index/index');
+					},1000);
+				})
+			});
+		},
+		jindu:function(e){
+			var that=this
+			that.ishowjindu=true
+			var id = e.currentTarget.dataset.id
+			//读取进度表
+			app.post('ApiWorkorder/selectjindu', { id: id }, function (res) {
+					if(res.status==1){
+						var data = res.data
+						that.jdlist =data
+					}
+				
+			})
+		},
+		closejd:function(e){
+			var that=this
+			that.ishowjindu=false
+		}
+  }
+};
+</script>
+<style>
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.modal{ position: fixed; background:rgba(0,0,0,0.3); width: 100%; height: 100%; top:0; z-index: 100;}
+.modal .modal_jindu{ background: #fff; position: absolute; top: 20%; align-items: center; margin: auto; width: 90%; left: 30rpx; border-radius: 10rpx; padding: 40rpx;}
+.modal_jindu .close image { width: 20rpx; height: 20rpx; position: absolute; top:10rpx; right: 20rpx;}
+.modal_jindu .title{ font-size: 32rpx; font-weight: bold;}
+.uni-list{ margin-top: 30rpx;}
+.uni-list-cell{ display: flex; height: 80rpx;}
+.beizhu label{ width: 100rpx;}
+.modal_jindu .btn{  background: #1658c6; border-radius: 3px;line-height: 24px; border: none; padding: 0 10px;color: #fff;font-size: 20px; text-align: center; width: 300px;  display: flex; height: 40px; justify-content: center;align-items: center;}
+
+
+.modal_jindu .item .f1{ width:60rpx;position:relative}
+/*.logistics img{width: 15px; height: 15px; position: absolute; left: -8px; top:11px;}*/
+.modal_jindu .item .f1 image{width: 30rpx; height: 100%; position: absolute; left: -16rpx; top: 0rpx;}
+.modal_jindu .item .f2{display:flex;flex-direction:column;flex:auto;padding:10rpx 0}
+.modal_jindu .item .f2 .t1{font-size: 30rpx;}
+.modal_jindu .item .f2 .t1{font-size: 26rpx;}
+
+</style>
\ No newline at end of file
diff --git a/admin/workorder/record.vue b/admin/workorder/record.vue
new file mode 100644
index 0000000..4b32e6d
--- /dev/null
+++ b/admin/workorder/record.vue
@@ -0,0 +1,262 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待处理','处理中 ','已完成','待支付']" :itemst="['all','0','1','2','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view style="width:100%;height:90rpx"></view>
+		<view class="content" id="datalist">
+			<view class="item" v-for="(item, index) in datalist" :key="index">
+				<view class="f1">
+						<view class="flex" style="justify-content: space-between;">
+							<text class="t1"  @tap.stop="goto" :data-url="'formdetail?id=' + item.id">{{item.title}}</text>
+								<view class="f2" >
+									<text class="t1" v-if="item.status==0 && (!item.payorderid||item.paystatus==1)" style="color:#88e" @tap="setst" :data-id="item.id">立即处理</text>
+									<text class="t1" v-if="item.status==0 && item.payorderid && item.paystatus==0" style="color:red">待支付</text>
+									<text class="t1" v-if="item.status==1" style="color:green" @tap="setst" :data-id="item.id">立即处理</text>
+									<text class="t1" v-if="item.status==2" style="color:green">已完成</text>
+									<text class="t1" v-if="item.status==-1" style="color:red">已驳回</text>
+								</view>
+						</view>	
+						<view class="flex" style="justify-content: space-between; margin-top: 20rpx;">
+							<view  @tap.stop="goto" :data-url="'formdetail?id=' + item.id">
+								<text class="t2">提交时间：{{item.createtime}}</text>
+								<text class="t2" v-if="item.paynum" user-select="true" selectable="true">{{item.paynum}}</text>
+							</view>
+							<view class="jindu" @tap="jindu" :data-id="item.id" >查看进度</view>
+						</view>
+			
+			
+			
+				</view>
+	
+			</view>
+		</view>
+		<view class="modal" v-if="ishowjindu">
+			<view class="modal_jindu">
+					<view class="close" @tap="closejd"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+					<block v-if="jdlist.length>0">
+			
+						<view class="item " v-for="(item,index) in jdlist" style="display: flex;">
+							<view class="f1"><image :src="event_rul +'/static/img/static/img/jindu' + (index==0?'2':'1') + '.png'"></image></view>
+							<view class="f2">
+								<text class="t2"> 时间：{{item.time}}</text>
+								<text class="t1">{{item.desc}}({{item.remark}}) </text>
+							</view>
+						</view>
+					</block>
+					<block v-else>
+							<view style="font-size:14px;color:#f05555;padding:10px;">等待处理</view>
+					</block>
+			</view>
+		</view>
+		
+		<view class="modal" v-if="showstatus">
+			<view class="modal_jindu">
+				<form   @submit="formsubmit">
+						<view class="close" @tap="close"><image :src="event_rul + '/static/img/static/img/close.png'" /></view>
+						<view class="title">选择流程</view>
+						<view class="uni-list">
+								<radio-group name="liucheng">
+										<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in lclist">
+												<view>
+														<radio :value="''+item.id" style="transform:scale(0.7)"/>
+												</view>
+												<view>{{item.name}}</view>
+										</label>
+								</radio-group>
+								<view class="beizhu flex">
+										<label>备注:</label><textarea placeholder="输入内容" name="content" maxlength="-1"></textarea>
+								</view>
+						</view>
+						<button class="btn" form-type="submit">提交</button>
+				</form>
+			</view>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		showstatus:0,
+		lclist:[],
+		current:0,
+		ishowjindu:false,
+		jdlist:[],
+
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.getdata();
+		this.getliucheng();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			this.nodata = false;
+			this.nomore = false;
+			this.loading = true;
+      app.post('ApiAdminWorkorder/formlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		getliucheng:function(e){
+			var that=this
+			app.post('ApiAdminWorkorder/getliucheng', {}, function (res) {
+					var lclist = res.datalist;
+					that.lclist = lclist;
+					
+			});
+		},
+		setst: function (e) {
+			var that=this
+			console.log(e);
+			that.id= e.currentTarget.dataset.id
+			that.showstatus=true;
+		
+		},
+		close:function(e){
+			var that=this
+			that.showstatus=false
+		},
+		radioChange:function(e){
+			var that=this
+			console.log(e)
+		},
+		formsubmit: function (e) {
+		  var that = this;		
+		  var formdata = e.detail.value;
+		  var content = formdata.content;
+		  var liucheng = formdata.liucheng;
+		  if (liucheng == '') {
+		    app.error('请选择流程');
+		    return false;
+		  }
+		  app.showLoading(true);
+		  app.post('ApiAdminWorkorder/addjindu', {logid:that.id,lcid:liucheng,content: content}, function (res) {
+		    app.showLoading(false);
+		    if (res.status == 1) {
+		      app.success('处理成功');
+					setTimeout(function () {
+					  that.getdata();
+						that.showstatus=false
+					}, 1000);
+		    } else {
+		      app.error(res.msg);
+		    }
+		  });
+		},
+		jindu:function(e){
+			var that=this
+			that.ishowjindu=true
+			var id = e.currentTarget.dataset.id
+			//读取进度表
+			app.post('ApiWorkorder/selectjindu', { id: id }, function (res) {
+					if(res.status==1){
+						var data = res.data
+						that.jdlist =data
+					}
+				
+			})
+		},
+		closejd:function(e){
+			var that=this
+			that.ishowjindu=false
+		}
+  }
+}
+</script>
+<style>
+
+	.content{ width:100%;margin:0;}
+	.content .item{ width:94%;margin:20rpx 3%;;background:#fff;border-radius:16rpx;padding:30rpx 30rpx;display:flex;align-items:center;}
+	.content .item:last-child{border:0}
+	.content .item .f1{width:100%;display:flex;flex-direction:column}
+	.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+	.content .item .f1 .t2{color:#666666;margin-top:10rpx}
+	.content .item .f1 .t3{color:#666666}
+	.content .item .f2{width:20%;font-size:32rpx;text-align:right}
+	.content .item .f2 .t1{color:#03bc01}
+	.content .item .f2 .t2{color:#000000}
+	.content .item .f3{ flex:1;font-size:30rpx;text-align:right}
+	.content .item .f3 .t1{color:#03bc01}
+	.content .item .f3 .t2{color:#000000}
+	.jindu{ border: 1rpx solid #ccc; font-size: 24rpx; padding: 5rpx 10rpx; border-radius: 10rpx; color: #555;}
+	
+	
+	.modal{ position: fixed; background:rgba(0,0,0,0.3); width: 100%; height: 100%; top:0; z-index: 100;}
+	.modal .modal_jindu{ background: #fff; position: absolute; top: 20%; align-items: center; margin: auto; width: 90%; left: 30rpx; border-radius: 10rpx; padding: 40rpx;}
+	.modal_jindu .close image { width: 20rpx; height: 20rpx; position: absolute; top:10rpx; right: 20rpx;}
+	.modal_jindu .title{ font-size: 32rpx; font-weight: bold;}
+	.uni-list{ margin-top: 30rpx;}
+	.uni-list-cell{ display: flex; height: 80rpx;}
+	.beizhu label{ width: 100rpx;}
+	.modal_jindu .btn{  background: #1658c6; border-radius: 3px;line-height: 24px; border: none; padding: 0 10px;color: #fff;font-size: 20px; text-align: center; width: 300px;  display: flex; height: 40px; justify-content: center;align-items: center;}
+	
+	
+	.modal_jindu .item .f1{ width:60rpx;position:relative}
+	/*.logistics img{width: 15px; height: 15px; position: absolute; left: -8px; top:11px;}*/
+	.modal_jindu .item .f1 image{width: 30rpx; height: 100%; position: absolute; left: -16rpx; top: 0rpx;}
+	.modal_jindu .item .f2{display:flex;flex-direction:column;flex:auto;padding:10rpx 0}
+	.modal_jindu .item .f2 .t1{font-size: 30rpx;}
+	.modal_jindu .item .f2 .t1{font-size: 26rpx;}
+</style>
\ No newline at end of file
diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..621b564
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,14 @@
+{
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://v2.diandashop.com/h5/1.html#/pages/index/main?id=49\">《服务协议》</a>和<a href=\"https://v2.diandashop.com/h5/1.html#/pages/index/main?id=50\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://v2.diandashop.com/h5/1.html#/pages/index/main?id=49\">《服务协议》</a>和<a href=\"https://v2.diandashop.com/h5/1.html#/pages/index/main?id=50\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    }
+}
diff --git a/common.css b/common.css
new file mode 100644
index 0000000..4fc4631
--- /dev/null
+++ b/common.css
@@ -0,0 +1,76 @@
+view{box-sizing: border-box;overflow:visible}
+text{box-sizing: border-box;}
+input{box-sizing: border-box;}
+image{box-sizing: border-box;}
+picker{box-sizing: border-box;}
+icon{box-sizing: border-box;}
+label{box-sizing: border-box;}
+textarea{box-sizing: border-box;}
+video{box-sizing: border-box;}
+scroll-view{box-sizing: border-box;}
+
+page{font-size:28rpx;background:#f6f6f6}
+
+button {padding-left: 0;padding-right: 0;background-color: transparent;font-size: 28rpx;border:0;border-radius: 0;overflow: visible;}
+button::after {border: none;}
+.button-view {text-align: left;font-size: 28rpx;line-height: 1.4;}
+.button-view::after {width: 0;height: 0;}
+.button-view-hover {background-color: transparent;}
+
+.tabbarbot{bottom:110rpx !important}
+@supports (bottom: env(safe-area-inset-bottom)){
+	.tabbarbot{margin-bottom:env(safe-area-inset-bottom);}
+}
+@supports (bottom: env(safe-area-inset-bottom)){
+	.notabbarbot{padding-bottom:env(safe-area-inset-bottom) !important;}
+}
+@supports (bottom: env(safe-area-inset-bottom)){
+	.notabbarbot2{bottom:env(safe-area-inset-bottom) !important;}
+}
+.flex {display: flex;}
+.flex1 {flex-grow: 1;flex-shrink: 1;}
+.flex0 {flex-grow: 0;flex-shrink: 0;}
+.flex-row {display: flex;flex-direction: row;}
+.flex-col{display: flex;flex-direction: column;}
+.flex-x-center{display: flex;justify-content: center;}
+.flex-y-center{display: flex;align-items: center;}
+.flex-y-bottom{display: flex;align-items: flex-end;}
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+
+.wxfaceimg{width:50rpx;height:50rpx}
+.copyright{width:100%;line-height:40rpx;color:#C9C9C9;font-size:26rpx;text-align:center;white-space:pre;padding:30rpx 0}
+
+/* 自己添加的-- */
+.flex {display: flex;}
+.flex1 {flex: 1;}
+.j-center {justify-content: center;}
+.j-between {justify-content: space-between;}
+.j-around {justify-content: space-around;}
+.j-evenly {justify-content: space-evenly;}
+.flex-colum{flex-direction: column;}
+.flex-w{flex-wrap: wrap;}
+.al-item-center {align-items: center;}
+.al-item-fn{align-items: flex-end;}
+.font-w {font-weight: bold;}
+.fs12 {font-size: 24rpx;}
+.color-gray {color: #999;}
+.color-white{color: #fff;}
+.bg-color-white {background-color: #fff;}
+.border-rius-r {border-radius: 1000rpx;}
+.border-rius-5 {border-radius: 10rpx;}
+.border-rius-10 {border-radius: 20rpx;}
+.overflow-hd {overflow: hidden;}
+.text-center{text-align: center;}
+.text-overflow-tx {text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
+.text-overflow-line { display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;word-wrap: break-word;word-break: break-all;}
+.position-r{position: relative;}
+.position-a{position: absolute;}
+.position-f{position: fixed;}
+.position-center{left: 50%;top: 50%;transform: translate(-50%, -50%);}
\ No newline at end of file
diff --git a/components/buydialog-tuangou/buydialog-tuangou.vue b/components/buydialog-tuangou/buydialog-tuangou.vue
new file mode 100644
index 0000000..159a98a
--- /dev/null
+++ b/components/buydialog-tuangou/buydialog-tuangou.vue
@@ -0,0 +1,167 @@
+<template>
+<view>
+	<view v-if="isload">
+		<view class="buydialog-mask" @tap="buydialogChange"></view>
+		<view class="buydialog" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+			<view class="close" @tap="buydialogChange">
+				<image :src="event_rul + '/static/img/static/img/close.png'" class="image"/>
+			</view>
+			<view class="title">
+				<image :src="product.pic" class="img" @tap="previewImage" :data-url="product.pic"/>
+				<view class="price" :style="{color:t('color1')}">￥{{product.sell_price}} <text v-if="product.market_price > product.sell_price" class="t2">￥{{product.market_price}}</text></view>
+				<view class="stock">库存：{{product.stock}}</view>
+			</view>
+			<view class="buynum flex flex-y-center">
+				<view class="flex1">购买数量：</view>
+				<view class="addnum">
+					<view class="minus"><image class="img" :src="event_rul + '/static/img/static/img/cart-minus.png'" @tap="gwcminus"/></view>
+					<input class="input" type="number" :value="gwcnum" @input="gwcinput"></input>
+					<view class="plus"><image class="img" :src="event_rul + '/static/img/static/img/cart-plus.png'" @tap="gwcplus"/></view>
+				</view>
+			</view>
+			<view class="op">
+				<block  v-if="product.stock <= 0">
+					<button class="nostock">库存不足</button>
+				</block>
+				<block  v-else>
+					<button class="tobuy" :style="{backgroundColor:t('color1')}" @tap="tobuy" v-if="btntype==0">立即购买</button>
+					<button class="tobuy" :style="{backgroundColor:t('color1')}" @tap="tobuy" v-if="btntype==2">确 定</button>
+				</block>
+			</view>
+		</view>
+	</view>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				ks:'',
+				product:{},
+				gwcnum:1,
+				isload:false,
+				loading:false,
+				canaddcart:true,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			btntype:{default:0},
+			menuindex:{default:-1},
+			controller:{default:'ApiTuangou'},
+			needaddcart:{default:true},
+			proid:{}
+		},
+		mounted:function(){
+			this.getdata();
+		},
+		methods:{
+			getdata:function(){
+				var that = this;
+				that.loading = true;
+				app.post(this.controller+'/getproductdetail',{id:that.proid},function(res){
+					that.loading = false;
+					that.product = res.product;
+					if(!that.product.limit_start){
+						that.product.limit_start = 1;
+					}
+					that.gwcnum = that.product.limit_start;
+					that.isload = true;
+					if(that.product.freighttype==3 || that.product.freighttype==4){ //虚拟商品不能加入购物车
+						that.canaddcart = false;
+					}
+					if(that.product.istg == 1){
+						that.canaddcart = false;
+					}
+					if(that.controller == 'ApiTuangou'){
+						that.canaddcart = false;
+					}
+				});
+			},
+			buydialogChange:function(){
+				this.$emit('buydialogChange');
+			},
+			tobuy: function (e) {
+				var that = this;
+				var ks = that.ks;
+				var proid = that.product.id;
+				var num = that.gwcnum;
+				if (num < 1) num = 1;
+				if (this.product.stock < num) {
+					app.error('库存不足');
+					return;
+				}
+				var prodata = proid + ',' + num;
+				this.$emit('buydialogChange');
+				if(this.controller == 'ApiTuangou'){
+					app.goto('/activity/tuangou/buy?prodata=' + prodata);
+				}
+			},
+			//加
+			gwcplus: function (e) {
+				var gwcnum = this.gwcnum + 1;
+				var ks = this.ks;
+				if (gwcnum > this.product.stock) {
+					app.error('库存不足');
+					return 1;
+				}
+				this.gwcnum = this.gwcnum + 1;
+			},
+			//减
+			gwcminus: function (e) {
+				var gwcnum = this.gwcnum - 1;
+				var ks = this.ks;
+				if (gwcnum <= this.product.limit_start - 1) {
+					if(this.product.limit_start > 1){
+						app.error('该商品' + this.product.limit_start + '件起售');
+					}
+					return;
+				}
+				this.gwcnum = this.gwcnum - 1;
+			},
+			//输入
+			gwcinput: function (e) {
+				var ks = this.ks;
+				var gwcnum = parseInt(e.detail.value);
+				if (gwcnum < 1) return 1;
+				if (gwcnum > this.product.stock) {
+					return this.product.stock > 0 ? this.product.stock : 1;
+				}
+				this.gwcnum = gwcnum;
+			},
+		}
+	}
+</script>
+<style>
+
+.buydialog-mask{ position: fixed; top: 0px; left: 0px; width: 100%; background: rgba(0,0,0,0.5); bottom: 0px;z-index:10}
+.buydialog{ position: fixed; width: 100%; left: 0px; bottom: 0px; background: #fff;z-index:11;border-radius:20rpx 20rpx 0px 0px}
+.buydialog .close{ position: absolute; top: 0; right: 0;padding:20rpx;z-index:12}
+.buydialog .close .image{ width: 30rpx; height:30rpx; }
+.buydialog .title{ width: 94%;position: relative; margin: 0 3%; padding:20rpx 0px; border-bottom:0; height: 190rpx;}
+.buydialog .title .img{ width: 160rpx; height: 160rpx; position: absolute; top: 20rpx; border-radius: 10rpx; border: 0 #e5e5e5 solid;background-color: #fff}
+.buydialog .title .price{ padding-left:180rpx;width:100%;font-size: 36rpx;height:70rpx; color: #FC4343;overflow: hidden;}
+.buydialog .title .price .t1{ font-size:26rpx}
+.buydialog .title .price .t2{ font-size:26rpx;text-decoration:line-through;color:#aaa}
+.buydialog .title .choosename{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+.buydialog .title .stock{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+
+.buydialog .guigelist{ width: 94%; position: relative; margin: 0 3%; padding:0px 0px 10px 0px; border-bottom: 0; }
+.buydialog .guigelist .name{ height:70rpx; line-height: 70rpx;}
+.buydialog .guigelist .item{ font-size: 30rpx;color: #333;flex-wrap:wrap}
+.buydialog .guigelist .item2{ height:60rpx;line-height:60rpx;margin-bottom:4px;border:0; border-radius:4rpx; padding:0 40rpx;color:#666666; margin-right: 10rpx; font-size:26rpx;background:#F4F4F4}
+.buydialog .guigelist .on{color:#FC4343;background:rgba(252,67,67,0.1);font-weight:bold}
+.buydialog .buynum{ width: 94%; position: relative; margin: 0 3%; padding:10px 0px 10px 0px; }
+.buydialog .addnum {font-size: 30rpx;color: #666;width:auto;display:flex;align-items:center}
+.buydialog .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .img{width:24rpx;height:24rpx}
+.buydialog .addnum .input{flex:1;width:70rpx;border:0;text-align:center;color:#2B2B2B;font-size:24rpx}
+
+.buydialog .op{width:90%;margin:20rpx 5%;border-radius:36rpx;overflow:hidden;display:flex;margin-top:100rpx;}
+.buydialog .addcart{flex:1;height:72rpx; line-height: 72rpx; color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold}
+.buydialog .tobuy{flex:1;height: 72rpx; line-height: 72rpx; color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold}
+.buydialog .nostock{flex:1;height: 72rpx; line-height: 72rpx; background:#aaa; color: #fff; border-radius: 0px; border: none;}
+</style>
\ No newline at end of file
diff --git a/components/buydialog/buydialog.vue b/components/buydialog/buydialog.vue
new file mode 100644
index 0000000..c400636
--- /dev/null
+++ b/components/buydialog/buydialog.vue
@@ -0,0 +1,518 @@
+<template>
+<view class="uibuydialog">
+	<block v-if="isload">
+		<view class="buydialog-mask" @tap="buydialogChange"></view>
+		<view class="buydialog">
+			<view class="buydialog-close" @tap="buydialogChange">
+				<image class="buydialog-close__img" :src="event_rul + '/static/img/static/img/close.png'"></image>
+			</view>
+			<view class="buydialog-product flex">
+				<image class="buydialog-product__img" :src="nowguige.pic || product.pic" @tap="previewImage" :data-url="nowguige.pic || product.pic"/>
+				<view class="buydialog-product__bd flex1">
+					<view class="buydialog-product__price flex al-item-center" :style="{color: colors.priceColor}">￥{{nowguige.sell_price}} <text v-if="nowguige.market_price > nowguige.sell_price" class="original-price">￥{{nowguige.market_price}}</text></view>
+					<text class="buydialog-product__choosename" v-if="product.limit_start > 1"> {{product.limit_start}}件起售</text>
+					<view class="buydialog-product__stock">库存：{{nowguige.stock}}</view>
+					<view class="buydialog-product__choosename" v-if="product.limit_start<=1">已选规格: {{nowguige.name}}</view>
+				</view>
+			</view>
+			<view class="buydialog-bd">
+				<view v-if="nowguige.balance_price" class="installment-price" :style="{color:t('color1')}">首付款金额：{{nowguige.advance_price}}元，尾款金额：{{nowguige.balance_price}}元</view>
+				<view class="buydialog-specification__list">
+					<view v-for="(item, index) in guigedata" :key="index" class="buydialog-specification flex-col">
+						<view class="buydialog-specification__name">{{item.title}}</view>
+						<view class="buydialog-specification__list flex al-item-center">
+							<block v-for="(item2, index2) in item.items" :key="index2">
+								<view :data-itemk="item.k" :data-idx="item2.k" :style="{background: ggselected[item.k] == item2.k ? colors.textBgcolor : '#F4F4F4', color: ggselected[item.k] == item2.k ? colors.textColor : '#666'}" :class="'buydialog-specification__item ' + (ggselected[item.k]==item2.k ? 'on':'')" @tap="ggchange">{{item2.title}}</view>
+							</block>
+						</view>
+					</view>
+				</view>
+				<view class="buydialog-buynum flex al-item-center j-between">
+					<view class="buydialog-buynum__txt flex1">购买数量：</view>
+					<view class="buydialog-buynum__btn flex al-item-center">
+						<view class="sub-btn flex al-item-center j-center"><text class="iconfont icon-jian" :class="{'disabled': gwcnum < 2}" @tap="gwcminus"></text></view>
+						<input class="num flex1" type="number" :value="gwcnum" @input="gwcinput"></input>
+						<view class="add-btn flex al-item-center j-center"><text class="iconfont icon-shanchu1" :class="{'disabled': gwcnum == nowguige.stock}" @tap="gwcplus"></text></view>
+					</view>
+				</view>
+			</view>
+			<view class="buydialog-ft">
+				<view v-if="shopset && shopset.showcommission==1 && nowguige.commission > 0" class="buydialog-ft__tips" :style="{color:colors.textColor}">分享好友购买预计可得{{t('佣金')}}：<text class="commission">{{nowguige.commission}}</text>{{nowguige.commission_desc}}</view>
+				<view class="buydialog-ft__btns flex">
+					<block v-if="nowguige.stock <= 0">
+						<button class="buydialog-ft__btn nostock flex1">库存不足</button>
+					</block>
+					<block v-else>
+						<button class="buydialog-ft__btn addcart flex1" :style="{background:colors.purchaseBtn,color:colors.purchaseText}" @tap="addcart" v-if="btntype==0 && canaddcart">加入购物车</button>
+						<button class="buydialog-ft__btn tobuy flex1" :style="{background:colors.singleBtn}" @tap="tobuy" v-if="btntype==0">立即购买</button>
+						<button class="buydialog-ft__btn addcart flex1" :style="{background:colors.singleBtn}" @tap="addcart" v-if="btntype==1">确 定</button>
+						<button class="buydialog-ft__btn tobuy flex1" :style="{background:colors.singleBtn}" @tap="tobuy" v-if="btntype==2">确 定</button>
+					</block>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				ks:'',
+				product:{},
+				guigelist:{},
+				guigedata:{},
+				ggselected:{},
+				nowguige:{},
+				gwcnum:1,
+				isload:false,
+				loading:false,
+				canaddcart:true,
+				shopset:{},
+				
+				event_rul: app.globalData.event_url,
+				pagesUrl: '',
+				colors:{
+					priceColor: '#ED5925',  // 价格颜色
+					textBgcolor: '#E2F7EF', // 规格选中背景色
+					textColor: this.t('color1'),   // 规格选中字体颜色
+					singleBtn: 'linear-gradient(to right, #01A664, #096741)',   // 单个按钮背景色
+					purchaseBtn: 'linear-gradient(to right, #E9FAF4, #CAF6E5)',   // 购买按钮背景色
+					purchaseText: this.t('color1'), // 购买按钮字体颜色
+				},
+			}
+		},
+		props: {
+			btntype:{default:0},
+			menuindex:{default:-1},
+			controller:{default:'ApiShop'},
+			needaddcart:{default:true},
+			proid:{},
+			showtaos: {default: 0},
+			themsColor: {default: 0}
+		},
+		created() {
+			if(this.themsColor == 1) { // 海纳百川
+				this.colors = {
+					priceColor: '#FF4800',  // 价格颜色
+					textBgcolor: '#E6EFFF', // 规格选中背景色
+					textColor: '#1870C5',   // 规格选中字体颜色
+					singleBtn: 'linear-gradient(to right, #269DD1, #5487D7)',   // 单个按钮背景色
+					purchaseBtn: 'linear-gradient(to right, #E9F1FF, #E6EFFF)',   // 购买按钮背景色
+					purchaseText: '#1870C5', // 购买按钮字体颜色
+				}
+			}
+			if(this.themsColor == 2) { // 百里挑一
+				this.colors = {
+					priceColor: '#CE0000',  // 价格颜色
+					textBgcolor: '#FFE4C2', // 规格选中背景色
+					textColor: '#CE0000',   // 规格选中字体颜色
+					singleBtn: 'linear-gradient(to right, #AECA00, #8CB400)',   // 单个按钮背景色
+					purchaseBtn: 'linear-gradient(to right, #FFE8EC, #FFE8EC)',   // 购买按钮背景色
+					purchaseText: '#CE0000', // 购买按钮字体颜色
+				}
+			}
+			if(this.themsColor == 3) { // 橙心如意
+				this.colors = {
+					priceColor: '#ED5925',  // 价格颜色
+					textBgcolor: '#FFE8EC', // 规格选中背景色
+					textColor: '#FB5E00',   // 规格选中字体颜色
+					singleBtn: 'linear-gradient(to right, #FF7D16, #FF640A)',   // 单个按钮背景色
+					purchaseBtn: 'linear-gradient(to right, #FFE7C8, #FFE4C2)',   // 购买按钮背景色
+					purchaseText: '#FB5E00', // 购买按钮字体颜色
+				}
+			}
+			if(this.themsColor == 4) {  // 红福齐天
+				this.colors = {
+					priceColor: '#ED5925',  // 价格颜色
+					textBgcolor: '#FFE4E6', // 规格选中背景色
+					textColor: '#D11800',   // 规格选中字体颜色
+					singleBtn: 'linear-gradient(to right, #FA5F47, #FD5A54)',   // 单个按钮背景色
+					purchaseBtn: 'linear-gradient(to right, #FFF4F5, #FFE0E1)',   // 购买按钮背景色
+					purchaseText: '#D11800', // 购买按钮字体颜色
+				}
+			}
+			
+			if(this.themsColor == 5) {  // 和气生财
+				this.colors = {
+					priceColor: '#ED5925',  // 价格颜色
+					textBgcolor: '#FFD9A4', // 规格选中背景色
+					textColor: '#E64520',   // 规格选中字体颜色
+					singleBtn: 'linear-gradient(150deg, #F65326, #C40000)',   // 单个按钮背景色
+					purchaseBtn: '#FFD9A4',   // 购买按钮背景色
+					purchaseText: '#E64520', // 购买按钮字体颜色
+				}
+			}
+			if(this.themsColor == 6) {  // 青山绿水
+				this.colors = {
+					priceColor: '#E55554',  // 价格颜色
+					textBgcolor: '#EAFFFA', // 规格选中背景色
+					textColor: '#5CBB62',   // 规格选中字体颜色
+					singleBtn: 'linear-gradient(150deg, #95E196, #65B76A)',   // 单个按钮背景色
+					purchaseBtn: '#EAFFFA',   // 购买按钮背景色
+					purchaseText: '#5CBB62', // 购买按钮字体颜色
+				}
+			}
+		},
+		mounted:function(){
+			var pages = getCurrentPages()
+			this.pagesUrl = pages[pages.length - 1].route
+			this.getdata();
+		},
+		methods:{
+			getdata:function(){
+				var that = this;
+				if(this.controller == 'ApiShop' && app.globalData.isdouyin == 1){
+					app.showLoading('加载中');
+					app.post('ApiShop/getDouyinProductId',{proid:that.proid},function(res){
+						app.showLoading(false);
+						if(res.status == 1){
+							tt.openEcGood({promotionId:res.douyin_product_id});
+						}else{
+							app.alert(res.msg)
+						}
+					});
+					return;
+				}
+
+				that.loading = true;
+				app.post(this.controller+'/getproductdetail',{id:that.proid},function(res){
+					that.loading = false;
+					that.product = res.product;
+					that.shopset = res.shopset;
+					if(!that.product.limit_start){
+						that.product.limit_start = 1;
+					}
+					that.guigelist = res.guigelist;
+					that.guigedata = res.guigedata;
+					var guigedata = res.guigedata;
+					var ggselected = [];
+					for (var i = 0; i < guigedata.length; i++) {
+						ggselected.push(0);
+					}
+					that.ks = ggselected.join(','); 
+					that.nowguige = that.guigelist[that.ks];
+					that.ggselected = ggselected;
+					if(that.nowguige.limit_start > 0)
+						that.gwcnum = that.nowguige.limit_start;
+					else
+						that.gwcnum = that.product.limit_start;
+					that.isload = true;
+					if(that.product.freighttype==3 || that.product.freighttype==4){ //虚拟商品不能加入购物车
+						that.canaddcart = false;
+					}
+				});
+			},
+			buydialogChange:function(){
+				this.$emit('buydialogChange');
+			},
+			//选择规格
+			ggchange: function (e){
+				var idx = e.currentTarget.dataset.idx;
+				var itemk = e.currentTarget.dataset.itemk;
+				var ggselected = this.ggselected;
+				ggselected[itemk] = idx;
+				var ks = ggselected.join(',');
+				this.ggselected = ggselected;
+				this.ks = ks;
+				this.nowguige = this.guigelist[this.ks];
+				if(this.nowguige.limit_start > 0) {
+					if (this.gwcnum < this.nowguige.limit_start) {
+						this.gwcnum = this.nowguige.limit_start;
+					}
+				}
+			},
+			tobuy: function (e) {
+				var that = this;
+				var ks = that.ks;
+				var proid = that.product.id;
+				var ggid = that.guigelist[ks].id;
+				var stock = that.guigelist[ks].stock;
+				var num = that.gwcnum;
+				if (num < 1) num = 1;
+				if (stock < num) {
+					app.error('库存不足');
+					return;
+				}
+				var prodata = proid + ',' + ggid + ',' + num;
+				this.$emit('buydialogChange');
+				if(this.controller == 'ApiShop'){
+					app.goto('/pagesA/shop/buy?prodata=' + prodata);
+				}else if(this.controller == 'ApiSeckill'){
+					app.goto('/activity/seckill/buy?prodata=' + prodata);
+				}else if(this.controller == 'ApiSeckill2'){
+					app.goto('/activity/seckill2/buy?prodata=' + prodata);
+				}else if(this.controller == 'ApiRestaurantTakeaway'){
+					app.goto('/restaurant/takeaway/buy?prodata=' + prodata);
+				}else if(this.controller == 'ApiRestaurantShop'){
+					app.goto('/restaurant/shop/buy?prodata=' + prodata);
+				}
+			},
+			//加入购物车操作
+			addcart: function () {
+				var that = this;
+				var ks = that.ks;
+				var num = that.gwcnum;
+				var proid = that.product.id;
+				var ggid = that.guigelist[ks].id;
+				var stock = that.guigelist[ks].stock;
+				if (num < 1) num = 1;
+				if (stock < num) {
+					app.error('库存不足');
+					return;
+				}
+				if(this.needaddcart){
+					app.post(this.controller+'/addcart', {proid: proid,ggid: ggid,num: num}, function (res) {
+						if (res.status == 1) {
+							app.success('添加成功');
+						} else {
+							app.error(res.msg, 1500);
+							if(that.showtaos == 1){
+								uni.hideToast()
+							}
+							if(that.pagesUrl == 'pages/shop/product') {
+								that.$emit('cartPuch',res.goods);
+							}
+							
+						}
+					});
+				}
+				this.$emit('addcart',{proid: proid,ggid: ggid,num: num});
+				this.$emit('buydialogChange');
+			},
+			//加
+			gwcplus: function (e) {
+				var gwcnum = this.gwcnum + 1;
+				var ks = this.ks;
+				if (gwcnum > this.guigelist[ks].stock) {
+					app.error('库存不足');
+					return 1;
+				}
+				if (this.product.perlimitdan > 0 && gwcnum > this.product.perlimitdan) {
+					app.error('每单限购'+this.product.perlimitdan+'件');
+					return 1;
+				}
+				this.gwcnum = this.gwcnum + 1;
+			},
+			//减
+			gwcminus: function (e) {
+				var gwcnum = this.gwcnum - 1;
+				var ks = this.ks;
+				if(this.nowguige.limit_start > 0) {
+					if (gwcnum <= this.nowguige.limit_start - 1) {
+						if(this.nowguige.limit_start > 1){
+							app.error('该规格' + this.nowguige.limit_start + '件起售');
+						}
+						return;
+					}
+				}else{
+					if (gwcnum <= this.product.limit_start - 1) {
+						if(this.product.limit_start > 1){
+							app.error('该商品' + this.product.limit_start + '件起售');
+						}
+						return;
+					}
+				}
+				
+				this.gwcnum = this.gwcnum - 1;
+			},
+			//输入
+			gwcinput: function (e) {
+				var ks = this.ks;
+				var gwcnum = parseInt(e.detail.value);
+				if (gwcnum < 1) return 1;
+				if (gwcnum > this.guigelist[ks].stock) {
+					return this.guigelist[ks].stock > 0 ? this.guigelist[ks].stock : 1;
+				}
+				if(this.nowguige.limit_start > 0) {
+					if (gwcnum <= this.nowguige.limit_start - 1) {
+						if(this.nowguige.limit_start > 1){
+							app.error('该规格' + this.nowguige.limit_start + '件起售');
+						}
+						gwcnum = this.nowguige.limit_start;
+					}
+				}else{
+					if (gwcnum <= this.product.limit_start - 1) {
+						if(this.product.limit_start > 1){
+							app.error('该商品' + this.product.limit_start + '件起售');
+						}
+						gwcnum = this.product.limit_start;
+					}
+					
+				}
+				if (this.product.perlimitdan > 0 && gwcnum > this.product.perlimitdan) {
+					app.error('每单限购'+this.product.perlimitdan+'件');
+					gwcnum = this.product.perlimitdan;
+				}
+				
+				this.gwcnum = gwcnum;
+			},
+		}
+	}
+</script>
+<style lang="scss">
+.uibuydialog {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	z-index: 9999990;
+}
+.buydialog-mask{ position: fixed; top: 0rem; left: 0rem; width: 100%; background: rgba(0,0,0,0.5); bottom: 0rem;z-index:10}
+.buydialog {
+	position: fixed;
+	width: 100%;
+	left: 0;
+	bottom: 0;
+	background: #fff;
+	z-index:9999995;
+	padding: 0 24rpx 28rpx;
+	padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));	
+	border-radius:20rpx 20rpx 0 0;
+	&-close {
+		position: absolute;
+		top: 26rpx;
+		right: 26rpx;
+		z-index:12;
+		&__img {
+			width: 28rpx;
+			height:28rpx;
+		}
+	}
+	&-product {
+		padding: 16rpx 6rpx;
+		border-bottom: 1rpx solid #F4F4F4;
+		&__img {
+			flex-shrink: 0;
+			width: 204rpx;
+			height:204rpx;
+			border-radius: 10rpx;
+			margin-right: 24rpx;
+		}
+		&__price {
+			margin-top: 34rpx;
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #ED5925;
+			line-height: 32rpx;
+			.original-price {
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 34rpx;
+				font-weight: normal;
+				text-decoration:line-through;
+				margin-left: 20rpx;
+			}
+		}
+		&__stock,&__choosename {
+			font-size: 26rpx;
+			color: #999999;
+			line-height: 36rpx;
+			margin-top: 12rpx;
+		}
+		&__choosename {
+			margin-top: 16rpx;
+		}
+	}
+	.installment-price {
+		margin-top: 10rpx;
+		font-size: 24rpx;
+		line-height: 32rpx;
+	}
+	&-specification{
+		padding-top: 28rpx;
+		&__name {
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #333333;
+			line-height: 40rpx;
+			margin-bottom: 20rpx;
+		}
+		&__list {
+			flex-wrap:wrap;
+			margin-bottom: -10rpx;
+		}
+		&__item {
+			background: #F4F4F4;
+			color:#666666;
+			margin-right: 10rpx;
+			margin-bottom: 10rpx;
+			border-radius: 8rpx;
+			padding: 0 16rpx;
+			font-size: 24rpx;
+			line-height: 60rpx;
+			&.on {
+				color: #0A5D3B;
+				background: #E2F7EF;
+			}
+		}
+	}
+	&-buynum {
+		padding-top: 28rpx;
+		font-size: 28rpx;
+		color: #333333;
+		font-weight: bold;
+		line-height: 56rpx;
+		&__btn {
+			border: 1rpx solid #CCCCCC;
+			border-radius: 6rpx;
+			width: 96px;
+			.sub-btn,.add-btn {
+				width: 56rpx;
+				height: 56rpx;
+				flex-shrink: 0;
+				.iconfont {
+					font-size: 26rpx;
+					color: #333333;
+					&.disabled {
+						color: #CCCCCC;
+					}
+					&.icon-shanchu1 {
+						font-size: 24rpx;
+						transform: rotate(45deg);
+					}
+				}
+			}
+			.num {
+				height: 56rpx;
+				padding: 0 10rpx;
+				text-align: center;
+				border-left: 1rpx solid #CCCCCC;				
+				border-right: 1rpx solid #CCCCCC;
+			}
+		}
+	}
+	&-ft {
+		&__tips {
+			margin-top:20rpx;
+			font-size: 22rpx;
+			line-height: 32rpx;
+			.commission {
+				font-weight: bold;
+				padding: 0 3rpx;
+			}
+		}
+		&__btns {
+			margin-top: 32rpx;
+			border-radius: 40rpx;
+			overflow: hidden;
+		}
+		&__btn {
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size:28rpx;
+			font-weight:bold;
+			color: #fff;
+			&:first-child {border-top-left-radius: 40rpx;border-end-start-radius: 40rpx;}
+			&:last-child {border-top-right-radius: 40rpx;border-end-end-radius: 40rpx;}
+			&.nostock{
+				background:#ccc;
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/cart-full/cart-full.vue b/components/cart-full/cart-full.vue
new file mode 100644
index 0000000..a0920fa
--- /dev/null
+++ b/components/cart-full/cart-full.vue
@@ -0,0 +1,300 @@
+<template>
+	<view class="purchase">
+		<view class="purchase-smk"  @touchmove.stop.prevent="movePrevent" @tap="close"></view>
+		<view class="purchase-box">
+			<view class="purchase-box-title">清理下就能成功加购</view>
+			<view class="purchase-box-pind">购物车已满</view>
+			<view class="purchase-box-cont">
+				<view class="purchase-box-itm">
+					<view class="purchase-box-mgb">
+						<image :src="datails[listIndx].pic" mode="aspectFill"></image>
+						<text class="mgb-tx">{{datails[listIndx].createtime}}加购</text>
+					</view>
+					<view class="purchase-box-btx" @tap="refresh">
+						<text class="iconfont icon-shuaxin"></text>
+						<text class="">换一个</text>
+					</view>
+				</view>
+				<view class="purchase-box-ct">
+					<view class="icon-bd">
+						<text class="iconfont icon-youjiantou"></text>
+					</view>
+				</view>
+				<view class="purchase-box-itm">
+					<view class="purchase-box-mgb bg-lig" :style="{'background-color':t('color1')}" style="border-radius: 50%;">
+						<text class="iconfont icon-shoucangjia"></text>
+					</view>
+					<view class="purchase-box-btx">
+						<text class="">移入收藏夹</text>
+					</view>
+				</view>
+			</view>
+			<button class="purchase-btn" type="default" :style="{'background-color':t('color1')}" @tap="confirm">确认加购</button>
+		</view>
+		<view class="show-t" v-show="showText_box">
+			<view class="">{{showText_t}}</view>
+			<view class="">{{showText_b}}</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	var app = getApp();
+	export default  {
+		
+		props: {
+			
+			purchaseDetail: {
+				type: Array,
+				default: []
+			},
+			goodscart: {
+				type: Object,
+				default: {},
+			},
+
+		},
+		data() {
+			return {
+				datails: this.purchaseDetail,
+				listIndx: 0,
+				timeout: null,
+				showText_box: true,
+				showText_t: '您的购物车商品总数已满',
+				showText_b: '请先清理后继续加入购物车',
+			}
+		},
+		mounted(){
+			this.timeout = setTimeout(() => {
+				this.showText_box = false
+			}, 1500)
+			// app.error('您的购物车商品总数已满，请先清理后继续加入购物车', 1500);
+		},
+		beforeDestroy() {
+			clearTimeout(this.timeout)
+		},
+		methods: {
+			movePrevent(){
+				return true
+			},
+			close() {
+				this.$emit('closePur', false)
+			},
+			refresh() {
+				this.listIndx++
+				if(this.listIndx == this.datails.length ) {
+					this.listIndx = 0
+				}
+			},
+			// 移除购物车
+			delCard(ids) {
+				app.post('ApiShop/cartdelete', {ids: ids}, (data) => {
+					this.addCard()
+				})
+			},
+			// 加入购物车
+			addCard() {
+				app.post('ApiShop/addcart', {
+					proid: this.goodscart.proid,
+					ggid: this.goodscart.ggid,
+					num: this.goodscart.num,
+					}, res => {
+						if (res.status == 1) {
+							app.success('添加成功');
+							this.$emit('closePur', false)
+							this.$emit('favorite', 1)
+						} else {
+							let massg = null
+							this.showText_box = true
+							// app.error(res.msg);
+							if(res.msg.indexOf('，') != -1) {
+								massg = res.msg.split('，')
+								this.showText_t = massg[0]
+								this.showText_b = massg[1]
+								this.timeout = setTimeout(() => {
+									this.showText_box = false
+								}, 1500)
+							}else {
+								this.showText_t = res.msg
+								this.showText_b = ''
+								this.timeout = setTimeout(() => {
+									this.showText_box = false
+								}, 1500)
+							}
+							
+						}
+					
+				});
+			},
+			// 确认加购
+			confirm() {
+				let ids = []
+				ids.push(this.datails[this.listIndx].cartid)
+				clearTimeout(this.timeout)
+				if (this.datails[this.listIndx].isfavorite) {
+					this.delCard(ids)
+				}else {
+					app.post('ApiShop/addfavorite', {
+						proid: this.datails[this.listIndx].goodsid,
+						type: 'shop'
+					}, data => {
+						if (data.status == 1 && data.msg == '已收藏') {
+							this.delCard(ids)
+						}
+					});
+				}
+
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+	.purchase {
+		width: 100%;
+		height: 100%;
+	}
+	/* 购物车已满弹框 */
+	.purchase-smk {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 9999;
+		background-color: rgba(0, 0, 0, 0.3);
+		
+	}
+		.purchase-box {
+			width: 600rpx;
+			height: 600rpx;
+			padding: 0 54rpx;
+			font-size: 32rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-evenly;
+			position: fixed;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+			background-color: #fff;
+			border-radius: 28rpx;
+			z-index: 10000;
+			
+			
+			.purchase-box-title {
+				font-size: 40rpx;
+				font-weight: bold;
+			}
+			.purchase-box-pind {
+				color: #666666;
+			}
+			.purchase-box-cont {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				
+				.purchase-box-itm {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+	
+					.purchase-box-mgb {
+						width: 174rpx;
+						height:174rpx;
+						overflow: hidden;
+						border-radius: 16rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						position: relative;
+						image {
+							width: 100%;
+							height: 100%;
+						}
+						
+						.mgb-tx {
+							width: 100%;
+							height: 44rpx;
+							font-size: 28rpx;
+							line-height: 44rpx;
+							text-align: center;
+							border-radius: 8rpx 8rpx 0 0;
+							background-color: rgba(228, 228, 228, 0.7);
+							position: absolute;
+							left: 0;
+							bottom: 0;
+						}
+						
+						.icon-shoucangjia {
+							color: #fff;
+							font-size: 94rpx;
+						}
+					}
+					.bg-lig {
+						    background-image: linear-gradient(to bottom right, #FFEE96, #EFBD6F);
+					}
+				}
+				.purchase-box-ct {
+					height: 100%;
+					display: flex;
+					.icon-youjiantou {
+						font-size: 72rpx;
+						color: #f7deb7;
+					}
+					.icon-bd {
+						height:174rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+				}
+	
+				.purchase-box-btx {
+					width: 100%;
+					padding-top: 20rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					color: #999;
+					
+					.icon-shuaxin {
+						    font-size: 36rpx;
+							padding-top: 4rpx;
+						    padding-right: 10rpx;
+					}
+				}
+			}
+			.purchase-btn {
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				font-size: 32rpx;
+				border-radius: 800rpx;
+				color: #fff;
+			}
+		}
+	.show-t {
+		min-width: 400rpx;
+		padding: 30rpx;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		color: #fff;
+		// text-align: center;
+		line-height: 50rpx;
+		position: fixed;
+		left: 50%;
+		top: 50%;
+		z-index: 10001;
+		transform:  translate(-50%, -50%);
+		background-color: #595959cc;
+	}
+</style>
\ No newline at end of file
diff --git a/components/couponlist/couponlist.vue b/components/couponlist/couponlist.vue
new file mode 100644
index 0000000..a2ede6f
--- /dev/null
+++ b/components/couponlist/couponlist.vue
@@ -0,0 +1,119 @@
+<template>
+<view class="couponlist">
+	<view v-for="(item, index) in couponlist" :key="index" class="coupon" :style="couponstyle">
+		<view :class="item.type==1?'pt_img1':'pt_img2'"></view>
+		<view class="pt_left" @tap="goto" :data-url="'../coupon/coupondetail?'+(choosecoupon?'rid':'id')+'=' + item.id">
+			<view class="pt_left-content">
+				<view class="f1" v-if="item.type==1" :style="{color:t('color1')}"><text class="t0">￥</text><text class="t1">{{item.money}}</text></view>
+				<view class="f1" v-if="item.type==2" :style="{color:t('color1')}">礼品券</view>
+				<view class="f1" v-if="item.type==3" :style="{color:t('color1')}"><text class="t1">{{item.limit_count}}</text><text class="t2">次</text></view>
+				<view class="f1" v-if="item.type==4" :style="{color:t('color1')}">抵运费</view>
+						<view class="f1" :style="{color:t('color1')}" v-if="item.type==5"><text class="t0">￥</text><text class="t1">{{item.money}}</text></view>
+				<view class="f2" v-if="item.type==1 || item.type==4 || item.type==5">
+					<text v-if="item.minprice>0">满{{item.minprice}}元可用</text>
+					<text v-else>无门槛</text>
+				</view>
+			</view>
+		</view>
+		<view class="pt_right">
+			<view class="f1">
+				<view class="t1">{{choosecoupon ? item.couponname : item.name}}</view>
+				<text class="t2" v-if="item.type==1" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}">代金券</text>
+				<text class="t2" v-if="item.type==2" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}">礼品券</text>
+				<text class="t2" v-if="item.type==3" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}">计次券</text>
+				<text class="t2" v-if="item.type==4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}">运费抵扣券</text>
+						<text class="t2" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="item.type==5">餐饮券</text>
+				<view class="t4" v-if="item.bid>0">适用商家：{{item.bname}}</view>
+				<view class="t3" :style="item.bid>0?'margin-top:0':'margin-top:10rpx'">有效期至 {{choosecoupon ? date(item.endtime) : date(item.yxqdate)}}</view>
+			</view>
+			<block v-if="choosecoupon">
+				<button class="btn" style="width:160rpx;background:#555" @tap="chooseCoupon" :data-rid="item.id" :data-key="index" v-if="selectedrid==item.id">取消选择</button>
+				<button class="btn" style="width:160rpx;" :style="{background:'linear-gradient(270deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="chooseCoupon" :data-rid="item.id" :data-key="index" v-else>选择使用</button>
+			</block>
+			<block v-else>
+				<button class="btn" v-if="item.haveget>=item.perlimit" style="background:#9d9d9d">已领取</button>
+				<button class="btn" v-else-if="item.stock<=0" style="background:#9d9d9d">已抢光了</button>
+				<button class="btn" v-else :style="{background:'linear-gradient(270deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="getcoupon" :data-id="item.id" :data-price="item.price" :data-score="item.score" :data-key="index">领取</button>
+			</block>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+
+			}
+		},
+		props: {
+			menuindex:{default:-1},
+			couponlist:{},
+			couponstyle:{default:''},
+			bid:{default:''},
+			selectedrid:{default:''},
+			choosecoupon:{default:false}
+		},
+		methods: {
+			getcoupon:function(e){
+				var that = this
+				var id = e.currentTarget.dataset.id;
+				var score = e.currentTarget.dataset.score;
+				var price = e.currentTarget.dataset.price;
+				if(price > 0){
+					app.goto('buycoupon?id='+id);
+					return ;
+				}
+				if(score > 0){
+					app.confirm('确定要消耗'+score+''+that.t('积分')+'兑换吗?',function(){
+						app.showLoading('兑换中');
+						app.post('ApiCoupon/getcoupon',{id:id},function(data){
+							app.showLoading(false);
+							if(data.status==0){
+								app.error(data.msg);
+							}else{
+								app.success(data.msg);
+								that.$emit('getcoupon');
+							}
+						});
+					})
+				}else{
+					app.showLoading('领取中');
+					app.post('ApiCoupon/getcoupon',{id:id},function(data){
+						app.showLoading(false);
+						if(data.status==0){
+							app.error(data.msg);
+						}else{
+							app.success(data.msg);
+							that.$emit('getcoupon');
+						}
+					});
+				}
+			},
+			chooseCoupon:function(e){
+				var rid = e.currentTarget.dataset.rid
+				var key = e.currentTarget.dataset.key
+				this.$emit('chooseCoupon',{rid:rid,bid:this.bid,key:key});
+			}
+		}
+	}
+</script>
+<style>
+.couponlist{width:94%;margin:0 3%;padding:20rpx}
+.coupon{width:100%;display:flex;margin-bottom:20rpx;border-radius:10rpx;overflow:hidden;border:1px solid #eee}
+.coupon .pt_left{background: #fff;height:200rpx;color: #FFF;width:30%;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.coupon .pt_left-content{width:100%;height:100%;margin:30rpx 0;border-right:1px solid #EEEEEE;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.coupon .pt_left .f1{font-size:40rpx;font-weight:bold;text-align:center;}
+.coupon .pt_left .t0{padding-right:0;}
+.coupon .pt_left .t1{font-size:60rpx;}
+.coupon .pt_left .t2{padding-left:10rpx;}
+.coupon .pt_left .f2{font-size:20rpx;color:#4E535B;text-align:center;}
+.coupon .pt_right{background: #fff;width:70%;display:flex;height:200rpx;text-align: left;padding:20rpx 20rpx;position:relative}
+.coupon .pt_right .f1{flex-grow: 1;flex-shrink: 1;}
+.coupon .pt_right .f1 .t1{font-size:28rpx;color:#2B2B2B;font-weight:bold;height:60rpx;line-height:60rpx;overflow:hidden}
+.coupon .pt_right .f1 .t2{display:inline-block;height:36rpx;line-height:36rpx;font-size:20rpx;font-weight:bold;padding:0 16rpx;border-radius:4rpx}
+.coupon .pt_right .f1 .t3{font-size:20rpx;color:#999999;height:46rpx;line-height:46rpx;}
+.coupon .pt_right .f1 .t4{font-size:20rpx;color:#999999;height:46rpx;line-height:46rpx;}
+.coupon .pt_right .btn{position:absolute;right:30rpx;top:50%;margin-top:-28rpx;border-radius:28rpx;width:160rpx;height:56rpx;line-height:56rpx;color:#fff}
+</style>
\ No newline at end of file
diff --git a/components/dd-search/dd-search.vue b/components/dd-search/dd-search.vue
new file mode 100644
index 0000000..bc1bfbb
--- /dev/null
+++ b/components/dd-search/dd-search.vue
@@ -0,0 +1,49 @@
+<template>
+	<view class="topsearch flex-y-center" :style="{background:bgColorOut,position:isfixed?'fixed':''}" >
+		<view class="f1 flex-y-center" :style="{background:bgColorIn}">
+			<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+			<input :value="keyword" :placeholder="placeholderText" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+		</view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		name:"dd-search",
+		data() {
+			return {
+				keyword:'',
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			isfixed:{default:false},
+			placeholderText:{default:'请输入关键字搜索'},
+			bgColorOut:{default:'#fff'},
+			bgColorIn:{default:'#f6f6f6'},
+			scroll:{default:false}
+		},
+		methods:{
+			changetab:function(e){
+				var st = e.currentTarget.dataset.st;
+				this.$emit('changetab',st);
+			},
+			searchChange: function (e) {
+				this.keyword = e.detail.value;
+			},
+			searchConfirm: function (e) {
+				var keyword = e.detail.value;
+				var loadmore = false;
+				this.$emit('getdata',loadmore,keyword);
+			}
+		}
+	}
+</script>
+
+<style>
+.topsearch{padding: 16rpx 3% 8rpx; width: 100%;top:0; z-index: 11;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+</style>
diff --git a/components/dd-tab/dd-tab.vue b/components/dd-tab/dd-tab.vue
new file mode 100644
index 0000000..02c7394
--- /dev/null
+++ b/components/dd-tab/dd-tab.vue
@@ -0,0 +1,44 @@
+<template>
+	<view class="dd-tab" :style="isfixed?'position:fixed;':''" v-if="!scroll">
+		<view v-for="(item,index) in itemdata" class="item" :class="st==itemst[index]?'on':''" @tap="changetab" :data-st="itemst[index]">{{item}}<view class="after" :style="{background:color1?color1:t('color1')}"></view></view>
+	</view>
+	<view :style="isfixed?'position:fixed;':''" v-else class="dd-tab2">
+		<scroll-view scroll-x="true">
+		<view class="dd-tab2-content">
+			<view v-for="(item,index) in itemdata" class="item" :class="st==itemst[index]?'on':''" @tap="changetab" :data-st="itemst[index]">{{item}}<view class="after" :style="{background:color1?color1:t('color1')}"></view></view>
+		</view>
+		</scroll-view>
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			isfixed:{default:false},
+			itemdata:{default:{}},
+			itemst:{default:{}},
+			st:{default:0},
+			color1:'',
+			scroll:{default:true}
+		},
+		methods:{
+			changetab:function(e){
+				var st = e.currentTarget.dataset.st;
+				this.$emit('changetab',st);
+			}
+		}
+	}
+</script>
+<style>
+.dd-tab{display:flex;width:100%;height:90rpx;background: #fff;top:var(--window-top);z-index:11;}
+.dd-tab .item{flex:1;font-size:28rpx; text-align:center; color:#666; height: 90rpx; line-height: 90rpx;overflow: hidden;position:relative}
+.dd-tab .item .after{display:none;position:absolute;left:50%;margin-left:-16rpx;bottom:10rpx;height:3px;border-radius:1.5px;width:32rpx}
+.dd-tab .on{color: #323233;}
+.dd-tab .on .after{display:block}
+.dd-tab2{width:100%;height:90rpx;background: #fff;top:var(--window-top);z-index:11;}
+.dd-tab2 scroll-view {overflow: visible !important}
+.dd-tab2-content{flex-grow: 0;flex-shrink: 0;display:flex;align-items:center;flex-wrap:nowrap;color:#999999;position:relative;}
+.dd-tab2-content .item{flex-grow:1;min-width:140rpx;flex-shrink: 0;height: 90rpx; line-height: 90rpx;text-align:center;position:relative;padding:0 14rpx}
+.dd-tab2-content .item .after{display:none;position:absolute;left:50%;margin-left:-20rpx;bottom:10rpx;height:3px;border-radius:1.5px;width:40rpx}
+.dd-tab2-content .on{color: #323233;}
+.dd-tab2-content .on .after{display:block}
+</style>
\ No newline at end of file
diff --git a/components/diary-falls-list/diary-falls-list.vue b/components/diary-falls-list/diary-falls-list.vue
new file mode 100644
index 0000000..7a0c1db
--- /dev/null
+++ b/components/diary-falls-list/diary-falls-list.vue
@@ -0,0 +1,443 @@
+<template>
+	<view class="free-panel-title" style="padding-top: 4rpx; display: flex; justify-content: space-between;">
+		<view class="free-WaterfallFlow" :style="{'display':datalist.length < 3?'flex':'','justify-content':datalist.length < 3?'space-between':''}">
+		  <block v-for="(item,index) in datalist" :key="index">
+			<view v-if="(index % 2 )== 0"  @click.stop="toDetail(item)" class="flex-wrap">
+				<view class="position-r flex">
+					<image mode="aspectFill"  v-if="item.pics || item.coverimg"  :src="item.pics ? item.pics[0]:item.coverimg"  ></image>
+					<view style="width: 100%; height: 330rpx; line-height: 330rpx; " v-else >
+						<view style="color: #ccc;">
+							<text style="font-size: 100rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text>
+						</view>
+					</view>
+					<view class="del " v-if="navType && item.is_del == 1 && (recType == 3 || recType == 4)">
+				<!-- 		<view class="bo-f position-a" v-if="navType == 'video'">
+							<text class="iconfont icon-bofang"></text>
+						</view> -->
+						<view class="sold-out position-a">
+							{{navType == 'note'  ? '笔记已删除':'视频已删除'}}
+						</view>
+					</view>
+					<view class="position-a bf-btn position-center flex" v-else-if="navType == 'video' &&  navNoteType != '3'">
+						<image class="bf-img" :src="event_rul + '/static/images/bl/bofang-ic.png'" mode="widthFix"></image>
+					</view>
+					
+					<view class="z-smk" v-if="navNoteType == '3'" @tap="toEide(item)">
+						<view class="play" v-if="item.binfo">
+							<text class="iconfont icon-bofang"></text>
+						</view>
+						<view class="f-box">
+							<text class="iconfont icon-bianji"></text>
+							<text>点击编辑</text>
+							<view class="tx-g">
+								{{item.binfo? '有篇视频待发布': '有篇笔记待发布'}}
+								<text class="iconfont icon-arrow-right"></text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+
+				<view class="title" :class="navNoteType == '3' ? 'font-w': ''">{{item.title ||item.name|| '无'}}</view>
+				<view class="info">
+					<view class="left" v-if="navNoteType != '3'" @click.stop="goto" :data-url="'/diary/info/info?id='+item.mid">
+						<!-- v-if="item.headimg ||item.binfo.logo" @error='imgerr($event,item)' -->
+						<image  :src="item.headimg ||item.binfo.logo" mode="aspectFill"></image>
+						<!-- <text v-else class="iconfont icon-tupianjiazaishibai"></text> -->
+						<text class="name">{{item.nickname ||item.binfo.name||''}}</text>
+					</view>
+					<view class="left" v-else>
+						{{item.createtime}}
+					</view>
+					<view @click.stop="" v-if="navNoteType != '3'">
+						<view class="right" @click="zan(item,index)">
+							<text  v-if="!item.iszan" class="iconfont icon-aixin"></text>
+							<text v-else style="color: red;" class="iconfont icon-aixin_shixin"></text>	
+							<text>{{item.zan >= 10000 || item.zan_num >= 10000 ? ((item.zan / 10000).toFixed(1)+'万')||((item.zan_num / 10000).toFixed(1)+'万'): (item.zan || item.zan_num || 0)}}</text>
+						</view>
+					</view>
+					<image v-else class="prodel-img" :src="event_rul + '/static/img/static/img/del.png'" @tap="delDrafts(item)" />
+				</view>
+			</view>
+		  </block>
+		</view>
+	
+	<view class="free-WaterfallFlow" :style="{'display':datalist.length < 3?'flex':'','justify-content':datalist.length < 3?'space-between':''}">
+	  <block v-for="(item,index) in datalist" :key="index">
+		<view v-if="(index % 2 ) != 0" @click="toDetail(item)" class="flex-wrap">
+			<view class="position-r flex">
+				<image mode="aspectFill"  v-if="item.pics || item.coverimg"  :src="item.pics ? item.pics[0] :item.coverimg"  ></image>
+				<view style="width: 100%; height: 330rpx; line-height: 330rpx; " v-else >
+					<view style="color: #ccc;">
+						<text style="font-size: 100rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text>
+					</view>
+				</view>
+				<view class="del " v-if="navType && item.is_del == 1 && (recType == 3 || recType == 4) ">
+					<view class="bo-f position-a" v-if="navType == 'video'">
+						<text class="iconfont icon-bofang"></text>
+					</view>
+					<view class="sold-out position-a">
+						{{navType == 'note'  ? '笔记已删除':'视频已删除'}}
+					</view>
+				</view>
+				<view class="position-a bf-btn position-center flex" v-else-if="navType == 'video' &&  navNoteType != '3'">
+					<image class="bf-img" :src="event_rul + '/static/images/bl/bofang-ic.png'" mode="widthFix"></image>
+				</view>
+				<view class="z-smk" v-if="navNoteType == '3'" @tap="toEide(item)">
+					<view class="play" v-if="item.binfo">
+						<text class="iconfont icon-bofang"></text>
+					</view>
+					<view class="f-box">
+						<text class="iconfont icon-bianji"></text>
+						<text>点击编辑</text>
+						<view class="tx-g">
+							{{item.binfo? '有篇视频待发布': '有篇笔记待发布'}}
+							<text class="iconfont icon-arrow-right"></text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="title" :class="navNoteType == '3' ? 'font-w': ''">{{item.title ||item.name|| '无'}}</view>
+			<view class="info">
+				<view class="left" v-if="navNoteType != '3'" @click.stop="goto" :data-url="'/diary/info/info?id='+item.mid">
+					<image :src="item.headimg ||item.binfo.logo" mode=""></image>
+					<text class="name">{{item.nickname ||item.binfo.name||''}}</text>
+				</view>
+				<view class="left" v-else>
+					{{item.createtime}}
+				</view>
+				<view @click.stop="" v-if="navNoteType != '3'">
+					<view class="right" @click="zan(item,index)">
+						<text  v-if="!item.iszan" class="iconfont icon-aixin"></text>
+						<text v-else style="color: red;" class="iconfont icon-aixin_shixin"></text>	
+						<text>{{item.zan >= 10000 || item.zan_num >= 10000 ? ((item.zan / 10000).toFixed(1)+'万')||((item.zan_num / 10000).toFixed(1)+'万'): (item.zan || item.zan_num || 0)}}</text>
+					</view>
+				</view>
+				<image v-else class="prodel-img" :src="event_rul + '/static/img/static/img/del.png'" @tap="delDrafts(item.id)" />
+			</view>
+		</view>
+	  </block>
+	</view>
+		
+	</view>
+</template>
+
+
+<script>
+	var app = getApp();
+export default{
+	props:{
+		datalist:{
+			default: ()=>{
+				return[]
+			}
+		},
+		navNoteType: {
+			type: String,
+			default: '1'
+		},
+		navType: {
+			type: String,
+			default: ''
+		},
+		recType: {
+			type: Number,
+			default: 0
+		}
+	},
+	data(){
+		return{
+			event_rul: app.globalData.event_url,
+		}
+	},
+	methods:{
+		editData(data) {
+			let url = 'ApiLuntan/detail'
+			let dataurl = '/diary/issue/issue?type=note'
+			if(data.binfo) {
+				url = 'ApiShortvideo/newDetail'
+				dataurl = '/diary/issue/issue?type=video'
+			}
+
+			app.post(url, {
+				id: data.id,
+				isdraft: 1
+			}, res => {
+				if(res.status == 1) {
+					if (data.binfo) {
+						uni.navigateTo({
+							url:dataurl+'&editId='+ data.id + '&detail='+JSON.stringify(res.video) + '&recordlist=' + JSON.stringify(res.proList)
+						})
+					}
+					uni.navigateTo({
+						url:dataurl+'&editId='+ data.id + '&detail='+JSON.stringify(res.detail) + '&recordlist=' + JSON.stringify(res.proList)
+					})
+
+				}
+		
+			})
+		},
+		toEide(data) {
+			this.editData(data)
+		},
+		delDrafts(data) {
+			let url = null
+			if(data.binfo) {
+				url = 'ApiShortvideo/delvideo'
+			}else {
+				url = 'ApiLuntan/deltie'
+			}
+			uni.showModal({
+				title: '提示',
+				content: '确认删除该草稿吗?',
+				confirmColor: this.t('color1'),
+				success:  (res) => {
+					if (res.confirm) {
+						app.get(url,{id:data.id},(res)=>{
+							if(res.status == 1) {
+								this.datalist.forEach((item,idx) => {
+									if(data.id == item.id) {
+										this.$emit('delDrafts', idx)
+									}
+								})
+								app.error(res.msg)
+							}else {
+								app.error(res.msg)
+							}
+						})
+					} else if (res.cancel) {
+						
+					}
+				}
+			});
+
+
+		},
+		imgerr(e,item){
+			if(item.binfo){
+				this.binfo.logo = ''
+			}else{
+				item.headimg = ''
+				// this.datalist = JSON.parse(JSON.stringify(this.datalist))
+			}
+		},
+		zan: function (item,index) {
+		 if(item.is_del == 1 && recType == 3) {
+			 return
+		 }
+		 var that = this
+		 		
+				if(item.binfo){
+					app.post('ApiShortvideo/zan',{id:item.id},function(res){
+						that.$emit('listZanFn',{index:index,show:!item.iszan?1:0,num:item.iszan?--item.zan_num:++item.zan_num})
+						
+					});
+				}else{
+					app.post("ApiLuntan/zan", {id: item.id}, function (res) {
+					 that.$emit('listZanFn',{index:index,show:!item.iszan?1:0,num:item.iszan?--item.zan:++item.zan})
+										
+					});
+				}
+	
+		},
+		toDetail(item){
+			if(this.navNoteType == '3') {
+				return
+			}
+			let url = '/activity/luntan/detail?type=note'
+			if(item.binfo){
+				url = '/activity/shortvideo/detail?type=video'
+			}
+			if(this.navType && item.is_del == 1 && this.recType == 3) {
+				this.$emit('shopdel',{show: true ,id:item.id, deltype: this.navType})
+			}else {
+				uni.navigateTo({
+					url:url+'&id='+item.id
+				})
+			}
+
+		},
+	
+	
+	},
+}
+</script>
+<style scoped lang="scss">
+  	.free-WaterfallFlow{
+  		width: 340rpx;
+  	}
+  	.free-WaterfallFlow .flex-wrap{
+  		display: inline-block;
+  		width:100%;
+  		margin-bottom: 24rpx;	
+		overflow: hidden;
+		background-color: #fff;
+		border-radius: 10rpx;
+  	}
+  	.flex-wrap image{
+  		width:100%;
+		height: 340rpx;
+  	}
+ 	.flex-wrap .title{
+  		font-size:28rpx;
+		padding: 24rpx 20rpx 20rpx;
+  		color:#333;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		/* autoprefixer: ignore next; */
+		-webkit-box-orient: vertical;
+		text-align: justify;
+		white-space: pre-wrap;
+		word-break: break-all;
+  	}
+  	.flex-wrap .info{
+	justify-content: space-between;
+	padding:  0 16rpx 20rpx;
+	display: flex;
+	color: #999;
+	align-items: center;
+	.left{
+		display: flex;
+		align-items: center;
+		font-size: 24rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		flex: 1;
+		image{
+			width: 36rpx;
+			height: 36rpx;
+			border-radius: 36rpx;
+			margin-right: 6rpx;
+			border: 1px solid #cccc;
+			flex-shrink: 0;
+		}
+		.name {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			flex: 1;
+		}
+	}
+	.right{
+		flex-shrink: 0;
+		margin-left: 10rpx;
+		display: flex;
+		align-items: center;
+		color: #999;
+		font-size: 24rpx; 
+		.iconfont{
+			margin-right: 4rpx;
+		}
+	}
+	
+	.prodel-img {
+		width: 30rpx;
+		height: 30rpx;
+	}
+  	}
+	// 播放按钮
+  	.bf-btn {
+		
+		.bf-img {
+			width: 80rpx;
+		}
+	}
+  	/* 回到顶部 */
+  	.top {
+  		position: relative;
+  		display: none; /* 先将元素隐藏 */
+  	} 
+  	.topc {
+  		height: 30px; 
+  		width: 30px;
+  		position: fixed;
+  		right: 0;
+  		top: 70%;
+  	}
+	
+	.z-smk {
+		width: 100%;
+		height: 330rpx;
+		color: #fff;
+		background-color: rgba(0, 0, 0, .4);
+		position: absolute;
+		top: 0;
+		left: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 33;
+		
+		.play {
+			width: 40rpx;
+			height: 40rpx;
+			border-radius: 50%;
+			background-color: rgba(0, 0, 0, .2);
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: absolute;
+			top: 16rpx;
+			right: 16rpx;
+			
+			.icon-bofang {
+				font-size: 20rpx;
+				transform: translate(4rpx, -2rpx);
+			}
+		}
+		.f-box {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			// line-height: 50rpx;
+			font-family: serif;
+			font-size: 24rpx;
+				
+			
+			.icon-bianji {
+				font-size: 48rpx;
+				padding-bottom: 14rpx;
+			}
+			
+			.tx-g {
+				padding-top: 6rpx;
+				display: flex;
+				align-items: center;
+				
+				.icon-arrow-right {
+					padding-left: 8rpx;
+					font-size: 38rpx;
+				}
+			}
+		}
+	}
+	.font-w{font-weight: bold;}
+	.del {
+
+		
+		.bo-f {
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 200rpx;
+			background-color: rgba(0, 0, 0, .4);
+			.icon-bofang {
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translate(-40%, -50%);
+				font-size: 40rpx;
+				color: #fff;
+			}
+		}
+
+	}
+	.sold-out{top:50%;left:50%;width: 190rpx;height:68rpx;line-height: 68rpx;text-align: center;  background-color: #999999;color: #fff; border-radius: 4rpx; transform: translate(-50%, -50%);}
+</style>
\ No newline at end of file
diff --git a/components/dp-article/dp-article.vue b/components/dp-article/dp-article.vue
new file mode 100644
index 0000000..b8d4bb6
--- /dev/null
+++ b/components/dp-article/dp-article.vue
@@ -0,0 +1,99 @@
+<template>
+<view class="dp-article" :style="{
+	backgroundColor:params.bgcolor,margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+	<!--单排-->
+	<view v-if="params.style=='1'" class="article-item1" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/pagesA/article/detail?id='+item.artid">
+		<view class="article-pic" v-if="params.showpic==1">
+			<image class="image" :src="item.pic" mode="widthFix"/>
+		</view>
+		<view class="article-info">
+			<view class="p1">{{item.name}}</view>
+			<view class="p2">
+				<text style="overflow:hidden" class="flex1" v-if="params.showtime==1">{{item.createtime}}</text>
+				<text style="overflow:hidden" v-if="params.showreadcount==1">阅读 {{item.readcount}}</text>
+			</view>
+		</view>
+	</view>
+	<!--双排-->
+	<view v-if="params.style=='2'" class="article-item2" v-for="(item,index) in data" :style="{marginRight:index%2==0?'2%':'0'}" :key="item.id" @click="goto" :data-url="'/pagesA/article/detail?id='+item.artid">
+		<view class="article-pic" v-if="params.showpic==1">
+			<image class="image" :src="item.pic" mode="widthFix"/>
+		</view>
+		<view class="article-info">
+			<view class="p1">{{item.name}}</view>
+			<view class="p2">
+				<text style="overflow:hidden" class="flex1" v-if="params.showtime==1">{{item.createtime}}</text>
+				<text style="overflow:hidden" v-if="params.showreadcount==1">阅读 {{item.readcount}}</text>
+			</view>
+		</view>
+	</view>
+	<!--左图-->
+	<view v-if="params.style=='4'" class="article-itemlist" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/pagesA/article/detail?id='+item.artid">
+		<view class="article-pic" v-if="params.showpic==1">
+			<image class="image" :src="item.pic" mode="widthFix"/>
+		</view>
+		<view class="article-info">
+			<view class="p1">{{item.name}}</view>
+			<view class="p2">
+				<text style="overflow:hidden" class="flex1" v-if="params.showtime==1">{{item.createtime}}</text>
+				<text style="overflow:hidden" v-if="params.showreadcount==1">阅读 {{item.readcount}}</text>
+			</view>
+		</view>
+	</view>
+	<!--右图-->
+	<view v-if="params.style=='5'" class="article-itemlist" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/pagesA/article/detail?id='+item.artid">
+		<view class="article-info" style="padding-left:10rpx">
+			<view class="p1">{{item.name}}</view>
+			<view class="p2">
+				<text style="overflow:hidden" class="flex1" v-if="params.showtime==1">{{item.createtime}}</text>
+				<text style="overflow:hidden" v-if="params.showreadcount==1">阅读 {{item.readcount}}</text>
+			</view>
+		</view>
+		<view class="article-pic" v-if="params.showpic==1">
+			<image class="image" :src="item.pic" mode="widthFix"/>
+		</view>
+	</view>
+	<waterfall-article v-if="params.style=='6'" :list="data" ref="waterfall" :showtime="params.showtime" :showreadcount="params.showreadcount" idKey="artid"></waterfall-article>
+
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-article{height: auto; position: relative;overflow: hidden; padding:10rpx 0px; background: #fff;}
+.dp-article .article-item1 {width: 100%;display: inline-block;position: relative;margin-bottom:12rpx;background: #fff;border-radius:12rpx;overflow:hidden}
+.dp-article .article-item1 .article-pic {width:100%;height:auto;overflow:hidden;background: #ffffff;}
+.dp-article .article-item1 .article-pic .image{width: 100%;height:auto}
+.dp-article .article-item1 .article-info {padding:10rpx 20rpx;}
+.dp-article .article-item1 .article-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.dp-article .article-item1 .article-info .t1{word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: block;font-size: 32rpx;}
+.dp-article .article-item1 .article-info .t2{word-break: break-all;text-overflow: ellipsis;padding-top:4rpx;overflow:hidden;}
+.dp-article .article-item1 .article-info .p2{flex-grow:0;flex-shrink:0;display:flex;padding:10rpx 0;font-size:24rpx;color:#a88;overflow:hidden}
+
+.dp-article .article-item2 {width: 49%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:8rpx;}
+/*.article-item2:nth-child(even){margin-right:2%}*/
+.dp-article .article-item2 .article-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom:70%;position: relative;border-radius:8rpx 8rpx 0 0;}
+.dp-article .article-item2 .article-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-article .article-item2 .article-info {padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.dp-article .article-item2 .article-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.dp-article .article-item2 .article-info .p2{flex-grow:0;flex-shrink:0;display:flex;align-items:center;padding-top:10rpx;font-size:24rpx;color:#a88;overflow:hidden}
+
+.dp-article .article-itemlist {width:100%;display: inline-block;position: relative;margin-bottom:12rpx;padding:12rpx;background: #fff;display:flex;border-radius:8rpx;}
+.dp-article .article-itemlist .article-pic {width: 35%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 25%;position: relative;}
+.dp-article .article-itemlist .article-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-article .article-itemlist .article-info {width: 65%;height:172rpx;overflow:hidden;padding:0 20rpx;display:flex;flex-direction:column;justify-content:space-between}
+.dp-article .article-itemlist .article-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:92rpx}
+.dp-article .article-itemlist .article-info .p2{display:flex;flex-grow:0;flex-shrink:0;font-size:24rpx;color:#a88;overflow:hidden}
+
+.dp-article .article-waterfall-info{padding:10rpx 20rpx 20rpx 20rpx;display:flex;flex-direction:column;}
+.dp-article .article-waterfall-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.dp-article .article-waterfall-info .p2{flex-grow:0;flex-shrink:0;display:flex;align-items:center;padding-top:10rpx;font-size:24rpx;color:#a88;overflow:hidden}
+</style>
\ No newline at end of file
diff --git a/components/dp-banner/dp-banner.vue b/components/dp-banner/dp-banner.vue
new file mode 100644
index 0000000..d2634f3
--- /dev/null
+++ b/components/dp-banner/dp-banner.vue
@@ -0,0 +1,88 @@
+<template>
+<view class="dp-banner" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+	<block v-if="params.style && params.style==1">
+		<view class="sbox">
+			<view :style="{height:'40rpx'}"></view>
+			<view class="bgswiper" :style="{height:params.height*1.2+'rpx',background:'url('+data[bannerindex].imgurl+')'}"></view>
+			<swiper :autoplay="false" @change="bannerchange" :circular="true" displayMultipleItems="1" indicatorActiveColor="white" :indicatorDots="false" nextMargin="80rpx" snapToEdge="true" :style="{height:(params.height*2.2)+'rpx','padding-top':'20rpx'}">
+				<swiper-item @click="goto" :data-url="item.hrefurl" class="switem" v-for="(item,index) in data" :key="item.id" :style="{height:(params.height*2.2)+'rpx','padding-top':'20rpx'}">
+					<image class="sitem" :class="bannerindex==index?'active':'noactive'" mode="scaleToFill" :src="item.imgurl" :style="{height:(params.height*2.2-20)+'rpx'}"></image>
+				</swiper-item>
+			</swiper>
+		</view>
+	</block>
+	<block v-else>
+    <swiper class="dp-banner-swiper" :autoplay="true" :indicator-dots="false" :current="0" :style="{height:(params.height*2.2)+'rpx'}" :interval="params.interval*1000" @change="bannerchange">
+      <block v-for="item in data" :key="item.id"> 
+        <swiper-item>
+					<view :style="{height:(params.height*2.2)+'rpx',borderRadius:(params.borderradius)+'px',overflow:'hidden'}" @click="goto" :data-url="item.hrefurl">
+					<image :src="item.imgurl" class="dp-banner-swiper-img" mode="widthFix"/>
+					</view>
+				</swiper-item>
+      </block>
+    </swiper>
+	</block>
+	<view v-if="params.indicatordots=='1'" class="dp-banner-swiper-pagination" :style="{justifyContent:(params.align=='center'?'center':(params.align=='left'?'flex-start':'flex-end'))}">
+		<block v-for="(item,index) in data" :key="item.id">
+			<block v-if="params.shape==''">
+				<view v-if="bannerindex==index" class="dp-banner-swiper-shape0 dp-banner-swiper-shape0-active" :style="{backgroundColor:params.indicatoractivecolor}"></view>
+				<view v-else class="dp-banner-swiper-shape0" :style="{backgroundColor:params.indicatorcolor}"></view>
+			</block>
+			<block v-if="params.shape=='shape1'">
+				<view v-if="bannerindex==index" class="dp-banner-swiper-shape1" :style="{backgroundColor:params.indicatoractivecolor}"></view>
+				<view v-else class="dp-banner-swiper-shape1" :style="{backgroundColor:params.indicatorcolor}"></view> 
+			</block>
+			<block v-if="params.shape=='shape2'">
+				<view v-if="bannerindex==index" class="dp-banner-swiper-shape2" :style="{backgroundColor:params.indicatoractivecolor}"></view>
+				<view v-else class="dp-banner-swiper-shape2" :style="{backgroundColor:params.indicatorcolor}"></view>
+			</block>
+			<block v-if="params.shape=='shape3'">
+				<view v-if="bannerindex==index" class="dp-banner-swiper-shape3" :style="{backgroundColor:params.indicatoractivecolor}"></view>
+				<view v-else class="dp-banner-swiper-shape3" :style="{backgroundColor:params.indicatorcolor}"></view>
+			</block>
+		</block>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		data(){
+			return {"bannerindex":0}
+    },
+		props: {
+			params:{},
+			data:{}
+		},
+		methods:{
+			bannerchange:function(e){
+				var that = this
+				var idx = e.detail.current;
+				that.bannerindex = idx
+			}
+		}
+	}
+</script>
+<style>
+.dp-banner{position:relative;background:#fff}
+.dp-banner-swiper{width:100%;height:380rpx}
+.dp-banner-swiper-img{width:100%;height:auto}
+.dp-banner-swiper-pagination{padding:0 10px;bottom:12px;left:0;position:absolute;display:flex;justify-content:center;width:100%}
+.dp-banner-swiper-shape0{width:3px;height:3px;margin:0 2px!important;}
+.dp-banner-swiper-shape0-active{width:13px;border-radius:1.5px;}
+.dp-banner-swiper-shape1{width:12px;height:6px;border-radius:0;margin:0 2px}
+.dp-banner-swiper-shape2{width:8px;height:8px;border-radius:0;margin:0 2px}
+.-dp-bannerswiper-shape3{width:8px;height:8px;border-radius:50%;margin:0 2px;}
+.dp-banner-swiper-shape4{width:8px;height:3px;border-radius:50%;margin:0 1px;}
+.dp-banner-swiper-shape4-active{width:13px;border-radius:1.5px;}
+
+.sbox{overflow:hidden;position:relative}
+.switem{margin-left:40rpx;width:526rpx!important}
+.sitem{border-radius:24rpx;overflow:hidden;width:526rpx}
+.noactive{-webkit-transform:scale(.84);transform:scale(.84);transition:all .2s ease-in 0s;z-index:20}
+.active{-webkit-transform:scale(1.01);transform:scale(1.01);transition:.5s;z-index:20}
+.bgswiper{-webkit-backdrop-filter:blur(100rpx);backdrop-filter:blur(100rpx);background-origin:center center;background-repeat:no-repeat;background-size:cover;border-radius:0 0 30% 30%;-webkit-filter:blur(6rpx);filter:blur(6rpx);left:0;position:absolute;right:0;top:0;transition:.2s linear;width:100vw;}
+</style>
\ No newline at end of file
diff --git a/components/dp-blank/dp-blank.vue b/components/dp-blank/dp-blank.vue
new file mode 100644
index 0000000..3bf5921
--- /dev/null
+++ b/components/dp-blank/dp-blank.vue
@@ -0,0 +1,18 @@
+<template>
+	<view class="dp-blank" :style="{
+		height:params.height*2.2+'rpx',
+		backgroundColor:params.bgcolor,
+		margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx'
+	}"></view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+
+</style>
\ No newline at end of file
diff --git a/components/dp-business/dp-business.vue b/components/dp-business/dp-business.vue
new file mode 100644
index 0000000..9bdc2b6
--- /dev/null
+++ b/components/dp-business/dp-business.vue
@@ -0,0 +1,45 @@
+<template>
+<view class="dp-business" :style="{
+	color:params.color,
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx',
+	fontSize:(params.fontsize*2)+'rpx'
+}">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/pages/business/index?id='+item.bid">
+			<view class="f1"><image class="image" :src="item.logo"/></view>
+			<view class="f2">
+				<view class="title">{{item.name}}</view>
+				<view class="score" v-if="params.showpingfen!=='0'"><image class="image" :src="pre_url+'/static/img/star'+item.commentscore+'.png'"/>{{item.comment_score}}分</view>
+				<view class="sales" v-if="params.showsales!=='0'"><text>销量：</text>{{item.sales}}</view>
+				<view class="address" v-if="params.showjianjie=='1'"><text :decode="true">{{item.content}}</text></view>
+				<view class="address flex"><view class="flex1"><text v-if="params.showaddress!=='0'">{{item.address}}</text></view><view v-if="params.showdistance" :style="{color:t('color1')}">{{item.juli}}</view></view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data(){
+			return {
+				pre_url:getApp().globalData.pre_url
+			}
+		},
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-business{height: auto; position: relative;}
+.dp-business .item{background: #fff;padding:16rpx;overflow: hidden;margin-bottom:16rpx;display:flex;width:100%}
+.dp-business .item .f1{width:200rpx;height:200rpx; margin-right:20rpx;flex-shrink:0}
+.dp-business .item .f1 .image{ width: 100%;height:100%;border-radius:20rpx;object-fit: cover;}
+.dp-business .item .f2{flex:1}
+.dp-business .item .f2 .title{font-size:28rpx;font-weight:bold; color: #222;line-height:46rpx;margin-bottom:3px;}
+.dp-business .item .f2 .score{font-size:24rpx;color:#f99716;}
+.dp-business .item .f2 .score .image{width:140rpx; height:50rpx; vertical-align: middle;margin-bottom:3px; margin-right:3px;}
+.dp-business .item .f2 .sales{font-size:24rpx; color:#31C88E;margin-bottom:3px;}
+.dp-business .item .f2 .address{color:#999;font-size:24rpx;line-height:40rpx;margin-bottom:3px;}
+</style>
\ No newline at end of file
diff --git a/components/dp-button/dp-button.vue b/components/dp-button/dp-button.vue
new file mode 100644
index 0000000..962b8f2
--- /dev/null
+++ b/components/dp-button/dp-button.vue
@@ -0,0 +1,30 @@
+<template>
+<view class="dp-button" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx',
+	fontSize:(params.fontsize*2)+'rpx'
+}">
+	<button :style="{
+		backgroundColor:params.btnbgcolor,
+		border:'1px solid '+params.btnbordercolor,
+		fontSize:(params.btnfontsize*2)+'rpx',
+		color:params.btncolor,
+		width:(params.btnwidth*2.2)+'rpx',
+		height:(params.btnheight*2.2)+'rpx',
+		lineHeight:(params.btnheight*2.2)+'rpx',
+		borderRadius:(params.btnradius*2.2)+'rpx'
+	}" :open-type="params.hrefurl=='contact::'?'contact':(params.hrefurl=='share::'?'share':'')" @click="goto" :data-url="params.hrefurl">{{params.btntext}}</button>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-button{margin: 0 auto;background: #ff4f4f;color: #fff;margin-top: 15px;margin-bottom:10px;text-align:center}
+</style>
\ No newline at end of file
diff --git a/components/dp-collage/dp-collage.vue b/components/dp-collage/dp-collage.vue
new file mode 100644
index 0000000..9644c2a
--- /dev/null
+++ b/components/dp-collage/dp-collage.vue
@@ -0,0 +1,125 @@
+<template>
+<view class="dp-collage" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-collage-item" v-if="params.style=='1' || params.style=='2' || params.style=='3'">
+		<view class="item" v-for="(item,index) in data" :style="params.style==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (params.style==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/collage/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="params.showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">{{item.teamnum}}人团</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已拼成{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-collage-itemlist" v-if="params.style=='list'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/collage/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="params.showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+					<text class="t2" v-if="params.showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">{{item.teamnum}}人团</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已拼成{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-collage-itemline" v-if="params.style=='line'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/collage/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="params.showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">{{item.teamnum}}人团</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已拼成{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-collage{height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+.dp-collage-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-collage-item .item{display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-collage-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-collage-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-collage-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-collage-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-collage-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-collage-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-collage-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-collage-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-collage-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-collage-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-collage-item .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-collage-item .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-collage-item .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+
+.dp-collage-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-collage-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-collage-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-collage-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-collage-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-collage-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-collage-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-collage-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-collage-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-collage-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-collage-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-collage-itemlist .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-collage-itemlist .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+
+.dp-collage-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-collage-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-collage-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-collage-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-collage-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-collage-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-collage-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-collage-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-collage-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-collage-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-collage-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-collage-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-collage-itemline .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-collage-itemline .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-collage-itemline .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+</style>
\ No newline at end of file
diff --git a/components/dp-coupon/dp-coupon.vue b/components/dp-coupon/dp-coupon.vue
new file mode 100644
index 0000000..08686ac
--- /dev/null
+++ b/components/dp-coupon/dp-coupon.vue
@@ -0,0 +1,37 @@
+<template>
+<view class="dp-coupon" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+	<scroll-view scroll-x="true">
+	<view class="item">
+		<view class="coupon" v-for="item in data" :key="item.id" :style="{background:'url('+params.bgpic+')',backgroundSize:'100%'}" @click="goto" :data-url="'/pages/coupon/coupondetail?id='+item.couponid">
+			<view class="f1" :style="{color:params.titlecolor}" v-if="item.type==1"><text style="font-size:20rpx">￥</text>{{item.money}}<text style="font-size:24rpx"> {{t('优惠券')}}</text></view>
+			<view class="f1" style="[{color:params.titlecolor}]" v-if="item.type!=1"><text style="font-size:28rpx">{{item.name}}</text></view>
+			<view class="f2" style="[{color:params.remarkcolor}]" v-if="item.type==1&&item.minprice!=0">满{{item.minprice}}元可用</view>
+			<view class="f2" style="[{color:params.remarkcolor}]" v-if="item.type==1&&item.minprice==0">无门槛</view>
+			<view class="f2" style="[{color:params.remarkcolor}]" v-if="item.type==2">礼品券</view>
+			<view class="f2" style="[{color:params.remarkcolor}]" v-if="item.type==3">计次券</view>
+			<view class="f2" style="[{color:params.remarkcolor}]" v-if="item.type==4">运费抵扣券</view>
+		</view>
+	</view>
+	</scroll-view>
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{},
+			textset:{}
+		}
+	}
+</script>
+<style>
+.dp-coupon{height: auto; position: relative;}
+.dp-coupon .item{display:flex}
+.dp-coupon .item .coupon{flex-shrink:0;width:200rpx;height:120rpx;background-size:100%;color:#fff;text-align:center;margin:0 8rpx}
+.dp-coupon .item .coupon .f1{font-size:40rpx;padding-top:6rpx;margin-bottom:6rpx}
+.dp-coupon .item .coupon .f2{font-size:22rpx;color:#eee}
+</style>
\ No newline at end of file
diff --git a/components/dp-cover/dp-cover.vue b/components/dp-cover/dp-cover.vue
new file mode 100644
index 0000000..ae42bf5
--- /dev/null
+++ b/components/dp-cover/dp-cover.vue
@@ -0,0 +1,33 @@
+<template>
+<view class="dp-cover">
+	<button @click="goto" :data-url="params.hrefurl" :open-type="params.hrefurl=='contact::'?'contact':(params.hrefurl=='share::'?'share':'')" class="dp-cover-cover" :style="{
+		zIndex:10,
+		top:params.top+'vh',
+		left:params.left+'vw',
+		color:params.color,
+		backgroundColor:params.bgcolor,
+		width:(params.width*2.2)+'rpx',
+		height:(params.height*2.2)+'rpx',
+		margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+		padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx',
+		fontSize:(params.fontsize*2.2)+'rpx',
+		border:(params.border*2.2)+'rpx solid '+params.bordercolor,
+		borderRadius:(params.radius*2.2)+'rpx'
+	}">
+		<text v-if="params.style==1" style="padding:0 4rpx">{{params.text}}</text>
+		<image v-if="params.style==2" :src="params.pic" :style="{width:(params.picwidth*2.2)+'rpx',height:(params.picheight*2.2)+'rpx'}"/>
+	</button>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-cover{height: auto; position: relative;}
+.dp-cover-cover{position:fixed;z-index:99999;cursor:pointer;display:flex;align-items:center;justify-content:center;overflow:hidden}
+</style>
\ No newline at end of file
diff --git a/components/dp-cube/dp-cube.vue b/components/dp-cube/dp-cube.vue
new file mode 100644
index 0000000..73974b1
--- /dev/null
+++ b/components/dp-cube/dp-cube.vue
@@ -0,0 +1,34 @@
+<template>
+<view class="dp-cube" :style="{
+	background:params.bgcolor,height:(params.maxheight*187.5)+'rpx',margin:(params.margin_y/340*750)+'rpx '+(params.margin_x/340*750)+'rpx 0',
+	padding:(params.padding_y/340*750)+'rpx '+(params.padding_x/340*750)+'rpx'
+}">
+	<block v-for="(row,idx) in params.layout">
+		<block v-for="(col,idx2) in row">
+			<view @click="goto" :data-url="col.hrefurl" v-if="!col.isempty" :style="[{
+				position:'absolute',
+				display:'flex',
+				alignItems:'center',
+				top:(idx*(750-params.margin_y/340*750*2-params.padding_y/340*750*2)/4+params.padding_y/340*750*1)+'rpx',
+				left:(idx2*(750-params.margin_x/340*750*2-params.padding_x/340*750*2)/4+params.padding_x/340*750*1)+'rpx',
+				width:(col.cols*(750-params.margin_x/340*750*2-params.padding_x/340*750*2)/4)+'rpx',
+				height:(col.rows*(750-params.margin_y/340*750*2-params.padding_y/340*750*2)/4)+'rpx',
+				lineHeight:(col.rows*(750-params.margin_y/340*750*2-params.padding_y/340*750*2)/4)+'rpx'
+			}]">
+				<image :src="col.imgurl" style="width:100%;max-height:100%" mode="widthFix"></image>
+			</view>
+		</block>
+	</block>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-cube{height: auto; position: relative;display:block;position:relative;height:750rpx}
+</style>
\ No newline at end of file
diff --git a/components/dp-dhlist/dp-dhlist.vue b/components/dp-dhlist/dp-dhlist.vue
new file mode 100644
index 0000000..9c2e43e
--- /dev/null
+++ b/components/dp-dhlist/dp-dhlist.vue
@@ -0,0 +1,42 @@
+<template>
+<view class="dp-dhlist" :style="{
+	color:params.color,
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0'
+}">
+	<block v-for="item in data" :key="item.id">
+	<view class="dp-dhlist-item" :style="{padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'}" @click="goto" :data-url="item.hrefurl">
+		<view class="dp-dhlist-text1" :style="{fontSize:params.fontsize1*2+'rpx',color:params.color1}">
+			<image class="image" v-if="item.showicon==1" :src="item.imgurl" :style="{width:item.iconsize*2+'rpx'}" mode="widthFix"/>
+			<text v-if="item.title1!=''" class="dp-dhlist-title1">{{item.title1}}</text>
+		</view>
+		<view class="dp-dhlist-text2" :style="{fontSize:params.fontsize2*2+'rpx',color:params.color2}">{{item.title2}}</view>
+		<image :src="event_rul + '/static/img/static/img/arrowright.png'" style="width:32rpx;height:32rpx" v-if="params.arrowshow==1"/> 
+	</view>
+	</block>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		props: {
+			params:{},
+			data:{}
+		},
+		data() {
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+	}
+</script>
+<style>
+.dp-dhlist{height: auto; position: relative;}
+.dp-dhlist-item {width:100%;height: auto;overflow: hidden;display:flex;align-items:center;border-bottom:1px solid #f5f5f5}
+.dp-dhlist-item:last-child{border-bottom:0}
+.dp-dhlist-text{padding:0;}
+.dp-dhlist-text1{flex:1;display:flex;align-items:center;}
+.dp-dhlist-text1 .image{max-width:100rpx;max-height:100rpx;margin:0 0px;height:auto}
+.dp-dhlist-title1{margin:0 16rpx}
+.dp-dhlist-text2{text-align:right;height:32rpx;line-height:32rpx}
+</style>
\ No newline at end of file
diff --git a/components/dp-form/dp-form.vue b/components/dp-form/dp-form.vue
new file mode 100644
index 0000000..8832573
--- /dev/null
+++ b/components/dp-form/dp-form.vue
@@ -0,0 +1,350 @@
+<template>
+<view class="dp-form" :style="{
+	color:params.color,
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx',
+	fontSize:(params.fontsize*2)+'rpx'
+}">
+	<form @submit="editorFormSubmit" :data-formcontent="data.content" :data-tourl="params.hrefurl" :data-formid="data.id">
+		<view style="display:none">{{test}}</view>
+		<view :class="params.style==1?'dp-form-item':'dp-form-item2'" v-for="(item,idx) in data.content" :style="{borderColor:params.linecolor}" :key="item.id">
+			<view class="label">{{item.val1}}<text v-if="item.val3==1&&params.showmuststar" style="color:red"> *</text></view>
+			<block v-if="item.key=='input'">
+				<text v-if="item.val5" style="margin-right:10rpx">{{item.val5}}</text>
+				<input :type="(item.val4==1 || item.val4==2) ? 'digit' : 'text'" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx" :style="{borderColor:params.inputbordercolor}" :value="formdata['form'+idx]" @input="setfield" :data-formidx="'form'+idx"/>
+			</block>
+			<block v-if="item.key=='textarea'">
+				<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx" :style="{borderColor:params.inputbordercolor}" :value="formdata['form'+idx]" @input="setfield" :data-formidx="'form'+idx"/>
+			</block>
+			<block v-if="item.key=='radio'">
+				<radio-group class="flex" :name="'form'+idx" style="flex-wrap:wrap" @change="setfield" :data-formidx="'form'+idx">
+					<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+							<radio class="radio" :value="item1" :checked="formdata['form'+idx] && formdata['form'+idx]==item1 ? true : false"/>{{item1}}
+					</label>
+				</radio-group>
+			</block>
+			<block v-if="item.key=='checkbox'">
+				<checkbox-group :name="'form'+idx" class="flex" style="flex-wrap:wrap" @change="setfield" :data-formidx="'form'+idx">
+					<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+						<checkbox class="checkbox" :value="item1" :checked="formdata['form'+idx] && inArray(item1,formdata['form'+idx]) ? true : false"/>{{item1}}
+					</label>
+				</checkbox-group>
+			</block>
+			<block v-if="item.key=='selector'">
+				<picker class="picker" mode="selector" :name="'form'+idx" :value="editorFormdata[idx]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx" :data-formidx="'form'+idx">
+					<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+					<view v-else>请选择</view>
+				</picker>
+			</block>
+			<block v-if="item.key=='time'">
+				<picker class="picker" mode="time" :name="'form'+idx" :value="formdata['form'+idx]" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx" :data-formidx="'form'+idx">
+					<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+					<view v-else>请选择</view>
+				</picker>
+			</block>
+			<block v-if="item.key=='date'">
+				<picker class="picker" mode="date" :name="'form'+idx" :value="formdata['form'+idx]" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx" :data-formidx="'form'+idx">
+					<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+					<view v-else>请选择</view>
+				</picker>
+			</block>
+
+			<block v-if="item.key=='region'">
+				<uni-data-picker :localdata="items" popup-title="请选择省市区" :placeholder="formdata['form'+idx] || '请选择省市区'" @change="onchange" :data-formidx="'form'+idx"></uni-data-picker>
+				<!-- <picker class="picker" mode="region" :name="'form'+idx" value="" @change="editorBindPickerChange" :data-idx="idx">
+					<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view> 
+					<view v-else>请选择省市区</view>
+				</picker> -->
+				<input type="text" style="display:none" :name="'form'+idx" :value="regiondata ? regiondata : formdata['form'+idx]"/>
+			</block>
+			<block v-if="item.key=='upload'">
+				<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+				<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view class="dp-form-imgbox" v-if="editorFormdata[idx]">
+						<view class="dp-form-imgbox-close" @tap="removeimg" :data-idx="idx" :data-formidx="'form'+idx"><image :src="event_rul + '/static/img/static/img/ico-del.png'" class="image"></image></view>
+						<view class="dp-form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix" :data-idx="idx"/></view>
+					</view>
+					<view v-else class="dp-form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx" :data-formidx="'form'+idx"></view>
+				</view>
+			</block>
+		</view>
+		<view class="dp-form-item" v-if="data.payset==1">
+			<text class="label">支付金额：</text>
+			<input type="text" class="input" name="price" :value='data.price' v-if="data.priceedit==1" @input="setfield" data-formidx="price"/>
+			<text v-if="data.priceedit==0">{{data.price}}</text>
+			<text style="padding-left:10rpx">元</text>
+		</view>
+		<button @tap="editorFormSubmit" v-if="data != ''" class="dp-form-btn" :style="{backgroundColor:params.btnbgcolor,border:'1px solid '+params.btnbordercolor,fontSize:(params.btnfontsize*2)+'rpx',color:params.btncolor,width:(params.btnwidth*2.2)+'rpx',height:(params.btnheight*2.2)+'rpx',lineHeight:(params.btnheight*2.2)+'rpx',borderRadius:(params.btnradius*2.2)+'rpx'}" :data-formcontent="data.content" :data-tourl="params.hrefurl" :data-formid="data.id">{{params.btntext}}</button>
+	</form>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				pre_url:getApp().globalData.pre_url,
+				editorFormdata:[],
+				test:'test',
+				regiondata:'',
+				items: [],
+				tmplids: [],
+				submitDisabled:false,
+				formdata:{},
+				formvaldata:{},
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			params:{},
+			data:{}
+		},
+		mounted:function(){
+			var that = this;
+			app.get('ApiIndex/getCustom',{}, function (customs) {
+				var url = app.globalData.pre_url+'/static/area.json';
+				if(customs.data.includes('plug_zhiming')) {
+					url = app.globalData.pre_url+'/static/area_gaoxin.json';
+				}
+				uni.request({
+					url: app.globalData.pre_url+'/static/area.json',
+					data: {},
+					method: 'GET',
+					header: { 'content-type': 'application/json' },
+					success: function(res2) {
+						that.items = res2.data
+					}
+				});
+			});
+
+			var pages = getCurrentPages(); //获取加载的页面
+			var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+			var thispath = '/' + (currentPage.route ? currentPage.route : currentPage.__route__); //当前页面url 
+			var opts = currentPage.$vm.opt;
+			app.get('ApiForm/getlastformdata',{formid:that.data.id}, function (res) {
+				if(res && res.status == 1 && res.data){
+					var formcontent = that.data.content;
+					var editorFormdata = [];
+					var formvaldata = {};
+					formvaldata.price = that.data.price
+					for(var i in formcontent){
+						var thisval = res.data['form'+i];
+						if (formcontent[i].key == 'region') {
+							that.regiondata = thisval;
+						}
+						if (formcontent[i].key == 'selector') {
+							for(var j in formcontent[i].val2){
+								if(formcontent[i].val2[j] == res.data['form'+i]){
+									thisval = j;
+								}
+							}
+						}
+						if (formcontent[i].key == 'checkbox') {
+							if(res.data['form'+i]){
+								res.data['form'+i] = (res.data['form'+i]).split(',');
+							}else{
+								res.data['form'+i] = [];
+							}
+						}
+						editorFormdata.push(thisval);
+						formvaldata['form'+i] = thisval;
+					}
+					that.editorFormdata = editorFormdata;
+					that.formvaldata = formvaldata;
+					that.formdata = res.data;
+				}else{
+					var formvaldata = {};
+					formvaldata.price = that.data.price;
+					that.formvaldata = formvaldata;
+				}
+			})
+		},
+		methods:{
+			onchange(e) {
+				console.log(e) 
+        const value = e.detail.value
+				console.log(value[0].text + ',' + value[1].text + ',' + value[2].text)
+				this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text;
+      },
+			setfield:function(e){
+				var field = e.currentTarget.dataset.formidx;
+				var value = e.detail.value;
+				this.formvaldata[field] = value;
+			},
+			editorFormSubmit:function(e){
+				var that = this;
+				if(this.submitDisabled) return ;
+				//console.log('form发生了submit事件，携带数据为：', e.detail.value)
+				//var subdata = e.detail.value;
+				var subdata = this.formvaldata;
+				console.log(subdata)
+				var formcontent = e.currentTarget.dataset.formcontent;
+				var formid = e.currentTarget.dataset.formid;
+				var tourl = e.currentTarget.dataset.tourl;
+				var formdata = new Array();
+				for (var i = 0; i < formcontent.length;i++){
+					//console.log(subdata['form' + i]);
+					if (formcontent[i].key == 'region') {
+							subdata['form' + i] = that.regiondata;
+					}
+					if (formcontent[i].val3 == 1 && (subdata['form' + i] === '' || subdata['form' + i] === null || subdata['form' + i] === undefined || subdata['form' + i].length==0)){
+							app.alert(formcontent[i].val1+' 必填');return;
+					}
+					if (formcontent[i].key =='switch'){
+							if (subdata['form' + i]==false){
+									subdata['form' + i] = '否'
+							}else{
+									subdata['form' + i] = '是'
+							}
+					}
+					if (formcontent[i].key == 'selector') {
+							subdata['form' + i] = formcontent[i].val2[subdata['form' + i]]
+					}
+					if (formcontent[i].key == 'input' && formcontent[i].val4 && subdata['form' + i]!==''){
+						if(formcontent[i].val4 == '2'){ //手机号
+							if (!/^1[3456789]\d{9}$/.test(subdata['form' + i])) {
+								app.alert(formcontent[i].val1+' 格式错误');return;
+							}
+						}
+						if(formcontent[i].val4 == '3'){ //身份证号
+							if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(subdata['form' + i])) {
+								app.alert(formcontent[i].val1+' 格式错误');return;
+							}
+						}
+						if(formcontent[i].val4 == '4'){ //邮箱
+							if (!/^(.+)@(.+)$/.test(subdata['form' + i])) {
+								app.alert(formcontent[i].val1+' 格式错误');return;
+							}
+						}
+					}
+					formdata.push(subdata['form' + i])
+				}
+				//console.log(formdata);
+				that.submitDisabled = true;
+				app.showLoading('提交中');
+
+				var pages = getCurrentPages(); //获取加载的页面
+				var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+				var thispath = '/' + (currentPage.route ? currentPage.route : currentPage.__route__); //当前页面url 
+				var opts = currentPage.$vm.opt;
+
+				app.post('ApiForm/formsubmit', {formid:formid,formdata:subdata,price:subdata.price,fromurl:thispath+'?id='+opts.id},function(data){
+					that.tmplids = data.tmplids;
+					app.showLoading(false);
+					if (data.status == 0) {
+						//that.showsuccess(res.data.msg);
+						setTimeout(function () {
+							app.error(data.msg);
+						}, 100)
+						that.submitDisabled = false;
+						return;
+					}else if(data.status == 1) { //无需付款
+						that.subscribeMessage(function () {
+							setTimeout(function () {
+								app.success(data.msg);
+							}, 100)
+							setTimeout(function () {
+								app.goto(tourl);
+							}, 1000)
+						});
+						return;
+					}else if(data.status==2){
+						that.subscribeMessage(function () {
+							setTimeout(function () {
+								app.goto('/pages/pay/pay?id='+data.payorderid+'&tourl='+tourl);
+							}, 100);
+						});
+					}
+					that.submitDisabled = false;
+				});
+			},
+			editorChooseImage: function (e) {
+				var that = this;
+				var idx = e.currentTarget.dataset.idx;
+				var tplindex = e.currentTarget.dataset.tplindex;
+				var editorFormdata = this.editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				app.chooseImage(function(data){
+					editorFormdata[idx] = data[0];
+					console.log(editorFormdata)
+					that.editorFormdata = editorFormdata
+					that.test = Math.random();
+
+					var field = e.currentTarget.dataset.formidx;
+					that.formvaldata[field] = data[0];
+
+				})
+			},
+			removeimg:function(e){
+				var that = this;
+				var idx = e.currentTarget.dataset.idx;
+				var tplindex = e.currentTarget.dataset.tplindex;
+				var field = e.currentTarget.dataset.formidx;
+				var editorFormdata = this.editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				editorFormdata[idx] = '';
+				that.editorFormdata = editorFormdata
+				that.test = Math.random();
+				that.formvaldata[field] = '';
+			},
+			editorBindPickerChange:function(e){
+				var idx = e.currentTarget.dataset.idx;
+				var tplindex = e.currentTarget.dataset.tplindex;
+				var val = e.detail.value;
+				var editorFormdata = this.editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				editorFormdata[idx] = val;
+				console.log(editorFormdata)
+				this.editorFormdata = editorFormdata
+				this.test = Math.random();
+
+				var field = e.currentTarget.dataset.formidx;
+				this.formvaldata[field] = val;
+			},
+		}
+	}
+</script>
+<style>
+.dp-form{height: auto; position: relative;overflow: hidden; padding: 10rpx 0px; background: #fff;}
+.dp-form .radio{transform:scale(.7);}
+.dp-form .checkbox{transform:scale(.7);}
+.dp-form-item{width: 100%;border-bottom: 1px #ededed solid;padding:10rpx 0px;display:flex;align-items: center;}
+.dp-form-item:last-child{border:0}
+.dp-form-item .label{line-height: 70rpx;width:140rpx;margin-right: 10px;flex-shrink:0}
+.dp-form-item .input{height: 70rpx;line-height: 70rpx;overflow: hidden;flex:1;border:1px solid #eee;padding:0 8rpx;border-radius:2px;background:#fff}
+.dp-form-item .textarea{height:180rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.dp-form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.dp-form-item .radio2{display:flex;align-items:center;}
+.dp-form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.dp-form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.dp-form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.dp-form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.dp-form-item .layui-form-switch{}
+.dp-form-item .picker{height: 70rpx;line-height:70rpx;flex:1;}
+
+.dp-form-item2{width: 100%;border-bottom: 1px #ededed solid;padding:10rpx 0px;display:flex;flex-direction:column;align-items: flex-start;}
+.dp-form-item2:last-child{border:0}
+.dp-form-item2 .label{height:70rpx;line-height: 70rpx;width:100%;margin-right: 10px;}
+.dp-form-item2 .input{height: 70rpx;line-height: 70rpx;overflow: hidden;width:100%;border:1px solid #eee;padding:0 8rpx;border-radius:2px;background:#fff}
+.dp-form-item2 .textarea{height:180rpx;line-height:40rpx;overflow: hidden;width:100%;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.dp-form-item2 .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center;}
+.dp-form-item2 .radio2{display:flex;align-items:center;}
+.dp-form-item2 .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.dp-form-item2 .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center;}
+.dp-form-item2 .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.dp-form-item2 .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.dp-form-item2 .layui-form-switch{}
+.dp-form-item2 .picker{height: 70rpx;line-height:70rpx;flex:1;width:100%;}
+.dp-form-btn{margin: 0 auto;background: #ff4f4f;color: #fff;margin-top: 15px;margin-bottom:10px;text-align:center}
+.flex-y-center {margin-right: 20rpx;}
+
+.dp-form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.dp-form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.dp-form-imgbox-close .image{width:100%;height:100%}
+.dp-form-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.dp-form-imgbox-img>.image{max-width:100%;}
+.dp-form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.dp-form-uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/components/dp-hotspot/dp-hotspot.vue b/components/dp-hotspot/dp-hotspot.vue
new file mode 100644
index 0000000..ec46e27
--- /dev/null
+++ b/components/dp-hotspot/dp-hotspot.vue
@@ -0,0 +1,26 @@
+<template>
+<view class="dp-hotspot" :style="{
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx 0'
+}">
+	<image class="image" :src="params.imgurl" mode="widthFix"/>
+	<view v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="item.hrefurl" :style="{
+		width:(item.width*2.2)+'rpx',
+		height:(item.height*2.2)+'rpx',
+		left:(item.left*2.2)+'rpx',
+		top:(item.top*2.2)+'rpx'
+	}" class="hotarea"></view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-hotspot {position:relative}
+.dp-hotspot .image{width:100%;height:auto;margin: 0px; padding: 0px;}
+.dp-hotspot .hotarea{position:absolute;z-index:3}
+</style>
\ No newline at end of file
diff --git a/components/dp-kanjia/dp-kanjia.vue b/components/dp-kanjia/dp-kanjia.vue
new file mode 100644
index 0000000..f586485
--- /dev/null
+++ b/components/dp-kanjia/dp-kanjia.vue
@@ -0,0 +1,125 @@
+<template>
+<view class="dp-kanjia" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-kanjia-item" v-if="params.style=='1' || params.style=='2' || params.style=='3'">
+		<view class="item" v-for="(item,index) in data" :style="params.style==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (params.style==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/kanjia/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.min_price}}</text>
+						<text class="t2" v-if="params.showprice == '1'">￥{{item.sell_price}}</text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">砍价</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已砍走{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-kanjia-itemlist" v-if="params.style=='list'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/kanjia/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="params.showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.min_price}}</text>
+					<text class="t2" v-if="params.showprice == '1'">￥{{item.sell_price}}</text>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">砍价</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已砍走{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-kanjia-itemline" v-if="params.style=='line'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/kanjia/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.min_price}}</text>
+						<text class="t2" v-if="params.showprice == '1'">￥{{item.sell_price}}</text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">砍价</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已砍走{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-kanjia{height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+.dp-kanjia-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-kanjia-item .item{display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-kanjia-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-kanjia-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-kanjia-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-kanjia-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-kanjia-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-kanjia-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-kanjia-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-kanjia-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-kanjia-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-kanjia-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-kanjia-item .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-kanjia-item .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-kanjia-item .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+
+.dp-kanjia-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-kanjia-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-kanjia-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-kanjia-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-kanjia-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-kanjia-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-kanjia-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-kanjia-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-kanjia-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-kanjia-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-kanjia-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-kanjia-itemlist .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-kanjia-itemlist .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+
+.dp-kanjia-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-kanjia-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-kanjia-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-kanjia-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-kanjia-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-kanjia-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-kanjia-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-kanjia-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-kanjia-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-kanjia-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-kanjia-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-kanjia-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-kanjia-itemline .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-kanjia-itemline .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-kanjia-itemline .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+</style>
\ No newline at end of file
diff --git a/components/dp-kecheng-item/dp-kecheng-item.vue b/components/dp-kecheng-item/dp-kecheng-item.vue
new file mode 100644
index 0000000..f1816db
--- /dev/null
+++ b/components/dp-kecheng-item/dp-kecheng-item.vue
@@ -0,0 +1,79 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/kecheng/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx" v-if="item.price>0">￥</text>{{item.price==0?'免费':item.price}}</text>					</view>
+				</view>
+				<view class="p3" >共{{item.count}}节 | {{item.join_num}}人已加入学习</view>
+				<view class="p4" v-if="showcart==1 && types != 'serach'" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default:app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			}
+		}
+	}
+</script>
+<style>
+.dp-product-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-item .item{box-shadow: 0 0 10rpx 0rpx #e5e5e5;display: inline-block;position: relative;margin-bottom: 20rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-product-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-product-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-product-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-product-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-product-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-product-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-product-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-product-item .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+.dp-product-item .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:20rpx;right:20rpx;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-product-item .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-product-item .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-kecheng-itemlist/dp-kecheng-itemlist.vue b/components/dp-kecheng-itemlist/dp-kecheng-itemlist.vue
new file mode 100644
index 0000000..24f9916
--- /dev/null
+++ b/components/dp-kecheng-itemlist/dp-kecheng-itemlist.vue
@@ -0,0 +1,75 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-itemlist">
+		<view class="item" v-for="item in data" :key="item.id" @click="goto" :data-url="'/activity/kecheng/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}">
+					<text style="font-size:24rpx" v-if="item.price>0">￥</text>{{item.price==0?'免费':item.price}}</text>	
+				</view>
+				<view class="p3">
+					<view class="p3-1" ><text style="overflow:hidden">共{{item.count}}节课 |  {{item.join_num}}人已加入学习</text></view>
+				</view>
+				<view class="p4" v-if="showcart==1 && types != 'serach'" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default:app.globalData.event_url + '/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+			},
+		}
+	}
+</script>
+<style>
+.dp-product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-product-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-product-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.dp-product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.dp-product-itemlist .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:6rpx;right:4rpx;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-product-itemlist .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-product-itemlist .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-line/dp-line.vue b/components/dp-line/dp-line.vue
new file mode 100644
index 0000000..cf30b91
--- /dev/null
+++ b/components/dp-line/dp-line.vue
@@ -0,0 +1,24 @@
+<template>
+<view class="dp-line" :style="{
+	backgroundColor:params.bgcolor,margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-line-line" :style="{
+		borderTopWidth:params.height*2.2+'rpx',
+		borderTopStyle:params.style,
+		borderTopColor:params.color
+	}"></view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-line{height: auto; position: relative;background-color: #ffffff;}
+.dp-line-line {height:0px; margin:10px 0px; border-top:2px dashed #666;background-color: #ffffff;}
+</style>
\ No newline at end of file
diff --git a/components/dp-liveroom/dp-liveroom.vue b/components/dp-liveroom/dp-liveroom.vue
new file mode 100644
index 0000000..6c3dbb3
--- /dev/null
+++ b/components/dp-liveroom/dp-liveroom.vue
@@ -0,0 +1,146 @@
+<template>
+<view class="dp-liveroom" :style="{
+	color:params.color,
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+	<view class="dp-liveroom-liveroom">
+		 <!-- #ifdef MP -->
+		<view class="item" v-for="(item,index) in data" :key="item.id" :style="{marginRight:index%2==0?'2%':'0'}" @click="goto" :data-url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id='+item.roomId">
+			<view class="bgpic">
+				<image class="image" :src="item.coverImg" mode="widthFix"/>
+			</view>
+			<view class="f1" v-if="item.status=='0'">
+				<view class="t1">预告</view>
+				<view class="t2">{{item.showtime}}</view>
+			</view>
+			<view class="f2" v-if="item.status=='1'">
+				<!-- <image :src="pre_url+'/static/img/liveing.gif'" class="t1"/> -->
+				<view class="live-an-box">
+					<view class="live-animation">
+						<text  class="heng1"></text>
+						<text  class="heng2"></text>
+						<text  class="heng3"></text>
+					</view>
+				</view>
+				<view class="t2" style="padding: 0 16rpx;">直播中</view>
+			</view>
+			<view class="f3" v-if="item.status=='2'">
+				<view class="live-an-box">
+					<view class="live-animation">
+						<text  class="heng1"></text>
+						<text  class="heng2"></text>
+						<text  class="heng3"></text>
+					</view>
+				</view>
+				<view class="t1" style="padding: 0 16rpx;">已结束</view>
+			</view>
+			<view class="f10">
+				 <view class="title">{{item.name}}</view>
+			</view>
+		</view>
+		<!-- #endif -->
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		data(){
+			return {
+				pre_url:getApp().globalData.pre_url
+			}
+		},
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style lang="scss">
+.dp-liveroom{height: auto;position: relative; }
+.dp-liveroom-liveroom{height: auto; overflow: hidden; padding: 0px;display:flex;flex-wrap:wrap}
+.dp-liveroom-liveroom .item{width: 49%;display: inline-block;position: relative;margin-bottom:16rpx;background: #fff;border-radius:16rpx;overflow:hidden}
+.dp-liveroom-liveroom .item .bgpic {width:100%;height:0;overflow:hidden;background: #fff;padding-bottom:140%;position: relative;}
+.dp-liveroom-liveroom .item .bgpic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-liveroom-liveroom .item .f1{display:flex;align-items:center;position:absolute;top:20rpx;left:20rpx;z-index:9;background:rgba(0,0,0,0.3);color:#ffffff;height:32rpx;line-height:32rpx;border-radius:16rpx;padding:0 20rpx;font-size:20rpx;padding-left:0;overflow:hidden}
+.dp-liveroom-liveroom .item .f1 .t1{background:#FFDC30;color:#050505;padding-left:20rpx;padding-right:10rpx}
+.dp-liveroom-liveroom .item .f1 .t2{padding-left:10rpx}
+.dp-liveroom-liveroom .item .f2{ display:flex;align-items:center;position:absolute;top:20rpx;left:20rpx;z-index:9;background:rgba(0,0,0,0.3);color:#ffffff;height:32rpx;line-height:32rpx;border-radius:16rpx;font-size:20rpx}
+.dp-liveroom-liveroom .item .f2 .t1{width:20rpx;height:20rpx}
+.dp-liveroom-liveroom .item .f2 .t2{padding-left:2px}
+.dp-liveroom-liveroom .item .f3{ display:flex;align-items:center;position:absolute;top:20rpx;left:20rpx;z-index:9;background:rgba(0,0,0,0.3);color:#ffffff;height:32rpx;line-height:32rpx;border-radius:16rpx;font-size:20rpx}
+.dp-liveroom-liveroom .item .f10{position:absolute;bottom:40rpx;left:10%;width:80%;z-index:9;background:rgba(0,0,0,0.3);padding:0 20rpx;color:#ffffff;height:40rpx;line-height:40rpx;overflow:hidden;text-align:center;border-radius:20rpx;font-size:24rpx}
+
+.live-an-box {
+	width: 32rpx;
+	height: 32rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: #F9E201;
+	border-radius: 300rpx;
+}
+.live-animation {
+      width: 20rpx;
+      height: 18rpx;
+      // margin-left: 4rpx;
+	  display: flex;
+	  justify-content: space-evenly;
+      align-items: flex-end;
+
+      .heng1,
+      .heng2,
+      .heng3 {
+        width: 4rpx;
+        border-radius: 6rpx;
+        background-color: #fff;
+      }
+      .heng1 {
+        height: 18rpx;
+        animation: hengos 0.8s linear infinite;
+      }
+      .heng2 {
+        height: 6rpx;
+        animation: hengts 0.8s linear infinite;
+      }
+      .heng3 {
+        height: 18rpx;
+        animation: henghs 0.8s linear 0.2s infinite;
+      }
+}
+
+@keyframes hengos {
+  0% {
+    height: 18rpx;
+  }
+  50% {
+    height: 6rpx;
+  }
+  100% {
+    height: 18rpx;
+  }
+}
+@keyframes hengts {
+  0% {
+    height: 6rpx;
+  }
+  50% {
+    height: 18rpx;
+  }
+  100% {
+    height: 6rpx;
+  }
+}
+@keyframes henghs {
+  0% {
+    height: 18rpx;
+  }
+  50% {
+    height: 6rpx;
+  }
+  100% {
+    height: 18rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/components/dp-luckycollage/dp-luckycollage.vue b/components/dp-luckycollage/dp-luckycollage.vue
new file mode 100644
index 0000000..597b5a6
--- /dev/null
+++ b/components/dp-luckycollage/dp-luckycollage.vue
@@ -0,0 +1,141 @@
+<template>
+<view class="dp-luckycollage" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-collage-item" v-if="params.style=='2'">
+		<view class="item" v-for="(item,index) in data" :style="params.style==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (params.style==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/luckycollage/'+ (item.linktype==1?'product2':'product')+'?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+				<view class="desc">
+					<text v-if="item.gua_num>0" > {{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text>
+					<text v-else style="line-height: 80rpx;"> {{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text>
+					<view v-if="item.linktype==1">
+						<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==1">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text>
+						<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==2">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_score}}积分</text>
+						<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==3">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_commission}}元佣金</text>
+						<text v-if="item.teamnum-item.gua_num>0 && item.bzjl_type==4">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}优惠券</text>
+					</view>
+					<view v-else>
+						<text v-if="item.teamnum-item.gua_num>0">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text>
+					</view>
+				</view>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="params.showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">{{item.teamnum}}人拼</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已拼成{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-collage-itemlist" v-if="params.style=='list'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/luckycollage/'+ (item.linktype==1?'product2':'product')+'?id='+item.proid">
+			<view class="flex">
+				<view class="product-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+					<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+				</view>
+				<view class="product-info">
+					<view class="p1" v-if="params.showname == 1"><text class="team_text">{{item.teamnum}}人拼</text>{{item.name}}</view>
+					<view class="p2" v-if="params.showprice != '0'">
+						<view>
+							<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+							<text class="t2" v-if="params.showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+						</view>
+						<view class="p3">
+							<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已拼成{{item.sales}}件</text></view>
+						</view>
+					</view>
+				
+				</view>
+			</view>
+					<view v-if="item.linktype==1">
+						<view class="desc" v-if="item.bzjl_type==1"><text>{{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text><text v-if="item.teamnum-item.gua_num>0">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text></view>
+						<view class="desc" v-if="item.bzjl_type==2"><text>{{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text><text v-if="item.teamnum-item.gua_num>0">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_score}}积分</text></view>
+						<view class="desc" v-if="item.bzjl_type==3"><text>{{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text><text v-if="item.teamnum-item.gua_num>0">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.bzj_commission}}元佣金</text></view>
+						<view class="desc" v-if="item.bzjl_type==4"><text>{{item.teamnum}}人拼团 {{item.gua_num}}人得商品</text><text v-if="item.teamnum-item.gua_num>0">{{item.teamnum-item.gua_num}}人{{item.teamnum-item.gua_num>1?'各':''}}得{{item.money}}优惠券</text></view>
+					</view>
+					<view v-else>
+						<view class="desc" ><text>{{item.teamnum}}人拼团 {{item.teamnum-item.gua_num}}人得商品</text><text v-if="item.gua_num>0">{{item.gua_num}}人{{item.gua_num>1?'各':''}}得{{item.money}}元参与奖</text></view>
+							</view>
+					</view>
+			
+			</view>
+	</view>
+
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-collage{height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+.dp-collage-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-collage-item .item{display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-collage-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-collage-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-collage-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-collage-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-collage-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-collage-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-collage-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-collage-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-collage-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-collage-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-collage-item .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-collage-item .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-collage-item .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+.dp-collage-item .product-pic .desc{ display: flex; width:100%;  flex-wrap: wrap; position: absolute; bottom: 0; background: #FF3143; opacity: 0.7; color:#fff;font-size: 20rpx;height:80rpx; padding:5rpx 10rpx}
+.dp-collage-item .product-pic .desc text{ width: 100%;}
+
+
+.dp-collage-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-collage-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;padding:20rpx;border-radius:10rpx}
+.dp-collage-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-collage-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-collage-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-collage-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-collage-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:60rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.dp-collage-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-collage-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-collage-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-collage-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-collage-itemlist .product-info .p3-1{height:40rpx;line-height:40rpx;border:1px #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-collage-itemlist .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+.dp-collage-itemlist .product-info .p1 .team_text{ margin-right:10rpx;border-radius: 4rpx; color: #FF3143; background:#FFDED9 ; font-size: 20rpx; padding: 8rpx 6rpx;}
+
+.dp-collage-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-collage-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-collage-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-collage-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-collage-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-collage-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-collage-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-collage-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-collage-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-collage-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-collage-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-collage-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-collage-itemline .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-collage-itemline .product-info .p3-1{height:40rpx;line-height:40rpx;border:1px #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-collage-itemline .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+.dp-collage-itemlist  .item .desc{ display: flex; margin-top: 15rpx;background:linear-gradient(to right, #FF3143, #FF8F99); justify-content: space-between;  padding:0 10rpx; color: #fff;border-radius: 6rpx; line-height: 60rpx; font-size: 20rpx;}
+::-webkit-scrollbar{width: 0;height: 0;color: transparent;}
+</style>
+</style>
\ No newline at end of file
diff --git a/components/dp-map/dp-map.vue b/components/dp-map/dp-map.vue
new file mode 100644
index 0000000..92959b2
--- /dev/null
+++ b/components/dp-map/dp-map.vue
@@ -0,0 +1,62 @@
+<template>
+<view class="dp-map" :style="{
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<!-- #ifdef MP-WEIXIN -->
+	<map :style="{width:'100%',height:params.height*2.2+'rpx'}" :longitude="params.longitude" :latitude="params.latitude" :markers="{
+		label:{content:params.address,fontSize:'14px',borderRadius:'4px',color:'#000',anchorX:'-10px',anchorY:'-62px',padding:'3px',textAlign:'center'},
+		anchor:{x:0.17,y:1},
+		id:0,
+		latitude:params.latitude,
+		longitude: params.longitude,
+		iconPath: event_rul +'/static/img/static/img/marker.png',
+		width:'73',
+		height:'33'
+	}" @click="openLocation" :data-longitude="params.longitude" :data-latitude="params.latitude" :data-address="params.address"></map>
+	<!-- #endif -->
+	<!-- #ifndef MP-WEIXIN -->
+	<map :style="{width:'100%',height:params.height*2.2+'rpx'}" :longitude="params.longitude" :latitude="params.latitude" :markers="[{
+		label:{content:params.address,fontSize:'14px',borderRadius:'4px',color:'#000',x:'-10px',y:'-62px',padding:'3px',textAlign:'center'},
+		anchor:{x:0.17,y:1},
+		id:0,
+		latitude:params.latitude,
+		longitude: params.longitude,
+		iconPath: event_rul +'/static/img/static/img/marker.png',
+		width:'73',
+		height:'33'
+	}]" @click="openLocation" :data-longitude="params.longitude" :data-latitude="params.latitude" :data-address="params.address"></map>
+	<!-- #endif -->
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		props: {
+			params:{},
+			data:{}
+		},
+		data() {
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		methods:{
+			openLocation:function(e){
+				var latitude = parseFloat(e.currentTarget.dataset.latitude)
+				var longitude = parseFloat(e.currentTarget.dataset.longitude)
+				var address = e.currentTarget.dataset.address
+				uni.openLocation({
+				 latitude:latitude,
+				 longitude:longitude,
+				 name:address,
+				 scale: 13
+			 })
+			}
+		}
+	}
+</script>
+<style>
+.dp-map{height: auto; position: relative;}
+</style>
\ No newline at end of file
diff --git a/components/dp-menu/dp-menu.vue b/components/dp-menu/dp-menu.vue
new file mode 100644
index 0000000..37fac20
--- /dev/null
+++ b/components/dp-menu/dp-menu.vue
@@ -0,0 +1,90 @@
+<template>
+<view class="dp-menu" :style="{
+	fontSize:params.fontsize*2+'rpx',
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx',
+	borderRadius:params.boxradius*2.2+'rpx'
+}">
+	<view style="padding-top:16rpx;">
+		<view v-if="params.showtitle==1" class="menu-title" :style="{color:params.titlecolor,fontSize:params.titlesize*2.2+'rpx'}">{{params.title}}</view>
+		<block v-if="params.newdata.length >1">
+		<swiper :autoplay="false" :indicator-dots="false" :current="0" @change="bannerchange" :style="{
+					width:'100%',
+					height:(params.newdata_linenum*(params.iconsize*2.2 + params.fontsize*2 + 50)+'rpx' || '350rpx'),
+					overflow:'hidden'
+				}">
+			<swiper-item v-for="item in params.newdata" :key="item.id">
+				<view class="swiper-item" :style="{
+					width:'100%',
+					height:(params.newdata_linenum*(params.iconsize*2.2 + params.fontsize*2 + 50)+'rpx' || '350rpx'),
+					overflow:'hidden'
+				}">
+					<view v-for="item2 in item" :key="item2.id" :class="'menu-nav'+params.num+' '+(params.showicon==0 && params.showline==1 ? ' showline':'')" @click="goto" :data-url="item2.hrefurl">
+						<image v-if="params.showicon==1" :src="item2.imgurl" :style="{borderRadius:params.radius/2+'%',width:params.iconsize*2.2+'rpx',height:params.iconsize*2.2+'rpx'}"></image>
+						<view class="menu-text" :style="{color:'#333333',height:params.fontheight*2.2+'rpx',lineHeight:params.fontheight*2.2+'rpx'}">{{item2.text|| '按钮文字'}}</view>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="swiper-pagination" style="justify-content:center;bottom:8px">
+			<block v-for="(item,index) in params.newdata" :key="item.id">
+				<view v-if="bannerindex==index" class="swiper-shape4 swiper-shape4-active" style="background-color:#3db51e"></view>
+				<view v-else class="swiper-shape4" style="background-color:#edeef0"></view>
+			</block>
+		</view>
+		</block>
+		<block v-else>
+		<view class="swiper-item">
+			<view v-for="item in data" :key="item.id" :class="'menu-nav'+params.num+' '+(params.showicon==0 && params.showline==1 ? ' showline':'')" @click="goto" :data-url="item.hrefurl">
+				<image v-if="params.showicon==1" :src="item.imgurl" :style="{borderRadius:params.radius/2+'%',width:params.iconsize*2.2+'rpx',height:params.iconsize*2.2+'rpx'}"></image>
+				<view class="menu-text" :style="{color:'#333333',height:params.fontheight*2.2+'rpx',lineHeight:params.fontheight*2.2+'rpx'}">{{item.text|| '按钮文字'}}</view>
+			</view>
+		</view>
+		</block>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		data(){
+			return {"bannerindex":0}
+    },
+		props: {
+			params:{},
+			data:{}
+		},
+		methods:{
+			bannerchange:function(e){
+				console.log(this.params)
+				var that = this
+				var idx = e.detail.current;
+				that.bannerindex = idx
+			}
+		}
+	}
+</script>
+<style>
+.dp-menu {height:auto;position:relative;padding-left:20rpx; padding-right:20rpx; background: #fff;}
+.dp-menu .menu-title{width:100%;font-size:30rpx;color:#333333;font-weight:bold;padding:0 0 32rpx 24rpx}
+.dp-menu .swiper-item{display:flex;flex-wrap:wrap;flex-direction: row;height:auto;overflow: hidden;}
+.dp-menu .swiper-item .menu-text {font-size: 24rpx;}
+.dp-menu .menu-nav {flex:1;text-align:center;}
+.dp-menu .menu-nav5 {width:20%;text-align:center;margin-bottom:16rpx;position:relative}
+.dp-menu .menu-nav4 {width:25%;text-align:center;margin-bottom:16rpx;position:relative}
+.dp-menu .menu-nav3 {width:33.3%;text-align:center;margin-bottom:16rpx;position:relative}
+.dp-menu .menu-nav2 {width:50%;text-align:center;margin-bottom:16rpx;position:relative}
+.dp-menu .showline:after{position:absolute;top:50%;right:0;margin-top:-16rpx;content:'';height:36rpx;border-right:1px solid #eee}
+.dp-menu .menu-nav2.showline:nth-child(2n+2):after{border-right:0}
+.dp-menu .menu-nav3.showline:nth-child(3n+3):after{border-right:0}
+.dp-menu .menu-nav4.showline:nth-child(4n+4):after{border-right:0}
+.dp-menu .menu-nav5.showline:nth-child(5n+5):after{border-right:0}
+.swiper-pagination{padding:0 10px;bottom:12px;left:0;position:absolute;display:flex;justify-content:center;width:100%}
+.swiper-shape0{width:3px;height:3px;margin:0 2px!important;}
+.swiper-shape0-active{width:13px;border-radius:1.5px;}
+.swiper-shape1{width:12px;height:6px;border-radius:0;margin:0 2px}
+.swiper-shape2{width:8px;height:8px;border-radius:0;margin:0 2px}
+.swiper-shape3{width:8px;height:8px;border-radius:50%;margin:0 2px;}
+.swiper-shape4{width:8px;height:3px;border-radius:50%;margin:0 1px;}
+.swiper-shape4-active{width:13px;border-radius:1.5px;}
+</style>
\ No newline at end of file
diff --git a/components/dp-notice/dp-notice.vue b/components/dp-notice/dp-notice.vue
new file mode 100644
index 0000000..8be8d65
--- /dev/null
+++ b/components/dp-notice/dp-notice.vue
@@ -0,0 +1,33 @@
+<template>
+<view class="dp-notice" :style="{
+	color:params.color,
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+	<view class="left" v-if="params.showimg==1"><image class="image" :src="params.img" mode="heightFix"/></view>
+	<view class="right">
+		<image v-if="params.showicon==1" class="ico" :src="params.icon"/>
+		<swiper style="position:relative;height:40rpx;" autoplay="true" :interval="params.scroll*1000" vertical="true" class="itemlist">
+			<swiper-item class="item" v-for="item in data" :key="item.id" :style="{fontSize:(params.fontsize*2.2)+'rpx'}" @click="goto" :data-url="item.hrefurl">{{item.title}}</swiper-item>
+		</swiper>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-notice{height: auto;background: #fff; font-size: 28rpx; color: #666666;overflow: hidden; white-space:nowrap; position: relative;display:flex;align-items:center;padding:2px 4px}
+.dp-notice .left{position:relative;padding-right:20rpx;margin-right:20rpx;height:40rpx;display:flex;align-items: center;}
+.dp-notice .left:before { content: " "; position: absolute; width: 0; top: 2px; right: 0; bottom: 2px; border-right: 1px solid #e2e2e2; }
+.dp-notice .image{position:relative;height:36rpx;width:auto}
+.dp-notice .right{flex-grow:1;display:flex;align-items: center;overflow:hidden}
+.dp-notice .right .ico{width:36rpx;height:36rpx;margin-right:10rpx}
+.dp-notice .itemlist{width:100%;height:100%;line-height:40rpx;font-size:28rpx;}
+</style>
\ No newline at end of file
diff --git a/components/dp-picture/dp-picture.vue b/components/dp-picture/dp-picture.vue
new file mode 100644
index 0000000..b25942d
--- /dev/null
+++ b/components/dp-picture/dp-picture.vue
@@ -0,0 +1,30 @@
+<template>
+<view class="dp-picture" :style="{
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="item.hrefurl">
+		<button class="picture-button" v-if="item.hrefurl=='contact::'" open-type="contact">
+			<image class="picture-img" :src="item.imgurl" mode="widthFix" :style="{borderRadius:(params.borderradius*2.2)+'rpx'}"></image>
+		</button>
+		<button class="picture-button" v-else-if="item.hrefurl=='share::'" open-type="share">
+			<image class="picture-img" :src="item.imgurl" mode="widthFix" :style="{borderRadius:(params.borderradius*2.2)+'rpx'}"></image>
+		</button>
+		<image v-else class="picture-img" :src="item.imgurl" mode="widthFix" :style="{borderRadius:(params.borderradius*2.2)+'rpx'}"></image>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-picture{height: auto; position: relative;}
+.dp-picture .picture-img {width: 100%;height:auto; margin: 0px; padding: 0px;display:table}
+.dp-picture .picture-button {line-height:0}
+</style>
\ No newline at end of file
diff --git a/components/dp-pictures/dp-pictures.vue b/components/dp-pictures/dp-pictures.vue
new file mode 100644
index 0000000..01d46bf
--- /dev/null
+++ b/components/dp-pictures/dp-pictures.vue
@@ -0,0 +1,73 @@
+<template>
+<view class="dp-pictures" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx 0'
+}">
+	<view class="listitem2" v-if="params.style=='2'">
+		<view class="listitem2-item" :style="{padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'}" v-for="item in data" :key="item.id">
+			<image class="item-image" :src="item.imgurl" @click="goto" :data-url="item.hrefurl" mode="widthFix"/>
+		</view>
+	</view>
+	<view class="listitem3" v-if="params.style=='3'">
+		<view class="listitem3-item" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}" v-for="item in data" :key="item.id">
+			<image class="item-image" :src="item.imgurl" @click="goto" :data-url="item.hrefurl" mode="widthFix"/>
+		</view>
+	</view>
+	<view class="listitem4" v-if="params.style=='4'">
+		<view class="listitem4-item" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}" v-for="item in data" :key="item.id">
+			<image class="item-image" :src="item.imgurl" @click="goto" :data-url="item.hrefurl" mode="widthFix"/>
+		</view>
+	</view>
+	<view class="listitem5" v-if="params.style=='5'">
+		<view class="listitem5-left" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}">
+			<image class="item-image" :src="data[0]['imgurl']" @click="goto" :data-url="data[0]['hrefurl']" mode="widthFix"/>
+		</view>
+		<view class="listitem5-right" v-if="data.length>2">
+			<view class="listitem5-top" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}">
+				<image class="item-image" :src="data[1]['imgurl']" @click="goto" :data-url="data[1]['hrefurl']" mode="widthFix"/>
+			</view>
+			<view class="listitem5-bottom" v-if="data.length>3">
+				<view class="listitem5-left" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}">
+					<image class="item-image" :src="data[2]['imgurl']" @click="goto" :data-url="data[2]['hrefurl']" mode="widthFix"/>
+				</view>
+				<view class="listitem5-right" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}">
+					<image class="item-image" :src="data[3]['imgurl']" @click="goto" :data-url="data[3]['hrefurl']" mode="widthFix"/>
+				</view>
+			</view>
+			<view v-else class="listitem5-bottom" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}">
+				<image class="item-image" :src="data[2]['imgurl']" @click="goto" :data-url="data[2]['hrefurl']" mode="widthFix"/>
+			</view>
+		</view>
+		<view v-else class="listitem5-right" :style="{padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}">
+			<image class="item-image" :src="data[1]['imgurl']" @click="goto" :data-url="data[1]['hrefurl']" mode="widthFix"/>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-pictures{height: auto; position: relative;}
+.dp-pictures .item-image {display:flex;max-width: 100%;max-height: 100%;width: 100%;height:auto; border: 0;padding: 0;outline: none;}
+.dp-pictures .listitem2{width:100%;display:flex;flex-wrap:wrap}
+.dp-pictures .listitem2-item{width:50%;}
+.dp-pictures .listitem3{width:100%;display:flex;flex-wrap:wrap}
+.dp-pictures .listitem3-item{width:33.33%;}
+.dp-pictures .listitem4{width:100%;display:flex;flex-wrap:wrap}
+.dp-pictures .listitem4-item{width:25%;}
+.dp-pictures .listitem5{width:100%;display:flex;justify-content:center;align-items:center}
+.dp-pictures .listitem5-left{width:50%;height:100%;}
+.dp-pictures .listitem5-right{width:50%;height:100%}
+.dp-pictures .listitem5-top{width:100%;height:50%}
+.dp-pictures .listitem5-bottom{width:100%;height:50%;display:flex}
+.dp-pictures .left-image {display:flex;width: 100%;height:100%}
+.dp-pictures .right-image {display:flex;width: 100%;height:100%}
+.dp-pictures .top-image {display:flex;width: 100%;height:100%}
+.dp-pictures .bottom-image {display:flex;width: 100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-product-item/dp-product-item.vue b/components/dp-product-item/dp-product-item.vue
new file mode 100644
index 0000000..99ec7c2
--- /dev/null
+++ b/components/dp-product-item/dp-product-item.vue
@@ -0,0 +1,159 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="shopDetail(item)" :data-url="'/pages/shop/product?id='+item[idfield]">
+			
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+				<view class="sold-out position-a" v-if="navType == 'shop' && item.status == 0">
+					商品已下架
+				</view>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p3" v-if="showsales=='1'">已售{{item.sales}}件</view>
+				<!-- <view class="p3" style="color: #fff;" v-else>1</view> -->
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:types == 'cart'?'#ED5925':t('color1')}"><text style="font-size:24rpx;font-weight: bold;">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">
+						<!-- /箱 -->
+						<!-- ￥{{item.market_price}} -->
+						</text>
+					</view>
+				</view>
+				<view class="p4" v-if="showcart==1 && types=='serach' " @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" style="bottom: 25rpx;" v-if="showcart==1 && types != 'serach'" @click.stop="buydialogChange" :data-proid="item[idfield]" :data-status="item.status"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]" ><image :src="cartimg" class="img"></image></view>
+				<view class="p5" v-if="types == 'search'">
+					<view class="left">
+						<view class="l_left">
+							<image :src="item.business.logo" mode=""></image>
+						</view>
+						<view class="l_right">
+							{{item.business.name}}
+						</view>
+					</view>
+					<view class="right">
+						<text class="iconfont icon-arrow-right"></text>
+					</view>
+				</view>
+			</view>
+			<view class="bg-desc" v-if="item.hongbaoEdu > 0" :style="{background:'linear-gradient(90deg,'+t('color2')+' 0%,rgba('+t('color2rgb')+',0.8) 100%)'}">可获额度 +{{item.hongbaoEdu}}</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChanges" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			types:{default:''},
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default:app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'},
+			navType:{default: ''}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(this.navType == 'shop' && e.currentTarget.dataset.status == 0) {
+					return
+				}
+				this.proid = e.currentTarget.dataset.proid
+				this.buydialogChanges()
+				// if(!this.buydialogShow){
+				// 	this.proid = e.currentTarget.dataset.proid
+				// }
+				// this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			buydialogChanges() {
+				this.buydialogShow = !this.buydialogShow;
+				this.$emit('touchmove');
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			},
+			shopDetail(item) {
+				console.log(item)
+				if(this.navType == 'shop' && item.status == 0) {
+					this.$emit('shopdel',{show: true ,id:item.id, deltype: 'shop'})
+				}else {
+					app.goto('/pages/shop/product?id='+item.id)
+				}
+				
+			}
+		}
+	}
+</script>
+<style lang="scss">
+.dp-product-item{height: auto; position: relative; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-item .item{box-shadow: 0 0 10rpx 0rpx #e5e5e5;display: inline-block;position: relative;margin-bottom: 20rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-product-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-product-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-item .product-pic .sold-out{bottom:0;left:50%;width: 190rpx;height:68rpx;line-height: 68rpx;text-align: center;  background-color: #999999;color: #fff; border-radius: 4rpx; transform: translateX(-50%);}
+.dp-product-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-product-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-product-item .product-info .p1 {color:#333;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-product-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;margin-top: 10rpx; line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-product-item .product-info .p2-1 .t1{font-size:36rpx; font-weight: bold;}
+.dp-product-item .product-info .p2-1 .t2 {font-size:24rpx;color: #aaa;/* text-decoration: line-through; *//*letter-spacing:-1px*/}
+.dp-product-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-product-item .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+.dp-product-item .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;bottom:84rpx;right:26rpx;display:flex;align-items: center;justify-content: center;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-product-item .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-product-item .product-info .p4 .img{width:100%;height:100%};
+ .p5 {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	font-size: 24rpx;
+	margin-top: 20rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		image{
+			width: 40rpx;
+			border-radius: 40rpx;
+			height: 40rpx;
+			margin-right: 10rpx;
+		}
+		color: #7a7a7a;
+		.l_right{
+			width: 196rpx;
+			overflow:hidden; //溢出隐藏
+			
+			text-overflow:ellipsis;//超出显示省略号
+			
+			white-space:nowrap;//强制文本在一行内显示
+			
+		}
+	}
+	.right{
+		.iconfont{
+			// font-size: 50rpx;
+			color: #7a7a7a;
+		}
+	}
+}
+.bg-desc {color: #fff; padding: 10rpx 20rpx;}
+</style>
\ No newline at end of file
diff --git a/components/dp-product-itemline/dp-product-itemline.vue b/components/dp-product-itemline/dp-product-itemline.vue
new file mode 100644
index 0000000..508143e
--- /dev/null
+++ b/components/dp-product-itemline/dp-product-itemline.vue
@@ -0,0 +1,81 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-itemline">
+		<view class="item" v-for="item in data" :key="item.id" @click="goto" :data-url="'/pages/shop/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3" v-if="showsales=='1'">已售{{item.sales}}件</view>
+				<view class="p4" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			}
+		}
+	}
+</script>
+<style>
+.dp-product-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-product-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-product-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-product-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-product-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-product-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-product-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-product-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-product-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-product-itemline .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+.dp-product-itemline .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:20rpx;right:20rpx;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-product-itemline .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-product-itemline .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-product-itemlist/dp-product-itemlist.vue b/components/dp-product-itemlist/dp-product-itemlist.vue
new file mode 100644
index 0000000..f4f67e1
--- /dev/null
+++ b/components/dp-product-itemlist/dp-product-itemlist.vue
@@ -0,0 +1,74 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-itemlist">
+		<view class="item" v-for="item in data" :key="item.id" @click="goto" :data-url="'/pages/shop/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+					<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+				</view>
+				<view class="p3">
+					<view class="p3-1" v-if="showsales=='1'"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+				</view>
+				<view class="p4" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+			},
+		}
+	}
+</script>
+<style>
+.dp-product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-product-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-product-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.dp-product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.dp-product-itemlist .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;bottom:6rpx;right:4rpx;display:flex;align-items: center;justify-content: center;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-product-itemlist .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-product-itemlist .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-product/dp-product.vue b/components/dp-product/dp-product.vue
new file mode 100644
index 0000000..2db39e7
--- /dev/null
+++ b/components/dp-product/dp-product.vue
@@ -0,0 +1,27 @@
+<template>
+<view class="dp-product" :style="{
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx',
+	width:'calc(100% - '+params.margin_x*2.2*2+'rpx)'
+}">
+	<!--123排-->
+	<dp-product-item v-if="params.style=='1' || params.style=='2' || params.style=='3'" :showstyle="params.style" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showprice="params.showprice" :showsales="params.showsales" :showcart="params.showcart" :cartimg="params.cartimg" idfield="proid" :menuindex="menuindex"></dp-product-item>
+	<!--横排-->
+	<dp-product-itemlist v-if="params.style=='list'" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showprice="params.showprice" :showsales="params.showsales" :showcart="params.showcart" :cartimg="params.cartimg" idfield="proid" :menuindex="menuindex"></dp-product-itemlist>
+	<!--左右滑动-->
+	<dp-product-itemline v-if="params.style=='line'" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showprice="params.showprice" :showsales="params.showsales" :showcart="params.showcart" :cartimg="params.cartimg" idfield="proid" :menuindex="menuindex"></dp-product-itemline>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			menuindex:{default:-1},
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-product{width:100%;height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+</style>
\ No newline at end of file
diff --git a/components/dp-restaurant-product-item/dp-restaurant-product-item.vue b/components/dp-restaurant-product-item/dp-restaurant-product-item.vue
new file mode 100644
index 0000000..a1a0fb9
--- /dev/null
+++ b/components/dp-restaurant-product-item/dp-restaurant-product-item.vue
@@ -0,0 +1,81 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="showtype == '0' ? '/restaurant/takeaway/product?id='+item[idfield] : '/restaurant/shop/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3" v-if="showsales=='1' && item.sales>0">已售{{item.sales}}件</view>
+				<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"/></text></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			showtype:{default:'0'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			}
+		}
+	}
+</script>
+<style>
+.dp-product-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-item .item{display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-product-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-product-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-product-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-product-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-product-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-product-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-product-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-product-item .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+.dp-product-item .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:20rpx;right:20rpx;text-align:center;}
+.dp-product-item .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.dp-product-item .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-restaurant-product-itemline/dp-restaurant-product-itemline.vue b/components/dp-restaurant-product-itemline/dp-restaurant-product-itemline.vue
new file mode 100644
index 0000000..77fff3d
--- /dev/null
+++ b/components/dp-restaurant-product-itemline/dp-restaurant-product-itemline.vue
@@ -0,0 +1,81 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-itemline">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto"  :data-url="showtype == '0' ? '/restaurant/takeaway/product?id='+item[idfield] : '/restaurant/shop/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3" v-if="showsales=='1' && item.sales>0">已售{{item.sales}}件</view>
+				<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"/></text></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" :menuindex="menuindex" :controller="showtype == '0' ? 'ApiRestaurantTakeaway' : 'ApiRestaurantShop'"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			showtype:{default:'0'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			}
+		}
+	}
+</script>
+<style>
+.dp-product-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-product-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-product-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-product-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-product-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-product-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-product-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-product-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-product-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-product-itemline .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+.dp-product-itemline .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:20rpx;right:20rpx;text-align:center;}
+.dp-product-itemline .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.dp-product-itemline .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-restaurant-product-itemlist/dp-restaurant-product-itemlist.vue b/components/dp-restaurant-product-itemlist/dp-restaurant-product-itemlist.vue
new file mode 100644
index 0000000..dc13292
--- /dev/null
+++ b/components/dp-restaurant-product-itemlist/dp-restaurant-product-itemlist.vue
@@ -0,0 +1,75 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-itemlist">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto"  :data-url="showtype == '0' ? '/restaurant/takeaway/product?id='+item[idfield] : '/restaurant/shop/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+					<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+				</view>
+				<view class="p3">
+					<view class="p3-1" v-if="showsales=='1' && item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+				</view>
+				<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"/></text></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex" :controller="showtype == '0' ? 'ApiRestaurantTakeaway' : 'ApiRestaurantShop'"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			showtype:{default:'0'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+			},
+		}
+	}
+</script>
+<style>
+.dp-product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-product-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-product-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.dp-product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.dp-product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.dp-product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.dp-product-itemlist .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-restaurant-product/dp-restaurant-product.vue b/components/dp-restaurant-product/dp-restaurant-product.vue
new file mode 100644
index 0000000..a26f24d
--- /dev/null
+++ b/components/dp-restaurant-product/dp-restaurant-product.vue
@@ -0,0 +1,26 @@
+<template>
+<view class="dp-product" :style="{
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<!--123排-->
+	<dp-restaurant-product-item v-if="params.style=='1' || params.style=='2' || params.style=='3'" :showstyle="params.style" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showtype="params.showtype" :showprice="params.showprice" :showsales="params.showsales" :showcart="params.showcart" :cartimg="params.cartimg" idfield="proid" :menuindex="menuindex"></dp-restaurant-product-item>
+	<!--横排-->
+	<dp-restaurant-product-itemlist v-if="params.style=='list'" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showtype="params.showtype" :showprice="params.showprice" :showsales="params.showsales" :cartimg="params.showcart" idfield="proid" :menuindex="menuindex"></dp-restaurant-product-itemlist>
+	<!--左右滑动-->
+	<dp-restaurant-product-itemline v-if="params.style=='line'" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showtype="params.showtype" :showprice="params.showprice" :showsales="params.showsales" :cartimg="params.showcart" idfield="proid" :menuindex="menuindex"></dp-restaurant-product-itemline>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			menuindex:{default:-1},
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-product{width:100%;height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+</style>
\ No newline at end of file
diff --git a/components/dp-richtext/dp-richtext.vue b/components/dp-richtext/dp-richtext.vue
new file mode 100644
index 0000000..14fbce3
--- /dev/null
+++ b/components/dp-richtext/dp-richtext.vue
@@ -0,0 +1,24 @@
+<template>
+<view class="dp-richtext" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+		<!-- <rich-text style="background-color:{{params.bgcolor}}" nodes='{{content}}'></rich-text> -->
+		<!-- <template is="wxParse" data="{{wxParseData:content}}"/> -->
+		<!-- <parser html="{{content}}" /> -->
+		<parse :content="content" @navigate="navigate"></parse>
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{},
+			content:{}
+		}
+	}
+</script>
+<style>
+.dp-richtext{height: auto; position: relative;text-align:justify;display:block;word-wrap: break-word;overflow: hidden;font-size:32rpx}
+</style>
\ No newline at end of file
diff --git a/components/dp-scoreshop/dp-scoreshop.vue b/components/dp-scoreshop/dp-scoreshop.vue
new file mode 100644
index 0000000..068cf42
--- /dev/null
+++ b/components/dp-scoreshop/dp-scoreshop.vue
@@ -0,0 +1,113 @@
+<template>
+<view class="dp-scoreshop" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-scoreshop-item" v-if="params.style=='1' || params.style=='2' || params.style=='3'">
+		<view class="item" v-for="(item,index) in data" :style="params.style==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (params.style==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/scoreshop/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}">{{item.score_price}}{{t('积分')}}<text v-if="item.money_price>0">+{{item.money_price}}元</text></text>
+						<text class="t2" v-if="params.showprice == '1'">￥{{item.sell_price}}</text>
+					</view>
+				</view>
+				<view class="p3" v-if="params.showsales=='1' && item.sales>0">已兑换{{item.sales}}件</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-scoreshop-itemlist" v-if="params.style=='list'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/scoreshop/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="params.showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}">{{item.score_price}}{{t('积分')}}<text v-if="item.money_price>0">+{{item.money_price}}元</text></text>
+					<text class="t2" v-if="params.showprice == '1'">￥{{item.sell_price}}</text>
+				</view>
+				<view class="p3">
+					<view class="p3-1" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已兑换{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-scoreshop-itemline" v-if="params.style=='line'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/scoreshop/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}">{{item.score_price}}{{t('积分')}}<text v-if="item.money_price>0">+{{item.money_price}}元</text></text>
+						<text class="t2" v-if="params.showprice == '1'">￥{{item.sell_price}}</text>
+					</view>
+				</view>
+				<view class="p3" v-if="params.showsales=='1' && item.sales>0">已兑换{{item.sales}}件</view>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-scoreshop{height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+.dp-scoreshop-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-scoreshop-item .item{display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-scoreshop-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-scoreshop-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-scoreshop-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-scoreshop-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-scoreshop-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-scoreshop-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-scoreshop-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-scoreshop-item .product-info .p2-1 .t1{font-size:30rpx;}
+.dp-scoreshop-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-scoreshop-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-scoreshop-item .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+
+.dp-scoreshop-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-scoreshop-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-scoreshop-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-scoreshop-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-scoreshop-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-scoreshop-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-scoreshop-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-scoreshop-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-scoreshop-itemlist .product-info .p2 .t1{font-size:30rpx;}
+.dp-scoreshop-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-scoreshop-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.dp-scoreshop-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+
+.dp-scoreshop-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-scoreshop-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-scoreshop-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-scoreshop-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-scoreshop-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-scoreshop-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-scoreshop-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-scoreshop-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-scoreshop-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-scoreshop-itemline .product-info .p2-1 .t1{font-size:30rpx;}
+.dp-scoreshop-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-scoreshop-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-scoreshop-itemline .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+</style>
diff --git a/components/dp-search/dp-search.vue b/components/dp-search/dp-search.vue
new file mode 100644
index 0000000..0aa7ff8
--- /dev/null
+++ b/components/dp-search/dp-search.vue
@@ -0,0 +1,49 @@
+<template>
+<view class="dp-search" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+	<view class="dp-search-search"
+		:style="{borderColor:params.bordercolor,borderRadius:params.borderradius+'px'}">
+		<view class="dp-search-search-f1" :style="{'background-image': 'url('+event_rul +'/static/img/static/img/search_ico.png)'}"></view>
+		<view class="dp-search-search-f2">
+			<input class="dp-search-search-input" @confirm="searchgoto" :data-url="params.hrefurl" name="keyword"
+				:placeholder="params.placeholder|| '输入关键字在店铺内搜索'" placeholder-style="color:#aaa;font-size:28rpx" :style="params.color?'color:'+params.color:''" />
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	var app =getApp();
+	export default {
+		props: {
+			params: {},
+			data: {}
+		},
+		data() {
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		methods:{
+			searchgoto:function(e){
+				var url = e.currentTarget.dataset.url;
+					if (url.indexOf('?') > 0) {
+						url += '&keyword='+e.detail.value;
+					}else{
+						url += '?keyword='+e.detail.value;
+					}
+					var opentype = e.currentTarget.dataset.opentype
+					app.goto(url,opentype);
+			}
+		}
+	}
+</script>
+<style>
+.dp-search {padding:20rpx;height: auto; position: relative;}
+.dp-search-search {height:72rpx;background: #fff;border: 1px solid #c0c0c0;border-radius: 6rpx;overflow: hidden;display:flex}
+.dp-search-search-f1 {height:72rpx;width:72rpx;color: #666;border: 0px;padding: 0px;margin: 0px;background-position: center;background-repeat: no-repeat; background-size:30rpx;}
+.dp-search-search-f2{height: 72rpx;flex:1}
+.dp-search-search-input {height:72rpx;width: 100%;border: 0px;padding: 0px;margin: 0px;outline: none;color: #666;}
+</style>
diff --git a/components/dp-seckill/dp-seckill.vue b/components/dp-seckill/dp-seckill.vue
new file mode 100644
index 0000000..35f6ffe
--- /dev/null
+++ b/components/dp-seckill/dp-seckill.vue
@@ -0,0 +1,144 @@
+<template>
+<view class="dp-seckill" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-seckill-item" v-if="params.style=='1' || params.style=='2' || params.style=='3'">
+		<view class="item" v-for="(item,index) in data" :style="params.style==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (params.style==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/seckill/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="params.showprice == '1'">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view v-if="params.showtime == 1 && params.style!='3'" style="color:#333;font-size:24rpx">
+					<view v-if="item.seckill_status == 2">活动已结束</view>
+					<view v-if="item.seckill_status == 1" class="flex-row"><view class="h24">还剩余</view><view class="flex1"></view><uni-countdown :show-day="false" color="#FFFFFF" background-color="#fd4a46" :hour="item.hour" :minute="item.minute" :second="item.second" splitorColor="#333"></uni-countdown></view>
+					<view v-if="item.seckill_status == 0" class="flex-row"><view class="h24">距开抢</view><view class="flex1"></view><uni-countdown :show-day="false" color="#FFFFFF" background-color="#fd4a46" :hour="item.hour" :minute="item.minute" :second="item.second" splitorColor="#333"></uni-countdown></view>
+				</view>
+				
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">秒杀</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已抢购{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-seckill-itemlist" v-if="params.style=='list'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/seckill/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="params.showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+					<text class="t2" v-if="params.showprice == '1'">￥{{item.market_price}}</text>
+				</view>
+				<view v-if="params.showtime == 1" style="color:#333;font-size:24rpx">
+					<view v-if="item.seckill_status == 2">活动已结束</view>
+					<view v-if="item.seckill_status == 1" class="flex-row"><view class="h24">距活动结束</view><view class="flex1"></view>
+						<uni-countdown v-if="item.day > 0" :show-day="true" color="#FFFFFF" background-color="#fd4a46" :day="item.day" :hour="item.day_hour" :minute="item.minute" :second="item.second" splitorColor="#333"></uni-countdown>
+						<uni-countdown v-else :show-day="false" color="#FFFFFF" background-color="#fd4a46" :day="item.day" :hour="item.hour" :minute="item.minute" :second="item.second"></uni-countdown>
+					</view>
+					<view v-if="item.seckill_status == 0" class="flex-row"><view class="h24">距活动开始</view><view class="flex1"></view>
+						<uni-countdown v-if="item.day > 0" :show-day="true" color="#FFFFFF" background-color="#fd4a46" :day="item.day" :hour="item.day_hour" :minute="item.minute" :second="item.second" splitorColor="#333"></uni-countdown>
+						<uni-countdown v-else :show-day="false" color="#FFFFFF" background-color="#fd4a46" :day="item.day" :hour="item.hour" :minute="item.minute" :second="item.second"></uni-countdown>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">秒杀</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已抢购{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-seckill-itemline" v-if="params.style=='line'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/seckill/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">￥</text>{{item.sell_price}}</text>
+						<text class="t2" v-if="params.showprice == '1'">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-1" :style="{background:'rgba('+t('color1rgb')+',0.12)',color:t('color1')}">秒杀</view>
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已抢购{{item.sales}}件</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-seckill{height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+.dp-seckill-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-seckill-item .item{display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-seckill-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-seckill-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-seckill-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-seckill-item .product-info {padding:20rpx 10rpx;position: relative;}
+.dp-seckill-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-seckill-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-seckill-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-seckill-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-seckill-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-seckill-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-seckill-item .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-seckill-item .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-seckill-item .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+.dp-seckill-item .product-info .h24 {height: 48rpx; line-height: 48rpx;padding: 2rpx 0; margin: 4rpx 0;}
+
+.dp-seckill-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-seckill-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-seckill-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-seckill-itemlist .product-pic .image{width: 100%;height:auto}
+.dp-seckill-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-seckill-itemlist .product-info {width: 70%;padding:6rpx 0rpx 5rpx 20rpx;position: relative;}
+.dp-seckill-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-seckill-itemlist .product-info .p2 {height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-seckill-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-seckill-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-seckill-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-seckill-itemlist .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-seckill-itemlist .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+.dp-seckill-itemlist .product-info .h24 {height: 48rpx; line-height: 48rpx;padding: 2rpx 0; margin: 4rpx 0;}
+
+.dp-seckill-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-seckill-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-seckill-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-seckill-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-seckill-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-seckill-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-seckill-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-seckill-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-seckill-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-seckill-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-seckill-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-seckill-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-seckill-itemline .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-seckill-itemline .product-info .p3-1{height:40rpx;line-height:40rpx;border:0 #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-seckill-itemline .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+</style>
\ No newline at end of file
diff --git a/components/dp-shop/dp-shop.vue b/components/dp-shop/dp-shop.vue
new file mode 100644
index 0000000..0d3fb1a
--- /dev/null
+++ b/components/dp-shop/dp-shop.vue
@@ -0,0 +1,66 @@
+<template>
+<view>
+	<view v-if="params.style == 1" class="dp-shop-1">
+		<image class="shop1-img" :src="params.bgimg"></image>
+		<view v-if="params.menu == 1" class="shop1-menu" :style="{color:params.navcolor}">
+			<view v-for="item in data" :key="item.id" @click="goto" :data-url="item.hrefurl">
+				<view class="shop1-nav">
+					<image :src="item.imgurl" style="width:36rpx;height:36rpx"/>
+					<view>{{item.text}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="shop1-shopname" v-if="params.name == 1">
+			<view class="shop1-name">{{shopinfo.name}}</view>
+		</view>
+		<view class="shop1-shoplogo" v-if="params.logo == 1"> 
+			<view class="shop1-shoplogo-img">
+				<image class="shop1-shoplogo-img-img" :src="shopinfo.logo"></image>
+			</view>
+		</view>
+	</view>
+	<view v-if="params.style == 2" class="dp-shop-2">
+		<image class="shop2-img" :src="params.bgimg"></image>
+		<view v-if="params.logo == 1" class="shop2-shoplogo">
+			<image class="shop2-shoplogo-img" :src="shopinfo.logo"></image>
+		</view>
+		<view v-if="params.name == 1" class="shop2-shopname">{{shopinfo.name}}</view>
+		<view v-if="params.menu == 1" class="shop2-menu" :style="{color:params.navcolor}">
+			<view class="shop2-nav" v-for="item in data" :key="item.id" @click="goto" :data-url="item.hrefurl">
+				<image :src="item.imgurl" style="width:36rpx;height:36rpx"/>
+				<view style="font-size:24rpx;">{{item.text}}</view>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		props: {
+			params:{},
+			data:{},
+			shopinfo:{},
+		}
+	}
+</script>
+<style>
+.dp-shop-1{height: auto; position: relative;min-height:348rpx;}
+.dp-shop-1 .shop1-img {width: 100%; display: block;}
+.dp-shop-1 .shop1-menu {height: 90rpx; width: 100%; position: absolute; bottom: 0px; left: 0px; background: rgba(0,0,0,0.3); color:#fff;line-height:34rpx}
+.dp-shop-1 .shop1-nav {height:80rpx; width:25%; padding-top:10rpx; float:left; text-align:center; font-size:24rpx;}
+.dp-shop-1 .shop1-nav-on{height:90rpx; border-bottom:6rpx solid #dd2322;}
+.dp-shop-1 .shop1-shopname {height:48rpx; width:100%; position: absolute; bottom: 110rpx; left: 0px;}
+.dp-shop-1 .shop1-name {height: 48rpx; width: auto; background: rgba(0,0,0,0.2); line-height: 48rpx; margin: auto; display: table; border-radius: 48rpx; font-size: 28rpx; color: #fff; padding: 0px 30rpx;}
+.dp-shop-1 .shop1-shoplogo {height:160rpx; width:160rpx; padding:8rpx; border:1px solid #fff; border-radius:90rpx; margin-left: -80rpx; position: absolute; bottom: 176rpx; left: 50%;}
+.dp-shop-1 .shop1-shoplogo-img {height:140rpx; width:140rpx; padding:8rpx; border:1px solid #fff; border-radius:140rpx; margin:auto;}
+.dp-shop-1 .shop1-shoplogo-img-img {height: 120rpx; width: 120rpx; border-radius: 120rpx;}
+
+.dp-shop-2{height: auto; position: relative;min-height:200rpx;}
+.dp-shop-2 .shop2-img {width: 100%;display:block}
+.dp-shop-2 .shop2-menu {height:90rpx; padding:10rpx 0px 0px 180rpx; text-align:center; background: rgba(0,0,0,0.3);line-height:34rpx;display:flex;position:absolute; left:0; bottom:0;width:100%;z-index:2}
+.dp-shop-2 .shop2-nav {height: 80rpx; width: 25%;}
+.dp-shop-2 .shop2-shoplogo {height:132rpx; width:132rpx; background:#f5f5f5; position:absolute; left:28rpx; bottom:34rpx; border:1px solid #fff;box-shadow:0px 0px 2px rgba(0,0,0,0.1);z-index:3}
+.dp-shop-2 .shop2-shoplogo-img {height:128rpx; width:128rpx;}
+.dp-shop-2 .shop2-shopname {height:80rpx; width:auto; position:absolute; left:180rpx; bottom:90rpx; font-size:32rpx; line-height:80rpx; font-size:36rpx; color:#fff; text-shadow:2px 2px 2px rgba(0,0,0,0.2);z-index:3}
+</style>
\ No newline at end of file
diff --git a/components/dp-shortvideo/dp-shortvideo.vue b/components/dp-shortvideo/dp-shortvideo.vue
new file mode 100644
index 0000000..ba4da5a
--- /dev/null
+++ b/components/dp-shortvideo/dp-shortvideo.vue
@@ -0,0 +1,45 @@
+<template>
+<view class="dp-shortvideo" :style="{
+	color:params.color,
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+	<view class="dp-shortvideo-content">
+		<view v-for="(item, index) in data" :key="index" class="item" :style="{marginRight:index%2==0?'2%':'0'}">
+			<image class="ff" mode="widthFix" :src="item.coverimg" @tap="goto"  :data-url="'/activity/shortvideo/detail?id=' + item.videoId +'&cid='+params.category"></image>
+			<view class="f2">
+				<view class="t1" v-if="params.showlogo==1"><image class="touxiang" :src="item.logo"/></view>
+				<view class="t2" v-if="params.showviewnum==1"><image class="tubiao" :src="event_rul + '/static/img/static/img/shortvideo_playnum.png'"/>{{item.view_num}}</view>
+				<view class="t3" v-if="params.showzannum==1"><image class="tubiao" :src="event_rul + '/static/img/static/img/shortvideo_likenum.png'"/>{{item.zan_num}}</view>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		data(){
+			return {
+				pre_url:getApp().globalData.pre_url,
+				event_rul: getApp().globalData.event_url,
+			}
+		},
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-shortvideo{height: auto;position: relative; }
+.dp-shortvideo-content{position:relative;display:flex;flex-wrap:wrap}
+.dp-shortvideo-content .item{width:49%;height:500rpx;background:#fff;overflow:hidden;border-radius:8rpx;margin-bottom:20rpx;position:relative}
+.dp-shortvideo-content .item .ff{width:100%;height:100%;display:block;}
+.dp-shortvideo-content .item .f2{position: absolute;bottom:20rpx;left:20rpx;display:flex;align-items:center;color:#fff;font-size:22rpx}
+.dp-shortvideo-content .item .f2 .t1{display:flex;align-items:center;text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);}
+.dp-shortvideo-content .item .f2 .t2{display:flex;align-items:center;margin-left:30rpx;text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);}
+.dp-shortvideo-content .item .f2 .t3{display:flex;align-items:center;margin-left:30rpx;text-shadow: 0px 6px 12px rgba(0, 0, 0, 0.12);}
+.dp-shortvideo-content .item .f2 .tubiao{display:block;height:28rpx;width:28rpx;margin-right:10rpx}
+.dp-shortvideo-content .item .f2 .touxiang{display:block;width:40rpx;height:40rpx;border-radius:50%;}
+</style>
\ No newline at end of file
diff --git a/components/dp-tabbar/dp-tabbar.vue b/components/dp-tabbar/dp-tabbar.vue
new file mode 100644
index 0000000..8b0d75e
--- /dev/null
+++ b/components/dp-tabbar/dp-tabbar.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="dp-tabbar"  v-if="urlList.indexOf(url) != -1">
+		<view class="dp-tabbar-bot"></view>
+		<view class="dp-tabbar-bar" :style="{backgroundColor:menudata.backgroundColor}">
+			<view @click='gotoFn("/pages/index/index")'  class="dp-tabbar-item" >
+				<view class="dp-tabbar-image-box">
+					<image v-if="url==='pages/index/index'" class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar-selected1.svg'"></image>
+					<image v-else class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar1.svg'"></image>
+				</view>
+				<view class="dp-tabbar-text" :class="{'select-text': url==='pages/index/index'}">首页</view>
+			</view>
+			<view @click='gotoFn("/pages/shop/classify")'  class="dp-tabbar-item" >
+				<view class="dp-tabbar-image-box">
+					<image v-if="url==='pages/shop/classify'" class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar-selected2.svg'">
+					</image>
+					<image v-else class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar2.svg'"></image>
+				</view>
+				<view class="dp-tabbar-text" :class="{'select-text': url==='pages/shop/classify'}">全部商品</view>
+			</view>
+
+			<view @click='gotoFn("/pages/shop/cart")'  class="dp-tabbar-item">
+				<view class="dp-tabbar-image-box">
+					<image v-if="url==='pages/shop/cart'" class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar-selected4.svg'"></image>
+					<image v-else class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar4.svg'"></image>
+				</view>
+				<view class="dp-tabbar-text" :class="{'select-text': url==='pages/shop/cart'}">购物车</view>
+			</view>
+			<view @click='gotoFn("/pages/my/usercenter")' class="dp-tabbar-item">
+				<view class="dp-tabbar-image-box">
+					<image v-if="url==='pages/my/usercenter'" class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar-selected5.svg'"></image>
+					<image v-else class="dp-tabbar-icon" :src="event_rul +'/static/img/home/tabbar5.svg'"></image>
+				</view>
+				<view class="dp-tabbar-text" :class="{'select-text': url==='pages/my/usercenter'}">我的</view>
+			</view>
+		</view>
+		<!-- 	<view class="dp-tabbar-bar" :style="{backgroundColor:menudata.backgroundColor}">
+		<view @click='gotoFn" :data-url="item.pagePath" :data-index="index" :data-opentype="index!=0&&getplatform()=='baidu'?'':opentype" class="dp-tabbar-item" v-for="(item,index) in menudata.list" :key="item.id">
+			<view class="dp-tabbar-image-box">
+				<image v-if="currentIndex===index" class="dp-tabbar-icon" :src="item.selectedIconPath"></image>
+				<image v-else class="dp-tabbar-icon" :src="item.iconPath"></image>
+			</view>
+			<view class="dp-tabbar-text" :style="{color:item.color}">{{item.text}}</view>
+		</view>
+	</view> -->
+	</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				urlList:['diary/attention/attention','diary/evernote/evernote','diary/video/video','pages/index/index','pages/shop/classify','diary/live/live','pages/shop/cart','diary/index/index','pages/my/usercenter'],
+				menudata: {},
+				url: '',
+				currentIndex: -1,
+				i: 0,
+				opentype: 'reLaunch',
+				event_rul: app.globalData.event_url,
+			}
+		},
+		mounted: function() {
+			this.settabbar();
+		},
+		created() {
+			var pages = getCurrentPages()
+			console.log('ze s sm', pages[pages.length - 1].route)
+			// 		let currentPage = pages[pages.length - 1]['$page']['fullPath']
+			this.url = pages[pages.length - 1].route
+		},
+		props: {
+			opt: {}
+		},
+		methods: {
+			gotoFn(url){
+				if(url !== ('/'+this.url)){
+					app.goto(url,'reLaunch')
+				}
+				
+			},
+			settabbar: function() {
+				var that = this
+				if (!app.globalData.isinit && this.i < 100) {
+					setTimeout(function() {
+						that.i++;
+						that.settabbar();
+					}, 100)
+				} else {
+					var opentype = 'reLaunch';
+					var currenturl = app._url();
+					var opt = this.opt;
+					if (this.opt && this.opt.id) {
+						currenturl += '?id=' + this.opt.id
+					} else if (this.opt && this.opt.cid) {
+						currenturl += '?cid=' + this.opt.cid
+					} else if (this.opt && this.opt.gid) {
+						currenturl += '?gid=' + this.opt.gid
+					} else if (this.opt && this.opt.bid) {
+						currenturl += '?bid=' + this.opt.bid
+					}
+					var currentIndex = -1;
+					var hastabbar = false;
+					var menudata = JSON.parse(JSON.stringify(app.globalData.initdata.menudata));
+					var tablist = menudata['list'];
+					for (var i = 0; i < tablist.length; i++) {
+						if (tablist[i]['pagePath'] == currenturl) {
+							currentIndex = i;
+							hastabbar = true;
+							menudata['list'][i].color = menudata['selectedColor']
+						} else {
+							menudata['list'][i].color = menudata['color']
+						}
+					}
+					if (hastabbar == false) {
+						var menu2data = JSON.parse(JSON.stringify(app.globalData.initdata.menu2data))
+						if (menu2data.length > 0) {
+							for (var i in menu2data) {
+								if (this.opt && this.opt.bid)
+									menu2data[i].indexurl = (menu2data[i].indexurl).replace('[bid]', this.opt.bid);
+								if (menu2data[i].indexurl == currenturl) {
+									hastabbar = true;
+									currentIndex = 10;
+									menudata = menu2data[i]
+									console.log(menudata);
+									console.log(this.opt)
+									for (var j in menudata.list) {
+										if (this.opt && this.opt.bid)
+											menudata.list[j].pagePath = (menudata.list[j].pagePath).replace('[bid]',
+												this.opt.bid);
+										if (menudata.list[j].pagePath == currenturl && menudata['selectedColor']) {
+											menudata['list'][j].color = menudata['selectedColor'];
+											if (menudata['list'][j]['selectedIconPath']) {
+												menudata['list'][j].iconPath = menudata['list'][j]['selectedIconPath'];
+											}
+										} else if (menudata['color']) {
+											menudata['list'][j].color = menudata['color'];
+										}
+									}
+									opentype = '';
+									console.log(menudata);
+								}
+							}
+						}
+					}
+					that.opentype = opentype
+					that.currentIndex = currentIndex
+					that.menudata = menudata
+					//app.globalData.currentIndex = currentIndex;
+					console.log(currentIndex);
+					that.$emit('getmenuindex', currentIndex)
+				}
+			},
+		}
+	}
+</script>
+<style>
+	.dp-tabbar {
+		height: auto;
+		position: relative;
+	}
+
+	.dp-tabbar-icon {
+		width: 50rpx;
+		height: 50rpx;
+	}
+
+	.dp-tabbar-bar {
+		display: flex;
+		flex-direction: row;
+		width: 100%;
+		height: 100rpx;
+		position: fixed;
+		bottom: 0;
+		padding: 10rpx 0 0 0;
+		background: #fff;
+		font-size: 24rpx;
+		color: #999;
+		border-top: 1px solid #e5e5e5;
+		z-index: 999999;
+		box-sizing: content-box
+	}
+
+	.dp-tabbar-item {
+		flex: 1;
+		text-align: center;
+		overflow: hidden;
+		align-items: center
+	}
+
+	.dp-tabbar-image-box {
+		height: 54rpx;
+		margin-bottom: 4rpx;
+	}
+
+	.dp-tabbar-text {
+		line-height: 30rpx;
+		font-size: 20rpx;
+		font-weight: 500;
+	}
+	.select-text {
+		color: #0A5D3B;
+	}
+
+	.dp-tabbar-bot {
+		height: 110rpx;
+		width: 100%;
+		box-sizing: content-box
+	}
+
+	@supports(bottom: env(safe-area-inset-bottom)) {
+
+		.dp-tabbar-bot {
+			padding-bottom: env(safe-area-inset-bottom);
+		}
+
+		.dp-tabbar-bar {
+			padding-bottom: env(safe-area-inset-bottom);
+		}
+
+	}
+</style>
diff --git a/components/dp-text/dp-text.vue b/components/dp-text/dp-text.vue
new file mode 100644
index 0000000..32d6b62
--- /dev/null
+++ b/components/dp-text/dp-text.vue
@@ -0,0 +1,29 @@
+<template>
+<view class="dp-text" :style="{
+	textAlign:params.align,
+	color:params.color,
+	background:params.bgpic ? 'url('+params.bgpic+')' : params.bgcolor,
+	backgroundSize:'100%',
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx',
+	fontWeight:params.fontbold?'bold':'normal'
+}" @tap="goto" :data-url="params.hrefurl">
+	<text :style="[{
+		whiteSpace:'pre-wrap',
+		letterSpacing:params.letter_spacing ? params.letter_spacing+'px' : 'normal',
+		fontSize:params.fontsize*2+'rpx',
+		lineHeight:params.lineheight*2+'rpx'
+	}]">{{params.showcontent || '文本内容'}}</text>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-text{height: auto; position: relative;}
+</style>
\ No newline at end of file
diff --git a/components/dp-title/dp-title.vue b/components/dp-title/dp-title.vue
new file mode 100644
index 0000000..1ad0777
--- /dev/null
+++ b/components/dp-title/dp-title.vue
@@ -0,0 +1,43 @@
+<template>
+<view class="dp-title" :style="{
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-title-s1">
+		<view class="dp-title-s1-line" :style="{borderColor:params.linecolor}"></view>
+		<view class="dp-title-s1-text">
+			<view class="dp-title-s1-text1" :style="{fontSize:params.fontsize*2+'rpx',color:params.color}">
+				<image class="image" v-if="params.showicon==1" :src="params.imgurl" :style="{width:params.iconsize*2+'rpx'}" mode="widthFix"/>
+				<text v-if="params.title!=''" class="dp-title-s1-title1">{{params.title}}</text>
+			</view>
+		</view>
+		<view class="dp-title-s1-line" :style="{borderColor:params.linecolor}"></view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-title{height: auto; position: relative;}
+.dp-title-s1 {height: auto;overflow: hidden;display:flex;align-items:center}
+.dp-title-s1-line{height: auto; padding: 0; overflow: hidden;flex:1;height:0;border-top:1px solid #ccc}
+.dp-title-s1-text{padding:0 32rpx;text-align:center;}
+.dp-title-s1-text1{text-align:center;display:flex;align-items:center;justify-content:center}
+.dp-title-s1-text1 .image{text-align:center;max-width:400rpx;max-height:100rpx;margin:0 4rpx;height:auto}
+.dp-title-s1-title1{margin:0 4rpx}
+.dp-title-s1-text2{text-align:center;height:32rpx;line-height:32rpx}
+
+.dp-title-s2 {width:100%;height: auto;overflow: hidden;display:flex;align-items:center}
+.dp-title-s2-text{padding:0;}
+.dp-title-s2-text1{flex:1;display:flex;align-items:center;}
+.dp-title-s2-text1 .image{max-width:100rpx;max-height:100rpx;margin:0 2px}
+.dp-title-s2-title1{margin:0 4rpx}
+.dp-title-s2-text2{text-align:right;}
+</style>
\ No newline at end of file
diff --git a/components/dp-tuangou-item/dp-tuangou-item.vue b/components/dp-tuangou-item/dp-tuangou-item.vue
new file mode 100644
index 0000000..bd5de72
--- /dev/null
+++ b/components/dp-tuangou-item/dp-tuangou-item.vue
@@ -0,0 +1,81 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">低至￥</text>{{item.min_price}}</text>
+						<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3" v-if="showsales=='1'">已售{{item.sales}}件</view>
+				<view class="p4" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			}
+		}
+	}
+</script>
+<style>
+.dp-tuangou-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-tuangou-item .item{display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-tuangou-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-tuangou-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-tuangou-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-tuangou-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-tuangou-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-tuangou-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-tuangou-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-tuangou-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-tuangou-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-tuangou-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-tuangou-item .product-info .p3{color:#999999;font-size:18rpx;margin-top:10rpx}
+.dp-tuangou-item .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:20rpx;right:20rpx;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-tuangou-item .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-tuangou-item .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-tuangou-itemline/dp-tuangou-itemline.vue b/components/dp-tuangou-itemline/dp-tuangou-itemline.vue
new file mode 100644
index 0000000..3ac87d9
--- /dev/null
+++ b/components/dp-tuangou-itemline/dp-tuangou-itemline.vue
@@ -0,0 +1,79 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-itemline">
+		<view class="item" v-for="item in data" :key="item.id" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx">低至￥</text>{{item.min_price}}</text>
+						<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+					</view>
+				</view>
+				<view class="p3" v-if="showsales=='1'">已售{{item.sales}}件</view>
+				<view class="p4" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+			}
+		},
+		props: {
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			}
+		}
+	}
+</script>
+<style>
+.dp-tuangou-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-tuangou-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-tuangou-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-tuangou-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-tuangou-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-tuangou-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-tuangou-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-tuangou-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-tuangou-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-tuangou-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-tuangou-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-tuangou-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-tuangou-itemline .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+.dp-tuangou-itemline .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:20rpx;right:20rpx;align-items: center;justify-content: center;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-tuangou-itemline .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-tuangou-itemline .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-tuangou-itemlist/dp-tuangou-itemlist.vue b/components/dp-tuangou-itemlist/dp-tuangou-itemlist.vue
new file mode 100644
index 0000000..e334bea
--- /dev/null
+++ b/components/dp-tuangou-itemlist/dp-tuangou-itemlist.vue
@@ -0,0 +1,73 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-itemlist">
+		<view class="item" v-for="item in data" :key="item.id" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}"><text style="font-size:24rpx;padding-right:1px">低至￥</text>{{item.min_price}}</text>
+					<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+				</view>
+				<view class="p3">
+					<view class="p3-1" v-if="showsales=='1'"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+				</view>
+				<view class="p4" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+			}
+		},
+		props: {
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+			},
+		}
+	}
+</script>
+<style>
+.dp-tuangou-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-tuangou-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-tuangou-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-tuangou-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-tuangou-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-tuangou-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-tuangou-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-tuangou-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-tuangou-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-tuangou-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-tuangou-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.dp-tuangou-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.dp-tuangou-itemlist .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:6rpx;right:4rpx;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-tuangou-itemlist .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-tuangou-itemlist .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-tuangou/dp-tuangou.vue b/components/dp-tuangou/dp-tuangou.vue
new file mode 100644
index 0000000..31bed8e
--- /dev/null
+++ b/components/dp-tuangou/dp-tuangou.vue
@@ -0,0 +1,27 @@
+<template>
+<view class="dp-tuangou" :style="{
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx',
+	width:'calc(100% - '+params.margin_x*2.2*2+'rpx)'
+}">
+	<!--123排-->
+	<dp-tuangou-item v-if="params.style=='1' || params.style=='2' || params.style=='3'" :showstyle="params.style" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showprice="params.showprice" :showsales="params.showsales" :showcart="params.showcart" :cartimg="params.cartimg" idfield="proid" :menuindex="menuindex"></dp-tuangou-item>
+	<!--横排-->
+	<dp-tuangou-itemlist v-if="params.style=='list'" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showprice="params.showprice" :showsales="params.showsales" :showcart="params.showcart" :cartimg="params.cartimg" idfield="proid" :menuindex="menuindex"></dp-tuangou-itemlist>
+	<!--左右滑动-->
+	<dp-tuangou-itemline v-if="params.style=='line'" :data="data" :saleimg="params.saleimg" :showname="params.showname" :showprice="params.showprice" :showsales="params.showsales" :showcart="params.showcart" :cartimg="params.cartimg" idfield="proid" :menuindex="menuindex"></dp-tuangou-itemline>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			menuindex:{default:-1},
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-tuangou{width:100%;height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+</style>
\ No newline at end of file
diff --git a/components/dp-userinfo/dp-userinfo.vue b/components/dp-userinfo/dp-userinfo.vue
new file mode 100644
index 0000000..552e885
--- /dev/null
+++ b/components/dp-userinfo/dp-userinfo.vue
@@ -0,0 +1,350 @@
+<template>
+<view>
+	<view v-if="params.style==1" :style="'background: linear-gradient(180deg, '+t('color1')+' 0%, rgba('+t('color1rgb')+',0) 100%);'">
+		<view class="dp-userinfo" :style="{background:'url('+event_rul+'/static/images/userinfo-bg.png) no-repeat',backgroundSize:'101% auto',backgroundPosition: 'left -1rpx top 0',margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx',padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'}">
+			<view class="banner">
+				<view class='info'>
+					<view class="f1">
+						<button class="button-view" hoverClass="button-view-hover" bindgetuserinfo="bindGetUserInfo" open-type="getUserInfo" lang="zh_CN" style="margin:0"><image :src="data.userinfo.headimg" background-size="cover" class="headimg"/></button>
+						<view class="flex-y-center">
+							<view class="nickname">{{data.userinfo.nickname}}</view>
+							<text v-if="params.midshow=='1'" style="font-size:26rpx;padding-left:10rpx">(ID:{{data.userinfo.id}})</text>
+							<view class="user-level" @tap="goto" data-url="/pages/my/levelinfo" v-if="params.levelshow==1">
+								<image class="level-img" :src="data.userlevel.icon" v-if="data.userlevel.icon"/>
+								<view class="level-name">{{data.userlevel.name}}</view>
+							</view>
+							<view class="user-level" v-for="(item, index) in data.userlevelList" :key="index" @tap="goto" :data-url="'/pages/my/levelinfo?id=' + item.id" v-if="params.levelshow==1">
+								<image class="level-img" :src='item.icon' v-if="item.icon"/>
+								<view class="level-name">{{item.name}}</view>
+							</view>
+							<view class="usermid" style="margin-left:10rpx;font-size:24rpx;color:#999" v-if="data.userlevel.can_agent > 0 && data.sysset.reg_invite_code!='0' && data.sysset.reg_invite_code_type==1">邀请码：<text user-select="true" selectable="true">{{data.userinfo.yqcode}}</text></view>
+						</view>
+					</view>
+					<block v-if="platform=='wx'">
+						<view class="usercard" v-if="params.cardshow==1 && data.userinfo.card_code" @tap="opencard" :data-card_id="data.userinfo.card_id" :data-card_code="data.userinfo.card_code"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+						<view class="usercard" v-if="params.cardshow==1 && !data.userinfo.card_code" @tap="addmembercard" :data-card_id="data.card_id"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+					</block>
+					<block v-if="platform=='mp'">
+						<view class="usercard" v-if="params.cardshow==1 && data.userinfo.card_code" @tap="opencard" :data-card_id="data.userinfo.card_id" :data-card_code="data.userinfo.card_code"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+						<view class="usercard" v-if="params.cardshow==1 && !data.userinfo.card_code" @tap="goto" :data-url="data.card_returl"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+					</block>
+				</view>
+				<view class="custom_field" v-if="params.moneyshow==1 || params.scoreshow==1 || params.couponshow==1">
+					<view class='item' v-if="params.moneyshow==1" data-url='/pagesA/money/recharge' @tap='goto'>
+						<text class='t2'>{{data.userinfo.money}}</text>
+						<text class="t1">{{t('余额')}}</text>
+					</view>
+					<view class='item' v-if="params.commissionshow==1 && data.userlevel && data.userlevel.can_agent>0" data-url='/pages/commission/index' @tap='goto'>
+						<text class='t2'>{{data.userinfo.commission}}</text>
+						<text class="t1">{{t('佣金')}}</text>
+					</view>
+					<!-- <view class='item' v-if="params.scoreshow==1" data-url='/pages/my/scorelog' @tap='goto'> -->
+					<view class='item' v-if="params.scoreshow==1" data-url="/newOtherPages/myBalance/myBalance?type=zhiweidou" @tap='goto'>
+						<text class='t2'>{{data.userinfo.score}}</text>
+						<text class="t1">{{t('积分')}}</text>
+					</view>
+					<view class='item' v-if="params.couponshow==1" data-url='/pages/coupon/mycoupon' @tap='goto'>
+						<text class='t2'>{{data.userinfo.couponcount}}</text>
+						<text class="t1">{{t('优惠券')}}</text>
+					</view>
+				
+				</view>
+				<block v-if="data.parent_show">
+					<view class="parent" v-if="data.parent" :style="'background: rgba('+t('color1rgb')+',10%);'">
+							<view class="f1">
+								<image class="parentimg" :src="data.parent.headimg"></image>
+								<view class="parentimg-tag" :style="'background: rgba('+t('color1rgb')+',100%);'">推荐人</view>
+							</view>
+							<view class="f2 flex1">
+								<view class="nick">{{data.parent.nickname}}</view>
+								<view class="nick" v-if="data.parent && data.parent.weixin" @tap="copy" :data-text="data.parent.weixin">微信号：{{data.parent.weixin}}<image :src="event_rul +'/static/img/static/img/copy.png'" class="copyicon"></image></view>
+							</view>
+							<view class="f3" v-if="data.parent && data.parent.tel" @tap="goto" :data-url="'tel::'+data.parent.tel"><image :src="event_rul +'/static/img/static/img/tel2.png'" class="handle-img"></image></view>
+					</view>
+					<view class="parent" v-else :style="'background: rgba('+t('color1rgb')+',10%);'">
+						<image class="f1 parentimg" :src="data.sysset.logo"/>
+						<view class="f2 flex1">
+							<view class="nick">{{data.sysset.name}}</view>
+							<view class="nick">{{data.sysset.tel}}</view>
+						</view>
+						<view class="f3" @tap="goto" :data-url="'tel::'+data.sysset.tel"><image :src="event_rul +'/static/img/static/img/tel2.png'" class="handle-img"></image></view>
+					</view>
+				</block>
+			</view>
+			<view class="userset" @tap="goto" data-url="/pages/my/set" v-if="params.seticonshow!=='0'"><image :src="event_rul +'/static/img/static/img/set.png'" class="img"/></view>
+		</view>
+	</view>
+	
+	
+	<view v-if="params.style==2">
+		<view class="dp-userinfo2" v-if="params.style==2" :style="{background:'url('+event_rul+'/static/images/userinfo-bg.png) no-repeat',backgroundSize:'101% auto',backgroundPosition: 'left -1rpx top 0','padding-top': (menuButtonBot + 10) + 'px'}">
+			<view class="info">
+				<image class="headimg" @tap.stop="goto" data-url="/diary/info/info"  :src="data.userinfo.headimg"/>
+				<view class="nickname">
+					<view class="nick"  @tap.stop="goto" data-url="/diary/info/info" >{{data.userinfo.nickname}} </view>
+					<!-- <view class="desc">ID：{{userinfo.id}}</view> -->
+					<view style="display: flex;" v-if="params.levelshow==1">
+						<view class="user-level" @tap="goto" data-url="/pages/my/levelinfo">
+							<image class="level-img" :src='data.userlevel.icon' v-if="data.userlevel.icon"/>
+							<view class="level-name">{{data.userlevel.name}}</view>
+						</view>
+						<view class="user-level" v-for="(item, index) in data.userlevelList" :key="index" @tap="goto" :data-url="'/pages/my/levelinfo?id=' + item.id">
+							<image class="level-img" :src='item.icon' v-if="item.icon"/>
+							<view class="level-name">{{item.name}}</view>
+						</view>
+				
+					</view>
+			
+					<view class="usermid" v-if="params.midshow=='1'">用户ID：<text user-select="true" selectable="true">{{data.userinfo.id}}</text></view>
+					<view class="usermid" v-if="data.userlevel.can_agent > 0 && data.sysset.reg_invite_code!='0' && data.sysset.reg_invite_code_type==1">邀请码：<text user-select="true" selectable="true">{{data.userinfo.yqcode}}</text></view>
+				</view>
+				<view class="ktnum" v-if="params.ktnumshow=='1'" style="display: flex; position: absolute; right: 30rpx; top:30%;color:#ffff; " >开团次数：<text style="font-size: 24rpx;line-height: 40rpx;" >{{data.userinfo.ktnum}}</text></view>
+			</view>
+			<view class="custom_field" v-if="params.moneyshow==1 || params.scoreshow==1 || params.couponshow==1 || params.commissionshow==1">
+				<view class='item' v-if="params.moneyshow==1" data-url='/pagesA/money/recharge' @tap='goto'>
+					<text class='t2'>{{data.userinfo.money}}</text>
+					<text class="t1">{{t('余额')}}</text>
+				</view>
+				<view class='item' v-if="params.commissionshow==1 && data.userlevel && data.userlevel.can_agent>0" data-url='/pages/commission/index' @tap='goto'>
+					<text class='t2'>{{data.userinfo.commission}}</text>
+					<text class="t1">{{t('佣金')}}</text>
+				</view>
+				<!-- <view class='item' v-if="params.scoreshow==1" data-url='/pages/my/scorelog' @tap='goto'> -->
+				<view class='item' v-if="params.scoreshow==1" data-url="/newOtherPages/myBalance/myBalance?type=zhiweidou" @tap='goto'>
+					<text class='t2'>{{data.userinfo.score}}</text>
+					<text class="t1">{{t('积分')}}</text>
+				</view>
+				<view class='item' v-if="params.couponshow==1" data-url='/pages/coupon/mycoupon' @tap='goto'>
+					<text class='t2'>{{data.userinfo.couponcount}}</text>
+					<text class="t1">{{t('优惠券')}}</text>
+				</view>
+				<view class='item' v-if="params.formshow==1" data-url='/pages/form/formlog?st=1' @tap='goto'>
+					<text class='t2'>{{data.userinfo.formcount}}</text>
+					<text class="t1">{{params.formtext}}</text>
+				</view>
+
+			</view>
+			<view class="userset" :style="{top: (menuButtonBot + 24) + 'px'}" @tap="goto" data-url="/pages/my/set" v-if="params.seticonshow!=='0'"><image :src="event_rul +'/static/img/static/icon/set.svg'" class="img"/></view>
+
+			<block v-if="platform=='wx'">
+				<view class="usercard" v-if="params.cardshow==1 && data.userinfo.card_code" @tap="opencard" :data-card_id="data.userinfo.card_id" :data-card_code="data.userinfo.card_code"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+				<view class="usercard" v-if="params.cardshow==1 && !data.userinfo.card_code" @tap="addmembercard" :data-card_id="data.card_id"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+			</block>
+			<block v-if="platform=='mp'">
+				<view class="usercard" v-if="params.cardshow==1 && data.userinfo.card_code" @tap="opencard" :data-card_id="data.userinfo.card_id" :data-card_code="data.userinfo.card_code"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+				<view class="usercard" v-if="params.cardshow==1 && !data.userinfo.card_code" @tap="goto" :data-url="data.card_returl"><image class="img" :src="event_rul +'/static/img/static/img/ico-card2.png'"/><text class="txt">会员卡</text></view>
+			</block>
+		</view>
+	</view>
+	<view class="dp-userinfo-order" v-if="params.style==2 && data.parent_show" :style="{'margin':(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx',marginTop:params.style==2?'-100rpx':'0',marginBottom:'120rpx'}">
+		<view class="parent" v-if="data.parent">
+				<view class="f1">
+					<image class="parentimg" :src="data.parent.headimg"></image>
+					<view class="parentimg-tag" :style="'background: rgba('+t('color1rgb')+',100%);'">推荐人</view>
+				</view>
+				<view class="f2 flex1">
+					<view class="nick">{{data.parent.nickname}}</view>
+					<view class="nick" v-if="data.parent && data.parent.weixin" @tap="copy" :data-text="data.parent.weixin">微信号：{{data.parent.weixin}}<image :src="event_rul +'/static/img/static/img/copy.png'" class="copyicon"></image></view>
+				</view>
+				<view class="f3" v-if="data.parent && data.parent.tel" @tap="goto" :data-url="'tel::'+data.parent.tel"><image :src="event_rul +'/static/img/static/img/tel2.png'" class="handle-img"></image></view>
+		</view>
+		<view class="parent" v-else>
+			<image class="f1 parentimg" :src="data.sysset.logo"/>
+			<view class="f2 flex1">
+				<view class="nick">{{data.sysset.name}}</view>
+				<view class="nick">{{data.sysset.tel}}</view>
+			</view>
+			<view class="f3" @tap="goto" :data-url="'tel::'+data.sysset.tel"><image :src="event_rul +'/static/img/static/img/tel2.png'" class="handle-img"></image></view>
+		</view>
+	</view>
+	<view class="dp-userinfo-order" :style="{'margin':(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx',marginTop:params.style==2?'-100rpx':'0'}" v-if="params.ordershow==1">
+		<view class="head">
+			<text class="f1">我的订单</text>
+			<view class="f2" @tap="goto" data-url="/pages/order/orderlist"><text>查看全部订单</text><image :src="event_rul +'/static/img/static/img/arrowright.png'" class="image"/></view>
+		</view>
+		<view class="content">
+			 <view class="item" @tap="goto" data-url="/pages/order/orderlist?st=0">
+					<!-- <text class="iconfont icondaifukuan" :style="{color:t('color1')}"></text> -->
+					<image class="tabItem image" :src="event_rul +'/static/img/static/icon/myTab1.svg'" mode=""></image>
+					<view class="t2" v-if="data.orderinfo.count0>0">{{data.orderinfo.count0}}</view>
+					<text class="t3">待付款</text>
+			 </view>
+			 <view class="item" @tap="goto" data-url="/pages/order/orderlist?st=1">
+					<!-- <image :src="event_rul +'/static/img/static/img/order2.png'" class="image"/> -->
+					<!-- <text class="iconfont icondaifahuo" :style="{color:t('color1')}"></text> -->
+					<image class="tabItem image" :src="event_rul +'/static/img/static/icon/myTab2.svg'" mode=""></image>
+					<view class="t2" v-if="data.orderinfo.count1>0">{{data.orderinfo.count1}}</view>
+					<text class="t3">待发货</text>
+			 </view>
+			 <view class="item" @tap="goto" data-url="/pages/order/orderlist?st=2">
+					<!-- <image :src="event_rul +'/static/img/static/img/order3.png'" class="image"/> -->
+					<!-- <text class="iconfont icondaishouhuo" :style="{color:t('color1')}"></text> -->
+					<image class="tabItem image" :src="event_rul +'/static/img/static/icon/myTab3.svg'" mode=""></image>
+					<view class="t2" v-if="data.orderinfo.count2>0">{{data.orderinfo.count2}}</view>
+					<text class="t3">待收货</text>
+			 </view>
+			 <view class="item" @tap="goto" data-url="/pages/order/orderlist?st=3">
+					<!-- <image :src="event_rul +'/static/img/static/img/order4.png'" class="image"/> -->
+					<!-- <text class="iconfont iconyiwancheng" :style="{color:t('color1')}"></text> -->
+					<image class="tabItem image" :src="event_rul +'/static/img/static/icon/myTab4.svg'" mode=""></image>
+					<view class="t2" v-if="data.orderinfo.count3>0">{{data.orderinfo.count3}}</view>
+					<text class="t3">已完成</text>
+			 </view>
+			 <view class="item" @tap="goto" data-url="../order/refundlist">
+					<!-- <image :src="event_rul +'/static/img/static/img/order4.png'" class="image"/> -->
+					<!-- <text class="iconfont icontuikuandingdan" :style="{color:t('color1')}"></text> -->
+					<image class="tabItem image" :src="event_rul +'/static/img/static/icon/myTab5.svg'" mode=""></image>
+					<view class="t2" v-if="data.orderinfo.count4>0">{{data.orderinfo.count4}}</view>
+					<text class="t3">退款/售后</text>
+			 </view>
+		</view>
+	</view>
+
+</view>
+</template>
+<script>
+	import { setClipboardData, getClipboardData } from '../u-clipboard/js_sdk'
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				textset:app.globalData.textset,
+				platform:app.globalData.platform,
+				menuButtonBot: 0,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			params:{},
+			data:{}
+		},
+		mounted() {
+			setTimeout(() => {
+				console.log("aaaaa",this.params)
+			}, 200);
+			// #ifdef MP
+				// 获取右上角胶囊坐标信息
+				let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+				this.menuButtonBot = menuButtonInfo.bottom;  // 胶囊底部到页面顶部的距离
+			// #endif
+
+		},
+		methods:{
+			copy: function(e) {
+				var res = setClipboardData(e.currentTarget.dataset.text);
+				console.log(res)
+				app.error('复制成功')
+			},
+			opencard:function(e){
+				var cardId = e.currentTarget.dataset.card_id
+				var code = e.currentTarget.dataset.card_code
+				if(app.globalData.platform == 'mp') {
+					var jweixin = require('jweixin-module');
+					jweixin.openCard({
+						cardList: [{
+							cardId: cardId,
+							code: code
+						}],
+						success:function(res) { }
+					})
+				} else {
+					wx.openCard({
+						cardList: [{
+							cardId: cardId,
+							code: code
+						}],
+						success:function(res) { }
+					})
+				}
+				
+			},
+			//领取微信会员卡
+			addmembercard:function(e){
+				var cardId = e.currentTarget.dataset.card_id
+				app.post('ApiCoupon/getmembercardparam',{card_id:cardId},function(res){
+					if(res.status==0){
+						app.alert(res.msg);
+						return;
+					}
+					wx.navigateToMiniProgram({
+						appId: 'wxeb490c6f9b154ef9', // 固定为此appid，不可改动
+						extraData: res.extraData, // 包括encrypt_card_id outer_str biz三个字段，须从step3中获得的链接中获取参数
+						success: function() {},
+						fail: function() {},
+						complete: function() {}
+					})
+				})
+			},
+		}
+	}
+</script>
+<style>
+.dp-userinfo{position:relative}
+.dp-userinfo .banner{width:100%;margin-top:120rpx;border-radius:16rpx;background:#fff;padding:0 20rpx 10rpx;color:#333;position:relative;}
+.dp-userinfo .banner .info{display:flex;align-items:flex-end}
+.dp-userinfo .banner .info .f1{display:flex;flex-direction:column;}
+.dp-userinfo .banner .headimg{ margin-top:-60rpx;width:148rpx;height:148rpx;border-radius:50%;margin-right:20rpx;border:3px solid #eee;}
+.dp-userinfo .banner .info{margin-left:20rpx;display:flex;flex:auto;}
+.dp-userinfo .banner .info .nickname{min-width:140rpx;max-width:460rpx;text-align:center;height:80rpx;line-height:80rpx;font-size:34rpx;font-weight:bold;max-width: 300rpx;overflow: hidden;white-space: nowrap;}
+.dp-userinfo .banner .getbtn{ width:120rpx;height:44rpx;padding:0 3px;line-height:44rpx;font-size: 24rpx;background: #09BB07;color:#fff;position: absolute;top:76rpx;left:10rpx;}
+.dp-userinfo .banner .user-level{margin-left:5px;color:#b48b36;background-color:#ffefd4;margin-top:2px;width:auto;height:36rpx;border-radius:18rpx;padding:0 20rpx;display:flex;align-items:center}
+.dp-userinfo .banner .user-level .level-img{width:32rpx;height:32rpx;margin-right:3px;margin-left:-14rpx;border-radius:50%;}
+.dp-userinfo .banner .user-level .level-name{font-size:24rpx;}
+.dp-userinfo .banner .user-level image{border-radius:50%;}
+.dp-userinfo .banner .usercard{position:absolute;right:32rpx;top:28rpx;width:160rpx;height:60rpx;text-align:center;border:1px solid #FFB2B2;border-radius:8rpx;color:#FC4343;font-size:24rpx;font-weight:bold;display:flex;align-items:center;justify-content:center}
+.dp-userinfo .banner .usercard .img{width:30rpx;height:30rpx;margin-right:8rpx;padding-bottom:4rpx}
+
+.dp-userinfo .custom_field{display:flex;width:100%;align-items:center;padding:16rpx 8rpx;background:#fff}
+.dp-userinfo .custom_field .item{flex:1;display:flex;flex-direction:column;justify-content:center;align-items:center}
+.dp-userinfo .custom_field .item .t1{color:#666;font-size:26rpx}
+.dp-userinfo .custom_field .item .t2{color:#111;font-weight:bold;font-size:36rpx;}
+
+.dp-userinfo .userset{width:54rpx;height:54rpx;padding:10rpx;position:absolute;top:40rpx;right:30rpx}
+.dp-userinfo .userset .img{width:100%;height:100%}
+
+.dp-userinfo2{display:flex;flex-direction:column;position:relative}
+.dp-userinfo2 .info{display:flex;margin-left:40rpx}
+.dp-userinfo2 .info .headimg{width:94rpx;height:94rpx;background:#fff;border-radius:50%}
+.dp-userinfo2 .info .nickname{margin-left:20rpx;display:flex;flex-direction:column;justify-content:center}
+.dp-userinfo2 .info .nickname .nick{font-size:36rpx;font-weight:bold;color:#fff;height:50rpx;line-height:50rpx;max-width:400rpx;overflow:hidden;margin-right:10rpx}
+.dp-userinfo2 .info .nickname .desc{font-size:24rpx;color:rgba(255,255,255,0.6);height:40rpx;line-height:40rpx}
+.dp-userinfo2 .info .nickname .user-level{color:rgba(255,255,255,0.6);margin-top:2px;width:auto;height:36rpx;border-radius:18rpx;padding:0 20rpx;display:flex;align-items:center}
+.dp-userinfo2 .info .nickname .user-level .level-img{width:32rpx;height:32rpx;margin-right:3px;margin-left:-14rpx;border-radius:50%;}
+.dp-userinfo2 .info .nickname .user-level .level-name{font-size:24rpx;}
+.dp-userinfo2 .info .nickname .usermid{color:rgba(255,255,255,0.8);font-size:24rpx;}
+
+.dp-userinfo2 .custom_field{display:flex;width:100%;align-items:center;padding:60rpx 8rpx 144rpx;}
+.dp-userinfo2 .custom_field .item{flex:1;display:flex;flex-direction:column;justify-content:center;align-items:center}
+.dp-userinfo2 .custom_field .item .t1{color:rgba(255,255,255,0.6);font-size:24rpx;margin-top:10rpx}
+.dp-userinfo2 .custom_field .item .t2{color:#FFFFFF;font-weight:bold;font-size:32rpx;}
+
+.dp-userinfo2 .usercard{width:154rpx;height:54rpx;background:#fff;border-radius: 27rpx 0 0 27rpx;display:flex;align-items:center;padding-left:20rpx;position:absolute;top:140rpx;right:0}
+.dp-userinfo2 .usercard .img{width:32rpx;height:32rpx;margin-right:6rpx}
+.dp-userinfo2 .usercard .txt{color:#F4504C;font-size:24rpx;font-weight:bold}
+.dp-userinfo2 .userset{width:44rpx;height:38rpx;position:absolute;right:40rpx}
+.dp-userinfo2 .userset .img{width:100%;height:100%}
+
+.dp-userinfo-order{background:#fff;margin: -104rpx 24rpx 0;padding:0 24rpx;border-radius:16rpx;position:relative}
+.dp-userinfo-order .head{ display:flex;align-items:center;width:100%;padding:24rpx 0;}
+.dp-userinfo-order .head .f1{flex:auto;font-size:30rpx;font-weight:bold;color:#333;line-height: 44rpx;}
+.dp-userinfo-order .head .f2{ display:flex;align-items:center;color:#999;width:200rpx;font-size:24rpx;line-height:34rpx;text-align:right;justify-content:flex-end}
+.dp-userinfo-order .head .f2 .image{ width:24rpx;height:24rpx;}
+.dp-userinfo-order .head .t3{ width:40rpx; height:40rpx;}
+.dp-userinfo-order .content{ display:flex;width:100%;padding-bottom:28rpx;align-items:center;font-size:24rpx;color: #333;}
+.dp-userinfo-order .content .item{flex:1;display:flex;flex-direction:column;align-items:center;position:relative}
+.dp-userinfo-order .content .item .image{ width:60rpx;height:60rpx}
+.dp-userinfo-order .content .item .iconfont{font-size:60rpx}
+.dp-userinfo-order .content .item .t3{ padding-top:10rpx}
+.dp-userinfo-order .content .item .t2{display:flex;align-items:center;justify-content:center;background: red;color: #fff;border-radius:50%;padding: 0 10rpx;position: absolute;top: 0px;right:20rpx;width:35rpx;height:35rpx;text-align:center;}
+
+.parent {padding:20rpx;border-radius:16rpx;justify-content: center;display:flex;align-items:center;font-size:24rpx; margin-bottom: 10rpx;}
+.parent .parentimg{ width: 100rpx; height:100rpx; border-radius: 50%; z-index: 10;}
+.parent .parentimg-tag { color: #fff; text-align: center; margin-top: -20rpx; z-index: 11; border-radius: 12rpx; padding: 2rpx 4rpx; position: relative; bottom: 2rpx;}
+.parent .copyicon {width: 26rpx; height: 26rpx; margin-left: 8rpx; position: relative; top: 4rpx;}
+.parent .f1 { position: relative;}
+.parent .f2 { padding: 0 30rpx;}
+.parent .handle-img {width: 60rpx; height: 60rpx;}
+.parent .btn-box { padding: 20rpx 0;}
+.parent button { padding: 0 40rpx; color: #fff; border-radius:20rpx; line-height: 60rpx;}
+</style>
\ No newline at end of file
diff --git a/components/dp-video/dp-video.vue b/components/dp-video/dp-video.vue
new file mode 100644
index 0000000..e2ac5e9
--- /dev/null
+++ b/components/dp-video/dp-video.vue
@@ -0,0 +1,21 @@
+<template>
+<view class="dp-video" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+(params.margin_x*2.2)+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+(params.padding_x*2.2)+'rpx'
+}">
+		<video class="dp-video-video" :src="params.src" :poster="params.pic" :controls="true"></video>
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-video{height: auto; position: relative;}
+.dp-video-video{width: 100%; margin: 0px; padding: 0px;}
+</style>
\ No newline at end of file
diff --git a/components/dp-wxad/dp-wxad.vue b/components/dp-wxad/dp-wxad.vue
new file mode 100644
index 0000000..61743b8
--- /dev/null
+++ b/components/dp-wxad/dp-wxad.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="dp-wxad" :style="{
+	backgroundColor:params.bgcolor,
+	margin:params.margin_y*2.2+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:params.padding_y*2.2+'rpx '+params.padding_x*2.2+'rpx'
+}">
+		<ad :unit-id="params.unitid" v-if="params.adtype == 'banner'"></ad>
+		<ad :unit-id="params.unitid" ad-type="video" ad-theme="white" v-if="params.adtype == 'video'"></ad>
+		<ad-custom :unit-id="params.unitid" v-if="params.adtype == 'custom'"></ad-custom>
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		},
+		methods:{
+			
+		}
+	}
+</script>
+<style>
+.dp-wxad{position:relative;}
+</style>
\ No newline at end of file
diff --git a/components/dp-yuyue-item/dp-yuyue-item.vue b/components/dp-yuyue-item/dp-yuyue-item.vue
new file mode 100644
index 0000000..0fbc910
--- /dev/null
+++ b/components/dp-yuyue-item/dp-yuyue-item.vue
@@ -0,0 +1,78 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/yuyue/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}">{{item.sell_price}}<text style="font-size:24rpx;padding-left:4rpx">元/{{item.danwei}}</text></text>
+					</view>
+				</view>
+				<view class="p3" v-if="showsales=='1'">已售{{item.sales}}</view>
+				<view class="p4" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+			}
+		},
+		props: {
+			showstyle:{default:2},
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+				console.log(this.buydialogShow);
+			},
+			addcart:function(){
+				this.$emit('addcart');
+			}
+		}
+	}
+</script>
+<style>
+.dp-product-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-item .item{display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-product-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-product-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-product-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-product-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-product-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-product-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-product-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-product-item .product-info .p3{color:#999999;font-size:20rpx;margin-top:10rpx}
+.dp-product-item .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:20rpx;right:20rpx;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-product-item .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-product-item .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-yuyue-itemlist/dp-yuyue-itemlist.vue b/components/dp-yuyue-itemlist/dp-yuyue-itemlist.vue
new file mode 100644
index 0000000..8921039
--- /dev/null
+++ b/components/dp-yuyue-itemlist/dp-yuyue-itemlist.vue
@@ -0,0 +1,72 @@
+<template>
+<view style="width:100%">
+	<view class="dp-product-itemlist">
+		<view class="item" v-for="item in data" :key="item.id" @click="goto" :data-url="'/activity/yuyue/product?id='+item[idfield]">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}">{{item.sell_price}}<text style="font-size:24rpx;padding-left:4rpx">元/{{item.danwei}}</text></text>
+				</view>
+				<view class="p3">
+					<view class="p3-1" v-if="showsales=='1'"><text style="overflow:hidden">已售{{item.sales}}</text></view>
+				</view>
+				<view class="p4" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon_gouwuche"></text></view>
+				<view class="p4" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+			</view>
+		</view>
+	</view>
+	<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				buydialogShow:false,
+				proid:0,
+			}
+		},
+		props: {
+			menuindex:{default:-1},
+			saleimg:{default:''},
+			showname:{default:1},
+			namecolor:{default:'#333'},
+			showprice:{default:'1'},
+			showsales:{default:'1'},
+			showcart:{default:'1'},
+			cartimg:{default: app.globalData.event_url +'/static/img/static/imgsrc/cart.svg'},
+			data:{},
+			idfield:{default:'id'}
+		},
+		methods: {
+			buydialogChange: function (e) {
+				if(!this.buydialogShow){
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+			},
+		}
+	}
+</script>
+<style>
+.dp-product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 24rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-product-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-product-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-product-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.dp-product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.dp-product-itemlist .product-info .p4{width:52rpx;height:52rpx;border-radius:50%;position:absolute;display:flex;align-items: center;justify-content: center;bottom:6rpx;right:4rpx;background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);}
+.dp-product-itemlist .product-info .p4 .icon_gouwuche{font-size:36rpx;height:48rpx;line-height:48rpx;color: #FFFFFF;}
+.dp-product-itemlist .product-info .p4 .img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/components/dp-yuyue/dp-yuyue.vue b/components/dp-yuyue/dp-yuyue.vue
new file mode 100644
index 0000000..78e31ed
--- /dev/null
+++ b/components/dp-yuyue/dp-yuyue.vue
@@ -0,0 +1,119 @@
+<template>
+<view class="dp-kanjia" :style="{
+	backgroundColor:params.bgcolor,
+	margin:(params.margin_y*2.2)+'rpx '+params.margin_x*2.2+'rpx 0',
+	padding:(params.padding_y*2.2)+'rpx '+params.padding_x*2.2+'rpx'
+}">
+	<view class="dp-kanjia-item" v-if="params.style=='1' || params.style=='2' || params.style=='3'">
+		<view class="item" v-for="(item,index) in data" :style="params.style==2 ? 'width:49%;margin-right:'+(index%2==0?'2%':0) : (params.style==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" @click="goto" :data-url="'/activity/yuyue/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}">{{item.sell_price}}<text style="font-size:24rpx;padding-left:4rpx">元/{{item.danwei}}</text></text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-2" v-if="params.showsales=='1' && item.sales>0"><text style="overflow:hidden">已售{{item.sales}}</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-kanjia-itemlist" v-if="params.style=='list'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/yuyue/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2" v-if="params.showprice != '0'">
+					<text class="t1" :style="{color:t('color1')}">{{item.sell_price}}<text style="font-size:24rpx;padding-left:4rpx">元/{{item.danwei}}</text></text>
+				</view>
+				<view class="p3">
+					<view class="p3-2" v-if="params.showsales=='1' &&  item.sales>0"><text style="overflow:hidden">已售{{item.sales}}</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="dp-kanjia-itemline" v-if="params.style=='line'">
+		<view class="item" v-for="(item,index) in data" :key="item.id" @click="goto" :data-url="'/activity/yuyue/product?id='+item.proid">
+			<view class="product-pic">
+				<image class="image" :src="item.pic" mode="widthFix"/>
+				<image class="saleimg" :src="params.saleimg" v-if="params.saleimg!=''" mode="widthFix"/>
+			</view>
+			<view class="product-info">
+				<view class="p1" v-if="params.showname == 1">{{item.name}}</view>
+				<view class="p2">
+					<view class="p2-1" v-if="params.showprice != '0'">
+						<text class="t1" :style="{color:t('color1')}">{{item.sell_price}}<text style="font-size:24rpx;padding-left:4rpx">元/{{item.danwei}}</text></text>
+					</view>
+				</view>
+				<view class="p3">
+					<view class="p3-2" v-if="params.showsales=='1' &&  item.sales>0"><text style="overflow:hidden">已售{{item.sales}}</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			params:{},
+			data:{}
+		}
+	}
+</script>
+<style>
+.dp-kanjia{height: auto; position: relative;overflow: hidden; padding: 0px; background: #fff;}
+.dp-kanjia-item{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-kanjia-item .item{display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;overflow:hidden}
+.dp-kanjia-item .product-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-kanjia-item .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-kanjia-item .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-kanjia-item .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-kanjia-item .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-kanjia-item .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-kanjia-item .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-kanjia-item .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-kanjia-item .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-kanjia-item .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-kanjia-item .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-kanjia-item .product-info .p3-1{height:40rpx;line-height:40rpx;border:1px #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-kanjia-item .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+
+.dp-kanjia-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.dp-kanjia-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:20rpx;border-radius:10rpx}
+.dp-kanjia-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.dp-kanjia-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-kanjia-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.dp-kanjia-itemlist .product-info {width: 70%;padding:6rpx 10rpx 5rpx 20rpx;position: relative;}
+.dp-kanjia-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-kanjia-itemlist .product-info .p2{margin-top:20rpx;height:56rpx;line-height:56rpx;overflow:hidden;}
+.dp-kanjia-itemlist .product-info .p2 .t1{font-size:36rpx;}
+.dp-kanjia-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-kanjia-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-kanjia-itemlist .product-info .p3-1{height:40rpx;line-height:40rpx;border:1px #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-kanjia-itemlist .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+
+.dp-kanjia-itemline{width:100%;display:flex;overflow-x:scroll;overflow-y:hidden}
+.dp-kanjia-itemline .item{width: 220rpx;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:10rpx;margin-right:4px}
+.dp-kanjia-itemline .product-pic {width:220rpx;height:0;overflow:hidden;background: #ffffff;padding-bottom: 100%;position: relative;}
+.dp-kanjia-itemline .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.dp-kanjia-itemline .product-pic .saleimg{ position: absolute;width: 60px;height: auto; top: -3px; left:-3px;}
+.dp-kanjia-itemline .product-info {padding:20rpx 20rpx;position: relative;}
+.dp-kanjia-itemline .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:72rpx}
+.dp-kanjia-itemline .product-info .p2{display:flex;align-items:center;overflow:hidden;padding:2px 0}
+.dp-kanjia-itemline .product-info .p2-1{flex-grow:1;flex-shrink:1;height:40rpx;line-height:40rpx;overflow:hidden;white-space: nowrap}
+.dp-kanjia-itemline .product-info .p2-1 .t1{font-size:36rpx;}
+.dp-kanjia-itemline .product-info .p2-1 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.dp-kanjia-itemline .product-info .p2-2{font-size:20rpx;height:40rpx;line-height:40rpx;text-align:right;padding-left:20rpx;color:#999}
+.dp-kanjia-itemline .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx;justify-content:space-between}
+.dp-kanjia-itemline .product-info .p3-1{height:40rpx;line-height:40rpx;border:1px #FF3143 solid;border-radius:10rpx;color:#FF3143;padding:0 24rpx;font-size:24rpx}
+.dp-kanjia-itemline .product-info .p3-2{color:#999999;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;}
+</style>
\ No newline at end of file
diff --git a/components/dp/dp.vue b/components/dp/dp.vue
new file mode 100644
index 0000000..78f98cd
--- /dev/null
+++ b/components/dp/dp.vue
@@ -0,0 +1,123 @@
+<template>
+<view>
+	<block v-for="(setData, index) in pagecontent" :key="index">
+		<block v-if="setData.temp=='notice'">
+			<dp-notice :params="setData.params" :data="setData.data"></dp-notice>
+		</block>
+		<block v-if="setData.temp=='banner'">
+			<dp-banner :params="setData.params" :data="setData.data"></dp-banner> 
+		</block>
+		<block v-if="setData.temp=='search'">
+			<dp-search :params="setData.params" :data="setData.data"></dp-search>
+		</block>
+		<block v-if="setData.temp=='text'">
+			<dp-text :params="setData.params" :data="setData.data"></dp-text>
+		</block>
+		<block v-if="setData.temp=='title'">
+			<dp-title :params="setData.params" :data="setData.data"></dp-title>
+		</block>
+		<block v-if="setData.temp=='dhlist'">
+			<dp-dhlist :params="setData.params" :data="setData.data"></dp-dhlist>
+		</block>
+		<block v-if="setData.temp=='line'">
+			<dp-line :params="setData.params" :data="setData.data"></dp-line>
+		</block>
+		<block v-if="setData.temp=='blank'">
+			<dp-blank :params="setData.params" :data="setData.data"></dp-blank>
+		</block>
+		<block v-if="setData.temp=='menu'">
+			<dp-menu :params="setData.params" :data="setData.data"></dp-menu> 
+		</block>
+		<block v-if="setData.temp=='map'">
+			<dp-map :params="setData.params" :data="setData.data"></dp-map> 
+		</block>
+		<block v-if="setData.temp=='cube'">
+			<dp-cube :params="setData.params" :data="setData.data"></dp-cube> 
+		</block>
+		<block v-if="setData.temp=='picture'">
+			<dp-picture :params="setData.params" :data="setData.data"></dp-picture> 
+		</block>
+		<block v-if="setData.temp=='pictures'"> 
+			<dp-pictures :params="setData.params" :data="setData.data"></dp-pictures> 
+		</block>
+		<block v-if="setData.temp=='video'">
+			<dp-video :params="setData.params" :data="setData.data"></dp-video> 
+		</block>
+		<block v-if="setData.temp=='shop'">
+			<dp-shop :params="setData.params" :data="setData.data" :shopinfo="setData.shopinfo"></dp-shop> 
+		</block>
+		<block v-if="setData.temp=='product'">
+			<dp-product :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-product> 
+		</block>
+		<block v-if="setData.temp=='collage'">
+			<dp-collage :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-collage> 
+		</block>
+		<block v-if="setData.temp=='luckycollage'">
+			<dp-luckycollage :params="setData.params" :data="setData.data"></dp-luckycollage> 
+		</block>
+
+		<block v-if="setData.temp=='kanjia'">
+			<dp-kanjia :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-kanjia> 
+		</block>
+		<block v-if="setData.temp=='yuyue'">
+			<dp-yuyue :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-yuyue>
+		</block>
+		<block v-if="setData.temp=='seckill'">
+			<dp-seckill :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-seckill> 
+		</block>
+		<block v-if="setData.temp=='scoreshop'">
+			<dp-scoreshop :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-scoreshop> 
+		</block>
+		<block v-if="setData.temp=='tuangou'">
+			<dp-tuangou :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-tuangou> 
+		</block>
+		<block v-if="setData.temp=='restaurant_product'">
+			<dp-restaurant-product :params="setData.params" :data="setData.data" :menuindex="menuindex"></dp-restaurant-product> 
+		</block>
+		<block v-if="setData.temp=='coupon'">
+			<dp-coupon :params="setData.params" :data="setData.data"></dp-coupon> 
+		</block>
+		<block v-if="setData.temp=='article'">
+			<dp-article :params="setData.params" :data="setData.data"></dp-article> 
+		</block>
+		<block v-if="setData.temp=='business'">
+			<dp-business :params="setData.params" :data="setData.data"></dp-business> 
+		</block>
+		<block v-if="setData.temp=='shortvideo'">
+			<dp-shortvideo :params="setData.params" :data="setData.data"></dp-shortvideo> 
+		</block>
+		<block v-if="setData.temp=='liveroom'">
+			<dp-liveroom :params="setData.params" :data="setData.data"></dp-liveroom> 
+		</block>
+		<block v-if="setData.temp=='button'">
+			<dp-button :params="setData.params" :data="setData.data"></dp-button> 
+		</block>
+		<block v-if="setData.temp=='hotspot'">
+			<dp-hotspot :params="setData.params" :data="setData.data"></dp-hotspot> 
+		</block>
+		<block v-if="setData.temp=='cover'">
+			<dp-cover :params="setData.params" :data="setData.data"></dp-cover> 
+		</block>
+		<block v-if="setData.temp=='richtext'">
+			<dp-richtext :params="setData.params" :data="setData.data" :content="setData.content"></dp-richtext> 
+		</block>
+		<block v-if="setData.temp=='form'">
+			<dp-form :params="setData.params" :data="setData.data" :content="setData.content"></dp-form> 
+		</block>
+		<block v-if="setData.temp=='userinfo'">
+			<dp-userinfo :params="setData.params" :data="setData.data" :content="setData.content"></dp-userinfo> 
+		</block>
+		<block v-if="setData.temp=='wxad'">
+			<dp-wxad :params="setData.params" :data="setData.data"></dp-wxad> 
+		</block>
+	</block>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			menuindex:{default:-1},
+			pagecontent:{}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/components/drag-button/drag-button.vue b/components/drag-button/drag-button.vue
new file mode 100644
index 0000000..84ef9fc
--- /dev/null
+++ b/components/drag-button/drag-button.vue
@@ -0,0 +1,224 @@
+<template>
+	<view>
+		<view
+			id="_drag_button"
+			class="drag"
+			:style="'left: ' + left + 'px; top:' + top + 'px;'"
+			@touchstart="touchstart"
+			@touchmove.stop.prevent="touchmove"
+			@touchend="touchend"
+			:class="{transition: isDock && !isMove }"
+		>
+			<!-- #ifdef MP -->
+			<button open-type="contact" class="button">
+				按钮
+			</button>
+			<!--  #endif -->
+			
+			<!-- #ifndef MP -->
+				<view class="drag-content">
+					<text class="iconfont icon-shouye2" @click.stop.prevent="clickIndx"></text>
+					<text class="iconfont icon-kefu1" @click.stop.prevent="clickService"></text>
+				</view>
+			<!--  #endif -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'drag-button',
+		props: {
+			// 是否开启左右弹性效果
+			isDock:{
+				type: Boolean,
+				default: true
+			},
+			// 页面底部是否存在tabbar
+			existTabBar:{
+				type: Boolean,
+				default: false
+			},
+			end_bottom: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				top: 0,
+				left: 0,
+				width: 0,   // 按钮宽度
+				height: 0,  // 按钮高度
+				offsetWidth: 0,
+				offsetHeight: 0,
+				windowWidth: 0,  // 页面窗口宽度
+				windowHeight: 0,  // 页面窗口高度
+				isMove: true,  // 是否移动
+				edge: 0,  // 上下边界
+				// start_top: 200,
+				// end_bottom: 60,
+				start_left: 10,
+				text: '按钮',
+				pageUrl: '',
+			}
+		},
+		mounted() {
+			let pages = getCurrentPages()
+			this.pageUrl = pages[pages.length - 1].route
+			// console.log(this.pageUrl, 'ppp')
+			const sys = uni.getSystemInfoSync();
+
+			// 获取系统宽高
+			this.windowWidth = sys.windowWidth;
+			this.windowHeight = sys.windowHeight;
+			
+			// #ifdef APP-PLUS
+				this.existTabBar && (this.windowHeight -= 50);
+			// #endif
+			if (sys.windowTop) {
+				this.windowHeight += sys.windowTop;
+			}
+			
+			const query = uni.createSelectorQuery().in(this);
+			// 获取按钮节点信息
+			query.select('#_drag_button').boundingClientRect(data => {
+				this.width = data.width;
+				this.height = data.height;
+				this.offsetWidth = data.width / 2;
+				this.offsetHeight = data.height / 2;
+
+				// 按钮初始位置
+				this.left = this.windowWidth - this.width - this.start_left;
+				this.top = (this.windowHeight / 2) - (this.height / 2);
+				// this.top = this.windowHeight - this.height - this.start_top;
+				// console.log(data,this.left,this.top,this.offsetHeight,this.height,this.width,this.start_left,this.start_top,sys, 'youzhi-------')
+			}).exec();
+		},
+		methods: {
+			// 跳转到首页
+			clickIndx() {
+				uni.reLaunch({
+					url:'/pages/index/index'
+				})
+				this.$emit('topClick');
+			},
+			// 跳转到客服页
+			clickService() {
+				if(this.pageUrl == 'newOtherPages/myService/myService') {
+					uni.redirectTo({
+						url:"/newOtherPages/myService/myService"
+					})
+				}else {
+					uni.navigateTo({
+						url:"/newOtherPages/myService/myService"
+					})
+				}
+
+				this.$emit('botClick');
+			},
+			click() {
+				this.$emit('btnClick');
+			},
+			// 触摸开始
+			touchstart() {
+				this.$emit('btnTouchstart');
+			},
+			// 触摸移动
+			touchmove(e) {
+				// 单指触摸
+				if (e.touches.length !== 1) {
+					return false;
+				}
+				
+				this.isMove = true;
+				
+				// 移动过程,按钮的位置
+				this.left = e.touches[0].clientX - this.offsetWidth;
+				
+				let clientY = e.touches[0].clientY - this.offsetHeight;
+				// #ifdef H5
+					// clientY += this.height; // 移动时悬停的位置
+				// #endif
+				let edgeBottom = this.windowHeight - this.height - this.edge - this.end_bottom;
+
+				// 上下触及边界
+				if (clientY < this.edge) {
+					this.top = this.edge;
+				} else if (clientY > edgeBottom) {
+					this.top = edgeBottom;
+				} else {
+					this.top = clientY
+				}		
+			},
+			// 触摸结束 确定按钮的位置
+			touchend(e) {
+				if (this.isDock) {
+					let edgeRigth = this.windowWidth - this.width - this.edge;
+					
+					if (this.left < this.windowWidth / 2 - this.offsetWidth) {
+						this.left = this.edge + 10;
+					} else {
+						this.left = edgeRigth - 10;
+					}
+					
+				}
+				
+				this.isMove = false;
+				
+				this.$emit('btnTouchend');
+			},
+		}}
+</script>
+
+<style lang="scss">
+	.drag {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $uni-text-color-inverse;
+		width: 72rpx;
+		height: 144rpx;
+		border-radius: 50%;
+		font-size: $uni-font-size-sm;
+		position: fixed;
+		z-index: 9999999;
+		
+		button {
+		  background: none;
+		  border: none;
+		  width: 100%;
+		  height: 100%;
+		  font-size: 24rpx;
+		  padding: 0;
+		  margin: 0;
+		  display: flex;
+		  border-radius: 50%;
+    }
+		
+		&.transition {
+			transition: left .3s ease,top .3s ease;
+		}
+	}
+	.drag-content{
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 4rpx;
+		.iconfont {
+			font-size: 40rpx;
+			color: #D8F8EC;
+      text-align: center;
+			height: 50%;
+			width: 100%;
+			line-height: 72rpx;
+		}
+		.icon-kefu1 {
+			border-top: 1rpx solid rgba(0, 0, 0, 0.1);
+		}
+	}
+	
+</style>
diff --git a/components/drag-button/img/suspend.png b/components/drag-button/img/suspend.png
new file mode 100644
index 0000000..a90c4d9
Binary files /dev/null and b/components/drag-button/img/suspend.png differ
diff --git a/components/home-list/home-list.vue b/components/home-list/home-list.vue
new file mode 100644
index 0000000..52ad15d
--- /dev/null
+++ b/components/home-list/home-list.vue
@@ -0,0 +1,708 @@
+<template>
+	<view class="content">
+		<view class="left" v-for="(it,ix) in 2" :key='ix'>
+
+			<view class="item" v-show="index % 2 == ix" v-for="(item,index) in list" :key='index'>
+				<!-- #ifdef MP -->
+				<!-- 直播内容 -->
+				<view @click="goto" :data-url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id='+item.roomId" class="body body_live" v-if="item.listType == 'live'  ">
+					<view class="top">
+						<image style="width: 100%; height: 100%;" :src="item.coverImg" mode="aspectFill"></image>
+						<view class="p1">
+							<view class="title_box" style="padding-left: 0;">
+								<view class="d-t">
+									<view class="left">
+										<text  class="heng1"></text>
+										<text  class="heng2"></text>
+										<text  class="heng3"></text>
+									</view>
+								</view>
+								<view class="" style="font-size: 22rpx;">
+									{{item.status == '0'?'预告':item.status == '1'?'直播中':'已结束'}}
+								</view>
+
+							</view>
+							<!-- 			<view class="quan">
+								<text class="iconfont iconss"></text>
+								<text>优惠券疯抢中</text>
+							</view> -->
+						</view>
+					</view>
+					<view class="bot">
+						<view class="bot-header">
+							<image :src="item.business.logo" mode="aspectFill"></image>
+						</view>
+						<view class="bot-name">{{item.name}}</view>
+						<view class="bot-goods" v-if="item.goods.length">
+							<view class="bot-goods__title">{{item.goods[0].name}}</view>
+							<view class="bot-goods__price">{{item.goods[0].price}}</view>
+						</view>
+					</view>
+				</view>
+				<!-- #endif -->
+
+				<!-- 视频内容 -->
+				<view class="body body_video" @click="goto" :data-url="'/activity/shortvideo/detail?id='+item.id" v-if="item.listType == 'video'">
+					<view class="top">
+						<view class="player-box">
+							<text class="iconfont icon-bofang"></text>
+						</view>
+						<image style="width: 100%; height: 100%;" :src="item.coverimg" mode="aspectFill"></image>
+						<view class="p1">
+							<view class="title_box">
+								<view class="" style="font-size: 26rpx;">
+									{{ formatSeconds(Number(item.video_duration))||'00:00'}}
+								</view>
+							</view>
+							<view class="info" >
+								<view class="info-txt">{{item.name}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="bot">
+						<view class="bot-hd">
+							<image :src="item.binfo.logo" mode="aspectFill"></image>
+							<view class="bot-hd__name">{{item.binfo.name || ''}}</view>
+						</view>
+						<view class="bot-bd" @click.stop.prevent="zan(item,index)">
+							<image class="flame-img" :src="event_rul + '/static/img/static/icon/flame-icon.svg'"></image>
+							<text class="iconfont" :class="item.iszan == 0 ? 'icon-aixin' : 'icon-aixin_shixin'"></text>
+							<text class="bot-bd__num">{{item.zan_num >= 10000 ? (item.zan_num / 10000).toFixed(1)+'万': item.zan_num}}</text>
+						</view>
+					</view>
+				</view>
+				<!-- 笔记内容 -->
+
+				<view class="body body_note" @click="goto" :data-url="'/activity/luntan/detail?id='+item.id" v-if="item.listType == 'note'">
+					<view class="note-item">
+						<image class="note-item__img" v-if="item.pics||item.coverimg" :src="item.pics||item.coverimg" mode="aspectFill"></image>
+						<view style="width: 100%; height: 330rpx; line-height: 330rpx; " v-else>
+							<view style="color: #ccc;">
+								<text style="font-size: 100rpx; color: #ccc;"
+									class="iconfont icon-tupianjiazaishibai"></text>
+							</view>
+						</view>
+						<view class="note-item__info">
+							<view class="note-item__info-title">{{item.title ||item.name|| '无'}}</view>
+							<view class="note-item__info-bd">
+								<view class="left" @click.stop="goto" :data-url="'/diary/info/info?id='+item.mid">
+									<image class="note-item__info-img" :src="item.headimg || item.binfo.logo"></image>
+									<view class="note-item__info-name">{{item.nickname || item.binfo.name ||''}}</view>
+								</view>
+								<view class="right" @click.stop.prevent="zan(item,index)">
+									<image class="flame-img" :src="event_rul + '/static/img/static/icon/flame-icon.svg'"></image>
+									<text v-if="!item.iszan" class="iconfont icon-aixin"></text>
+									<text v-else class="iconfont icon-aixin_shixin"></text>
+									<text class="note-item__info-num">{{item.zan || item.zan_num || 0}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 商品内容 -->
+				<view class="body body_shop" @click="goto" :data-url="'/pages/shop/product?id='+item.proid" v-if="item.listType == 'shop'">
+					<view class="top">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<view class="shop-info">
+						<view class="shop-info__hd">
+							{{item.name ? item.name : ''}}
+						</view>
+						<view class="shop-info__bd">
+							<view class="left" v-show="item.sell_price">
+								<view class="shop-info__price">
+									<text class="ico">￥</text>
+									{{item.sell_price}}
+								</view>
+							<view class="shop-info__num">
+								已售{{ item.sales ? (item.sales >= 10000 ? (item.sales / 10000).toFixed(1) + '万': item.sales) : 0 }}件
+							</view>
+							</view>
+							<view class="iconfont icon-jiahao" @click.stop="buydialogChange" :data-proid="item.proid"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		props: {
+			list: {},
+		},
+		data() {
+			return {
+				anShow:false,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		mounted() {
+		},
+		beforeDestroy(){
+			this.anShow = false;
+		},
+		methods: {
+			formatSeconds(time){
+				let newTime,hour,minite,seconds;
+				if(time >= 3600){
+				hour = parseInt(time/3600) < 10 ? '0' + parseInt(time/3600) : parseInt(time/3600);
+				minite = parseInt(time%3600/60) < 10 ? '0' + parseInt(time%3600/60):parseInt(time%3600/60);
+				seconds = time%3600%60 < 10 ? '0' + Math.round(time%3600%60) : Math.round(time%3600%60);
+				newTime = hour + ':' + minite + ':' + seconds;
+				}else if(time >= 60 && time < 3600){
+				minite = parseInt(time/60) < 10 ? '0' + parseInt(time/60) : parseInt(time/60);
+				seconds = time%60 < 10 ? '0' + Math.round(time%60) : Math.round(time%60);
+				newTime = minite + ':' + seconds;  
+				}else if(time < 60 ){
+				seconds = time < 10 ? '0' + Math.round(time) : Math.round(time);
+				newTime = '00:'+ seconds;
+				}
+				return newTime;
+			},
+			zan: function (item,index) {
+			 
+			 var that = this
+			 		
+					if(item.binfo){
+						app.post('ApiShortvideo/zan',{id:item.id},function(res){
+							that.$emit('listZanFn',{index:index,show:!item.iszan?1:0,num:item.iszan?--item.zan_num:++item.zan_num})
+							
+						});
+					}else{
+						app.post("ApiLuntan/zan", {id: item.id}, function (res) {
+						 that.$emit('listZanFn',{index:index,show:!item.iszan?1:0,num:item.iszan?--item.zan:++item.zan})
+											
+						});
+					}
+				
+			},
+			buydialogChange: function(e) {
+				let proid = e.currentTarget.dataset.proid;
+				this.$emit("dialogChange",proid);
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.dh_box{
+		width: 338rpx;
+		background-color: #fff;
+		border-radius: 12rpx;
+		margin-bottom: 24rpx;
+		&-hd{
+			background: linear-gradient(90deg, #FF8A44 0%, #FF3B41 100%);
+			border-radius: 12rpx 12rpx 0rpx 0px;
+			padding: 18rpx 20rpx 16rpx;
+		}
+		&-title{
+			display: flex;
+			align-content: center;
+			justify-content: space-between;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 40rpx;
+			.more {
+				font-size: 22rpx;
+				line-height: 32rpx;
+				padding-right: 30rpx;
+				position: relative;
+				&::after {
+					content: "";
+					position: absolute;
+					right: 0;
+					top: 50%;
+					width: 12rpx;
+					height: 12rpx;
+					border-top: 1rpx solid #FFFFFF;
+					border-right: 1rpx solid #FFFFFF;
+					transform: rotate(45deg) translateX(-100%);
+				}
+			}
+		}
+		&-subtitle {
+			background: #FFE8E8;
+			border-radius: 6rpx;
+			padding: 0 14rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: #F93C41;
+			line-height: 30rpx;
+			margin-top: 8rpx;
+		}
+		&-bd {
+			padding: 10rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+		}
+		.goods-img {
+			width: 216rpx;
+			height: 224rpx;
+			border-radius: 10rpx;
+		}
+		.goods-title {
+			font-size: 22rpx;
+			color: #666666;
+			line-height: 32rpx;
+			margin-top: 18rpx;
+		}
+		.goods-tips {
+			display: flex;
+			align-items: center;
+			&__icon {
+				width: 28rpx;
+				height: 28rpx;
+				flex-shrink: 0;
+				margin-right: 10rpx;
+			}
+			&__txt {
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #1BB149;
+				line-height: 44rpx;
+			}
+		}
+	}
+	.item {
+		width: 338rpx;
+		.flame-img {
+			width: 26rpx;
+			height: 30rpx;
+			margin-right: 10rpx;
+		}
+		.body {
+			border-radius: 12rpx;
+			position: relative;
+			overflow: hidden;
+			margin-bottom: 24rpx;
+			background-color: #ffffff;
+		}
+		.body_shop{
+			.top {
+				width: 100%;
+				height: 314rpx;
+			
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.shop-info {
+				padding: 20rpx;
+				&__hd {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 36rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					/* autoprefixer: ignore next */
+					-webkit-box-orient: vertical;
+					text-align: justify;
+					white-space: pre-wrap;
+					word-break: break-all;
+				}
+				&__bd{
+					margin-top: 24rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.left{
+						flex: 1;
+						overflow: hidden;
+						display: flex;
+						align-items: center;
+						color: #ED5925;
+						font-size: 36rpx;
+						line-height: 50rpx;
+						font-weight: bold;
+						.ico{
+							font-size: 22rpx;
+							color: #ED5925;
+							line-height: 32rpx;
+							margin-right: 6rpx;
+						}
+					}
+				}
+				&__price {
+					flex-shrink: 0;
+				}
+				&__num {
+					flex: 1;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					margin-left: 14rpx;
+					font-size: 20rpx;
+					color: #999999;
+					line-height: 28rpx;
+				}
+				.icon-jiahao {
+					flex-shrink: 0;
+					font-size: 44rpx;
+					color: #068150;
+				}
+			}
+		}
+		.body_note {
+			.note-item {
+				width: 100%;
+				height: 500rpx;
+				position: relative;
+				&__img {
+					width: 100%;
+					height: 100%;
+				}
+				&__info {
+					position: absolute;
+					bottom: 16rpx;
+					left: 16rpx;
+					right: 16rpx;
+					background: #FFF;
+					border-radius: 12rpx;
+					padding: 16rpx;
+					&-title {
+						margin-top: 8rpx;
+						font-size: 28rpx;
+						font-weight: 500;
+						color: #333333;
+						line-height: 40rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						/* autoprefixer: ignore next */
+						-webkit-box-orient: vertical;
+						text-align: justify;
+						white-space: pre-wrap;
+						word-break: break-all;
+					}
+					&-bd {
+						margin-top: 10rpx;
+						display: flex;
+						align-content: center;
+						justify-content: space-between;
+						color: #666666;
+					}
+					.left {
+						display: flex;
+						align-items: center;
+					}
+					&-img {
+						display: block;
+						width: 36rpx;
+						height: 36rpx;
+						margin-right: 6rpx;
+						flex-shrink: 0;
+						border-radius: 50%;
+					}
+					&-name {
+						flex: 1;
+						max-width: 140rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						font-size: 24rpx;
+					}
+					.right {
+						display: flex;
+						align-items: center;
+					}
+					.icon-aixin,.icon-aixin_shixin {
+						font-size: 28rpx;
+					}
+					.icon-aixin_shixin {
+						color: #EC2828;
+					}
+					&-num {
+						margin-left: 8rpx;
+						font-size: 22rpx;
+						line-height: 28rpx;
+					}
+				}
+			}
+		}
+
+		.body_video {
+			.top {
+				border-radius: 10rpx;
+				width: 100%;
+				height: 376rpx;
+				position: relative;
+				.player-box {
+					position: absolute;
+					font-size: 100rpx;
+					left: 50%;
+					top: 50%;
+					width: 80rpx;
+					height: 80rpx;
+					background: rgba($color: #000000, $alpha: .3);
+					border-radius: 50%;
+					transform: translateX(-50%) translateY(-60%);
+				}
+				.icon-bofang {
+					position: absolute;
+					left: 50%;
+					top: 50%;
+					color: #FFF;
+					transform: translateX(-40%) translateY(-50%);
+				}
+				.info {
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					right: 0;
+					height: 172rpx;
+					background: linear-gradient(180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0.8600) 100%);
+					display: flex;
+					align-items: flex-end;
+					padding: 12rpx 20rpx;
+					&-txt {
+						font-size: 28rpx;
+						color: #FFFFFF;
+						line-height: 40rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 3;
+						/* autoprefixer: ignore next */
+						-webkit-box-orient: vertical;
+						text-align: justify;
+						white-space: pre-wrap;
+						word-break: break-all;
+					}
+				}
+			}
+
+			.bot {
+				padding: 16rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				&-hd {
+					display: flex;
+					align-items: center;
+					image {
+						border-radius: 50%;
+						width: 58rpx;
+						height: 58rpx;
+						margin-right: 6rpx;
+						flex-shrink: 0;
+					}
+					&__name {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #333333;
+						line-height: 36rpx;
+						max-width: 176rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+				}
+                &-bd {
+					flex-shrink: 0;
+					color: #666666;
+					.icon-aixin,.icon-aixin_shixin {
+						font-size: 28rpx;
+					}
+					.icon-aixin_shixin {
+						color: #EC2828;
+					}
+					&__num {
+						margin-left: 2rpx;
+						font-size: 22rpx;
+						line-height: 28rpx;
+					}
+				}
+				.right {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding: 10rpx 0;
+					margin-left: 20rpx;
+
+					.price {
+						font-weight: bold;
+					}
+				}
+			}
+		}
+
+		.body_live {
+			.top {
+				border-radius: 10rpx;
+				width: 100%;
+				height: 376rpx;
+				// background-color: red;
+				image {
+					width: 100%;
+				}
+				.quan {
+					position: absolute;
+					display: flex;
+					top: 280rpx;
+					padding: 4rpx 10rpx;
+					border-radius: 40rpx;
+					color: #fff;
+					left: 20rpx;
+					font-size: 24rpx;
+					background-color: rgba($color: #000000, $alpha: 0.4);
+
+				}
+
+			}
+
+			.bot {
+				padding: 32rpx 16rpx 16rpx;
+				position: relative;
+				&-header {
+					width: 58rpx;
+					height: 58rpx;
+					border-radius: 50%;
+					position: absolute;
+					overflow: hidden;
+					top: -29rpx;
+					left: 34rpx;
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+				&-name {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 36rpx;
+				}
+				&-goods {
+					display: flex;
+					align-content: center;
+					font-size: 20rpx;
+					color: #999999;
+					line-height: 28rpx;
+					margin-top: 4rpx;
+					
+					&__title {
+						max-width: 264rpx;
+					}
+					&__price {
+						flex-shrink: 0;
+					}
+				}
+
+				.left {
+					image {
+						border-radius: 10rpx;
+						width: 90rpx;
+						height: 90rpx;
+						background-color: pink;
+					}
+				}
+
+				.right {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding: 10rpx 0;
+					margin-left: 20rpx;
+
+					.price {
+						font-weight: bold;
+					}
+				}
+			}
+		}
+
+	}
+
+	.content {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.title_box {
+		background-color: rgba($color: #000000, $alpha: .3);
+		padding: 0 10rpx;
+		border-radius: 4rpx;
+		display: flex;
+		color: #fff;
+		position: absolute;
+		top: 16rpx;
+		left: 16rpx;
+		height: 30rpx;
+		border-radius: 15rpx;
+		align-items: center;
+		
+		.d-t {
+			width: 30rpx;
+			height: 30rpx;
+			border-radius: 50%;
+			display: flex;
+			margin-right: 10rpx;
+			align-items: center;
+			justify-content: space-around;
+			background-color: #fee103;
+		}
+		.left {
+			height: 18rpx;
+			display: flex;
+			width: 50rpx;
+			padding: 0 4rpx 2rpx;
+			align-items: flex-end;
+			justify-content: space-around;
+
+			.heng1,
+			.heng2,
+			.heng3 {
+				display: block;
+				width: 4rpx;
+				border-radius: 4rpx;
+				margin-right: 2rpx;
+				background-color: #fff;
+			}
+					
+			.heng1 {
+				height: 18rpx;
+				animation: hengos .8s linear infinite;
+			}
+			
+			.heng2 {
+				height: 10rpx;
+				animation: hengts .8s linear  infinite;
+			}
+			.heng3 {
+				height: 18rpx;
+				animation: henghs .8s linear .2s infinite;
+				margin-right: 0;
+			}
+		}
+
+	}
+	
+	@keyframes hengos {
+		0%   {height: 18rpx;}
+		50%  {height: 10rpx;}
+		100% {height: 18rpx;}
+	}
+	@keyframes hengts {
+		0%   {height: 10rpx;}
+		50%  {height: 18rpx;}
+		100% {height: 10rpx;}
+	}
+	@keyframes henghs {
+		0%   {height: 18rpx;}
+		50%  {height: 10rpx;}
+		100% {height: 18rpx;}
+	}
+</style>
diff --git a/components/jin-edit/jin-edit.vue b/components/jin-edit/jin-edit.vue
new file mode 100644
index 0000000..59859e4
--- /dev/null
+++ b/components/jin-edit/jin-edit.vue
@@ -0,0 +1,349 @@
+<template>
+	<view class="container" :style="{
+		paddingBottom: showMoreTool ? '220rpx' : '120rpx'
+	}"> 
+		<editor
+			class="ql-container"
+			:placeholder="placeholder"
+			style="font-size: 30rpx; font-style: normal ;"
+			:show-img-size="true"
+			:show-img-toolbar="true"
+			:show-img-resize="true"
+			@ready="onEditorReady"
+			id="editor"
+			@statuschange="statuschange"
+			@focus="editFocus" 
+			@blur="editBlur"
+			ref="editot"
+		></editor>   
+		<!-- 操作工具 -->
+		<view class="tool-view" > 
+			<view class="tool">
+				<jinIcon class="single" type="&#xe6f3;" font-size="44rpx" title="插入图片" @click="insertImage"></jinIcon>
+				<jinIcon class="single" type="&#xe6f9;" font-size="44rpx" title="修改文字样式" @click="showMore" :color="showMoreTool ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6eb;" font-size="44rpx" title="分割线" @click="insertDivider"></jinIcon>
+				<jinIcon class="single" type="&#xe6e8;" font-size="44rpx" title="撤销" @click="undo"></jinIcon>
+				<jinIcon class="single" type="&#xe705;" font-size="44rpx" title="重做" @click="redo"></jinIcon>
+				<!-- <jinIcon class="single" type="&#xeb8a;" font-size="44rpx" title="设置" @click="showSetting"></jinIcon> -->
+			</view>
+			<!-- 文字相关操作 -->
+			<view class="font-more" :style="{ height: showMoreTool ? '100rpx' : 0 }">
+				<jinIcon class="single" type="&#xe6e7;" font-size="44rpx" title="加粗" @click="setBold" :color="showBold ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6fe;" font-size="44rpx" title="斜体" @click="setItalic" :color="showItalic ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6f8;" font-size="44rpx" title="分割线" @click="setIns" :color="showIns ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6e3;" font-size="44rpx" title="标题" @click="setHeader" :color="showHeader ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6f1;" font-size="44rpx" title="居中" @click="setCenter" :color="showCenter ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6ed;" font-size="44rpx" title="居右" @click="setRight" :color="showRight ? activeColor : '#666666'"></jinIcon>
+			</view>
+			<view class="setting-layer-mask" v-if="showSettingLayer" @click="showSetting"></view>
+			<view class="setting-layer" v-if="showSettingLayer">
+				<view class="single" @click="release(true)">
+					<!-- <jinIcon class="icon" type="&#xe639;" ></jinIcon> -->
+					<view>公开发布</view>
+				</view>
+			<!-- 	<view class="single" @click="release(false)">
+					<jinIcon class="icon" type="&#xe655;" ></jinIcon>
+					<view>私密保存</view>
+				</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import jinIcon from './jin-icons.vue';
+export default {
+	props: {
+		// 点击图片时显示图片大小控件
+		showImgSize: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图片时显示工具栏控件
+		showImgToolbar: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图片时显示修改尺寸控件
+		showImgResize: {
+			type: Boolean,
+			default: false
+		},
+		// 占位符
+		placeholder: {
+			type: String,
+			default: '开始输入...'
+		},
+		// 图片上传的地址
+		uploadFileUrl: {
+			type: String,
+			default: '#'
+		},
+		//额外参数
+		formData:{
+			type: Object,
+			default: ()=>{
+				return{
+					
+				}
+			}
+		},
+		// 上传文件时的name
+		fileKeyName: {
+			type: String,
+			default: 'file'
+		},
+		// 上传图片时，http请求的header
+		header: {
+			type: Object
+		},
+		// 初始化html
+		html: {
+			type: String
+		}
+	},
+	computed:{
+		
+	},
+	data() {
+		return {
+			showMoreTool: false,
+			showBold: false,
+			showItalic: false,
+			showIns: false,
+			showHeader: false,
+			showCenter: false,
+			showRight: false,
+			showSettingLayer: false,
+			activeColor: '#F56C6C'
+		};
+	},
+	components: {
+		jinIcon
+	},
+	created() {
+		
+	},
+	methods: {
+		onEditorReady(e) {
+			uni.createSelectorQuery()
+				.in(this)
+				.select('.ql-container')
+				.fields({
+					size: true,
+					context: true
+				},res => {
+					this.editorCtx = res.context;
+					this.editorCtx.setContents({
+						html: this.html
+					})
+				})
+				.exec();
+		},
+		undo() {
+			this.editorCtx.undo();
+		},
+		// 插入图片
+		insertImage() {
+			uni.chooseImage({
+				count: 9, //默认9
+				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album', 'camera'], //从相册选择
+				success: async(res) => {
+					console.log(res)
+					var tempFilePaths = res.tempFilePaths;
+					uni.showLoading({
+						title: '正在上传中...'
+					})
+					for (let temp of tempFilePaths) {
+						// 图片上传服务器
+						await uni.uploadFile({
+							url: this.uploadFileUrl,
+							filePath: temp,
+							name: this.fileKeyName,
+							header: this.header,
+							formData:this.formData,
+							success: res => {
+								console.log('呵呵呵',JSON.parse(res.data))
+								// 上传完成后处理
+								
+								this.editorCtx.insertImage({
+									src: JSON.parse(res.data).url,  // 此处需要将图片地址切换成服务器返回的真实图片地址
+									alt: '图片',
+									success: function(e) {}
+								});
+								uni.hideLoading()
+							},
+							  fail:(e) =>{
+								  console.log('失败',e)
+							  },
+							complete:(e) => {
+								console.log('完成',e)
+							 }
+							
+						});
+					}
+				}
+			});
+		},
+		insertDivider() {
+			this.editorCtx.insertDivider();
+		},
+		redo() {
+			this.editorCtx.redo();
+		},
+		showMore() {
+			this.showMoreTool = !this.showMoreTool;
+			this.editorCtx.setContents()
+		},
+		setBold() {
+			this.showBold = !this.showBold;
+			this.editorCtx.format('bold');
+		},
+		setItalic() {
+			this.showItalic = !this.showItalic;
+			this.editorCtx.format('italic');
+		},
+		checkStatus(name, detail, obj) {
+			if (detail.hasOwnProperty(name)) {
+				this[obj] = true;
+			} else {
+				this[obj] = false;
+			}
+		},
+		statuschange(e) {
+			var detail = e.detail;
+			this.checkStatus('bold', detail, 'showBold');
+			this.checkStatus('italic', detail, 'showItalic');
+			this.checkStatus('ins', detail, 'showIns');
+			this.checkStatus('header', detail, 'showHeader');
+			if (detail.hasOwnProperty('align')) {
+				if (detail.align == 'center') {
+					this.showCenter = true;
+					this.showRight = false;
+				} else if (detail.align == 'right') {
+					this.showCenter = false;
+					this.showRight = true;
+				} else {
+					this.showCenter = false;
+					this.showRight = false;
+				}
+			} else {
+				this.showCenter = false;
+				this.showRight = false;
+			}
+		},
+		setIns() {
+			this.showIns = !this.showIns;
+			this.editorCtx.format('ins');
+		},
+		setHeader() {
+			this.showHeader = !this.showHeader;
+			this.editorCtx.format('header', this.showHeader ? 'H2' : false);
+		},
+		setCenter() {
+			this.showCenter = !this.showCenter;
+			this.editorCtx.format('align', this.showCenter ? 'center' : false);
+		},
+		setRight() {
+			this.showRight = !this.showRight;
+			this.editorCtx.format('align', this.showRight ? 'right' : false);
+		},
+		showSetting() {
+			this.showSettingLayer = !this.showSettingLayer;
+		},
+		async editFocus() {
+			
+		},
+		editBlur() {
+			
+		},
+		release(isPublic) {
+			this.showSettingLayer = false;
+			this.editorCtx.getContents({
+				success: res => {
+					Object.assign(res, {
+						isPublic: isPublic
+					})
+					this.$emit('editOk', res);
+				} 
+			})
+		},
+	}
+};
+</script>
+
+<style scoped>
+.container {
+	padding: 30rpx 0;
+	box-sizing: border-box;
+	padding-bottom: 120rpx;
+}
+
+.ql-container {
+	line-height: 160%;
+	font-size: 34rpx;
+	width: calc(100% - 60rpx); 
+	height: 630rpx;
+	margin: 0 auto;
+} 
+.tool-view{
+	width: 100vw;
+	/* position: fixed;
+	bottom: 0;
+	left: 0; */
+	
+}
+.tool {
+	height: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	width: 100%;
+	background: #eee;
+}
+
+.font-more {
+/* 	position: absolute;
+	left: 0;
+	bottom: 100rpx; */
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	width: 100%;
+	background: rgb(235, 235, 235);
+	overflow: hidden;
+	transition: all 0.15s;
+}
+
+.setting-layer {
+	position: absolute;
+	bottom: 100rpx;
+	background: #fff;
+	width: 250rpx;
+	right: 20rpx;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+	border-radius: 8rpx;
+}
+.setting-layer .single {
+	height: 80rpx;
+	font-size: 32rpx;
+	padding: 0 30rpx;
+	display: flex;
+	align-items: center;
+	line-height: 80rpx;
+	flex-direction: row;
+	color: #666;
+}
+.setting-layer .single .icon {
+	margin-right: 20rpx;
+}
+.setting-layer-mask{
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100vw;
+	height: 100vh;
+	background: transparent; 
+}
+</style>
diff --git a/components/jin-edit/jin-icons.vue b/components/jin-edit/jin-icons.vue
new file mode 100644
index 0000000..b85d216
--- /dev/null
+++ b/components/jin-edit/jin-icons.vue
@@ -0,0 +1,48 @@
+<template>
+	<view class="content">
+		<view class="icon" :style="{color: color, fontSize: fontSize}" v-html="type" @click="toclick"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			type: {
+				type: String,
+				default: '&#xe644;'
+			},
+			color: {
+				type: String,
+				default: '#666666'
+			},
+			fontSize: {
+				type: String,
+				default: '34rpx'
+			}
+		},
+		methods: {
+			toclick() {
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.content{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	@font-face {
+		font-family: 'jin';
+		/** 阿里巴巴矢量图标库的字体库地址，可以替换自己的字体库地址 **/
+		src: url('https://at.alicdn.com/t/font_1491431_6m7ltjo8wi.ttf') format('truetype');
+	}
+
+	.icon {
+		font-family: jin !important;
+		font-size: 34rpx;
+	}
+
+</style>
diff --git a/components/jin-edit/readme.md b/components/jin-edit/readme.md
new file mode 100644
index 0000000..5fd5e2c
--- /dev/null
+++ b/components/jin-edit/readme.md
@@ -0,0 +1,65 @@
+## jin-edit 基于editor的富文本编辑器
+
+### 兼容性
+
+这是一个uni-app的通用组件，兼容微信小程序端、安卓端、ios端（未测试）、H5端。作者因没有ios设备无法对ios端进行测试，其他端测试无问题。
+
+微信小程序 | APP | H5
+:--: | :--: | :--:
+√ | √ | √
+
+我的HbuilderX版本2.6.7，不同的版本可能会造成不兼容的问题。
+
+### 使用方式
+
+1. 将此组件进入你的项目中的 /components/ 目录中
+2. 在某个页面中使用该插件
+- 在 `script` 中引用组件
+```javascript
+import jinEdit from '../../components/jin-edit/jin-edit.vue';
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	components: {
+		jinEdit
+	},
+	methods: {
+		// 点击发布
+		editOk(res) {
+			console.log(res);
+		}
+	}
+}
+```
+- 在 `template` 中使用组件
+```html
+<jinEdit placeholder="请输入内容" @editOk="editOk" uploadFileUrl="/#"></jinEdit> 
+```
+
+### Demo
+
+[uni-jin（一个uni-app组件集合）](https://github.com/wangjinxin613/uni-jin)
+
+### 参数
+
+属性 | 类型 | 默认值 | 说明
+:--: | :--: | :--: | :--:
+showImgSize | Boolean | false | 点击图片时显示图片大小控件
+showImgToolbar | Boolean | false | 点击图片时显示工具栏控件
+showImgResize | Boolean | false | 点击图片时显示修改尺寸控件
+placeholder | String | '' | 编辑器占位符
+uploadFileUrl | String | '#' | 图片上传的服务器地址
+fileKeyName | String | 'file' | 图片上传时的name
+header | Object | - | 图片上传http请求的header
+html | String | - | 初始化的html 
+
+### 方法
+
+方法名 | 参数 | 说明
+:--: | :--: | :--:
+editOk | e={html,text,delta,isPublic} | 点击发布按钮触发	
+
+以上
\ No newline at end of file
diff --git a/components/loading/loading.vue b/components/loading/loading.vue
new file mode 100644
index 0000000..ba5e8df
--- /dev/null
+++ b/components/loading/loading.vue
@@ -0,0 +1,18 @@
+<template>
+	<view class="loading-wrap" :style="loadstyle">
+		<image class="loading-img" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZVHb98LM+F5bHL8khA1iSeiyQBCRM+YGqKUnnJTDLGI0BGZlKDIU2MMglUiDApEZvSsZnQtBRJtKwQNKQMFYeRDR10WOLd8ljYXdh+v8v5fR3Od+797t1dnOnO/Ofce77z+J//+b/P+ZqtXbs2sJ9MJhNUV1cHJ06cCJo3bx7EPc2aNcvpy7pWrVoF+/fvDyoqKoI2bdoE9fX1F7TjN8a+EXBn/fkfvw942Tf+wYMHg9mzZwfjxo0LDhw4EPa1x2MbFw/fOGfPng1qa2tzcCkILsLDydq2bRsunpOTMM7TD/W/tZDZhPdeKD+yGxHhdu3aBV27dg3OnDlzMVANMheLAO3btw8KCwuDmpoaX5OxbgUIMEq7K8IcPnw4KCsrC/r37x8cP378/4cAXAB3vqSkJMuiDhTkw+XcuXNhOWbMmKBly5YhUT8xArhyFvP0BfwRsAuwxJZJsm/nzp2DTp06he/OU+cZ64K6o0ePBkOHDg2GDx8e6gEbJ5Q/NHNuAJQ1hgBeHUDlR7nVTkY8rQAvAi4z34vR/mPs1FoRsaCgIJThI0eOBC1atEiFGGV+5MiRoS45efJkqFjJFXV1dQuA012m2WcwTw98fy6CqBdsaiIO4CScrGPHjvk4odhavPquRtFWXEC25VgkREKOCh/qDSq+vn37htzD/mZTOmOc5U7zKzBPEedygWshcDyWvs30igAbU+6oyMgJBCFhwQE0fccxN60Ay9iebbjoDh06hMowjQxT4fXq1SskArmHZpkArvixp/kWzHdMeArExSJEaiXIjjRjRJ4DaAGWpibLzXN3Fm1vA5teBgh3j1Rv3bp1YgKwPdmf2p9zcyNYYgPKMfY0T5f5nNYdw158nJ8QawW4CLKwiOBSEgO/hok2eBydR+3dYH+PLxA5J8Vv0KBBwenTp0P2JWAx6+yFEBfs8lMY+y0SWMBNI9E4ThKi58VKTg3FQZS1RQF1cz27eC0QHMu+3E0SkUowjhVt5VdaWhp07949ZHv2Qd1EjDXM2cla1M0nl3GxAs3J9yREzyTdFVKVFOaE9qRA8GM0WebRuo9JGZKA7Mv2SeS/Z8+eoQ9BArMfFrLGo6jvxbhHbJZnKX2Rzz1O7QhJJ9Cs2ZMaWIyq/zhdeqPNfIoHd58clIQD+JSXl4dKlyIAuBdVXZwFVWKspSSoxE++h8x4k3uCnEhE4I5KwRiFWGOU0QWKiCYLbdoRMRKAu2kQ9vkfLU6dOhX06NEjlH+yMRZSinnuyWnYosVcji8CEA/6Cg2JF+IIUBqnGKUTCNwtwBN4f89RiK1R96DEgO2o0NDmtEdvVFdVVYV+P3UAPUEs6GFwV3PHmXkD4vh74iDFJysVI/MlaQhwKeBNTLYX5VuA8T4/gZxA4MRGFxDB6R7OmYPfyykGRJbyie+XnGYnQIC/coH9+vULiYrxrkL9ZA9+0ykaHIfEpM7ge8TiJ2CsHYwyMfafAF1yCGBHYIbCVDjDjKt7BeB51D+LgQa6OkG7IDYEEtvQ7lnXLKLtLdLuJBpE4gPUXcW2+PkZwOex+4cGDhwYDBkyRL7/HFcEwUGPo/8uWRUpYnfxGHco8HkewLHLyYmAawAPuIFZxhOpDfJQ8gbUv41yORAptMWBNr6oqMhWird5+u+iHmBb2nhjDV7HWBNQTgK8y11l5NetWzc5ULscAtSj7nbNI0skhWeUZCc0W4nyH/jO4Vz0u1IeYhbk4AiwM6tjxIWByHsoZ9qcIBPJd/y+DwPfBESOmCa/QF3WiZHucLlEDpNxcNhmheEOPgdQNx6/VZFQzFZ5TN08AHXQt2Ii3EdyFuUsPtTcGPhW5iMiCNELvz+Gdn9huG4HUJaW/w3g0wxV0XaG7arG2WeKiUWYM4Y7GO5ezshTARbbWGw/DvXkpp/ivVvE0JVoMxN4rpGzJMhE5Pl+xlATsDIqikP9F9D2z3h9nOksEUFhK+qO4rcPkoalMQ/HqJLIyb3F3JdjrCcw1yZ8joyJLR5gCo54etlag7qIoeNh1N1BRYj3DTFJ0elotxPlVzkGuYAmL0VSJVGAJA41c4Z6A3BzTLfn0HYwYKEI6CUAMzZEWvLsIcQOo1AmmyyM72nHJCfYsogflGV6jEk9vyQZXSuq6w4c16NsGcGZbwOPr+H1RkOk2LEzjNepxQkihHSCQ4ynAYNRx2zMKV92CQMWqj8J0BRE8EShxRFN6YrfCRhC0x3r/Zm4IbQCcmJoV0kMamllccR6FjHqUC5F2R/wS2dcymOlfAKOS4KmzQb5cpNC2MC7JhVn5wjXoJ44rYhLh8n0eXOCorJxa7POjbSlCGVczr34/RsAmrcvo9s+wGp3tzVhntxiXiJ4nvEYb4FJkf0O8HocAePmLvCxnL0AORraVekJk6TYjDabRVXfRE2lCN1h6ZQRN1+InUbsCpKwoBZHh0dODN9JBCUffItXxEavTQkUtnfTVAplCWL3JISz29h4NjotnuSsQKJCk8dF+kJR6RARjrqFVmfPnj3ZbK8cIJ0msd6jgHPGtfVTQ8VLmlvh4mct9sobRmPic0DyDQQnx/NlfYUgyz59+oScsH379pAwXABD32nTpoUHIToESeI5mnbE/UqDdyLcafEBf2MCqgC7NwxIbMREJQ0g4D4sfJwnD+AmRrII05cfMWJE+L1169bQr+fip06dGp4oJ83lmYd5wj/EmMa4TaHivo4EeCguYZBnkB5g2aWA69OIEnUHOaGysjIYMGBAMGnSpODYsWPZwCpFmm4lNq+4gSLQA7jcX8DwtjEyRC8wjabnXEx9kfWnTJkSJkAo90xpJVV+FmcVNeYAF5zWngS4C4O91MBxmAv8blLEpbjI5sz9MTdAhcgkCT1RO8mZkAjfiYpTEvStAS53Uw1vAiUGgZ3GpuQEYvoiBqlIan7kSDHnTwJQFNiPu0+5VxCVYhcZIjNrdXUDdp+Eq5AZ3Gkg8QAyVZRZIk4Tl4QAbF9cXJxNYZMAtAokgs4BrNxEpCtteXg7DDTMDKYNSuQdKsnJBek7HxewvxaosWxLYXtw+cJp18217wql4aKCfBNoEu0O5VU+PhctJ0YeXD4C6JQpyrlpSLTojpGGGN5YwNziChdIZLk4lvLcFJ9jMX3QdiImY9bmGQU+TRUL5CHITTRlgF8D9ouD1MfmLoEPl5xokIumZ2cfgMpHt47IW9N64Hsh7wQYYjyIugWuF5fCqYncXRd5vPMWyizzvhi/32+nvG0dZc9vR6fZOu0md5e+uC408FvKSIOZwXlGvxPv95izA2Vtvg1xKFWARI+vMX66HUhpQQb643uW1bSjuTWyw2SBvDrBvjFic1eGGlz5esq3ko9uSIlBRqPuFcCv8F4WIcN12nVaBd0SaYwI6PDDImR11JkqgHcPmQssjxIn6bUshygDFJUTxPMpHk+jfjPgupgdnYV2R/g7xSjtpah8RJBewhwf0gGK6XI92u4wXFEU40afJ4DN4h5LcAd+40HI3JgJecuT0c062W0i2hQJUTcxan3/CMW1PF2K6bbA+Daz4xRs1D3Br1Cm0OihKCqizW78/nXAF/G5TXrEcVzaNMH6CyMswqsAHqDyDLEyou8lwOXnKF8DjI6KjV3KzMBiXkDH8ij/H214J5A596ekrZ3F0zXlWeL7+P5eUrNo3/QwC15uxthuzidy7DzKRwEDaAViiDgKbTbz7CJnzo0bN7pIfIiid8SuPwn25o3QCmpnyjlZkyxPP8EomCJzrGb7GJMx7tNsq4MT2xMUYaiErZOluTzKsnz3gwCeCZyVRZJfYplNEokEjwrPtxlxjeYAk+F1F74VAzPxQRNYYdtpOUvWs8J1sGhBJMNsb7igN8plJs1eSmLIhLKE4rvaCX27gOhLpLOsIzJ7qn/i+wZzcvSOZ23/du8TZjwV8zHIXoP4R3ifBxiFz1dcVpa3aPntPE+c6TmIWE9EtcMmAcPdWAhYhAXxcLOQi9L1WhD1Sc8p1d2oL7XGiRKp8F4A2i8K/nfI+y/gsTDJ/YC/8+AD5Uh04KHiGl+cIFPnBDDrPMjwRGkLXyxO4VGbfQWnDH2v0bVWE3C9QOXlepbgjEfIJQI6XDG3z5ahD9cw2pS78ipB85wyScNTvsVzlzzhL8/jRrnmVjfFJK/m3m4nj9vbgQTguT8XZTjsm672R5uJKEaQmBI/c58gyus8ZDagLpEVSJBIyHp4jn++xqPV71OgQgJYEWOtZ/haxRtKmWOBu8xdBLftWltsY84zE6WIEy/eIOWL+BaayMx+KHtL7EAkqdNDLiEXmEMUHniedtJqg9HmZtfvt26vNi0BdG3Ft3g8ZOf7PAu59TxtzivLNIekyi+wD1i8CuUiD9FXAa8C+/xS3JPmZnomyc7H+fb4/Se0bk41Fel621r4cgVxbq91V4jVqwB7HTe2M7jgB+QWHavZkDRPmZcASoZEmBx6i75bGjPcMdL4/VKGFAGWZkGzPG0XAbdL9A81G5LOmUnC9hHKJeO7dcUMjblSl12867ElFTtaGl20xvvLGPdVz/8TVuU7y0x1PG7vtNg24oz9Uo/Z412++VFWI7Fcog9tu9Lm6gvRmIPv9x1xmQAu6RDkXtbOtlGEmpgD5Nvnyc0dcv0EE6cfdi1HmhMf9wDF3k3gtRvEedhxjpgfqPb9PU9iEJHnyOUA7bQUXh6kq/D7l2iTjWv7XOD530BDr8jIrus+srXjt4MzumJMHuTsBa63YKE1+RR5lBjEikCCnWKWiHdzOgKO+nRIBAF88za/IFmJ3eMZov4CYxGBabcpGL8EYx+SeMXJeRwHNsV/h+vdxeuhEpN3ZyNY78Gm2fknJxVGhyjixPiQvVkNzT1elD9Py/aTAL64Hb9vcYmC9zfdXdT/C1LeGbg4rnBaAihDFJH12W5ulfNCNe/xTsP3bp8ikzJs5BF+5PNfAQYAPaseTdsEcaYAAAAASUVORK5CYII=" ></image>
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			loadstyle:{}
+		}
+	}
+</script>
+<style>
+.loading-wrap {position: fixed;width: 64rpx;height: 64rpx;left: 50%;top: 38%;z-index: 99999;text-align: center;margin-left: -32rpx;border-radius: 35rpx;}
+.loading-img {width: 64rpx;height: 64rpx;position: absolute;animation: loading 0.8s linear 0s infinite;left: 0;top: 0;}
+@keyframes loading {0% {transform: rotate(0);}100% {transform: rotate(360deg);}}
+@-webkit-keyframes loading {0% {transform: rotate(0);}100% {transform: rotate(360deg);}}
+</style>
\ No newline at end of file
diff --git a/components/nodata/nodata.vue b/components/nodata/nodata.vue
new file mode 100644
index 0000000..9804e76
--- /dev/null
+++ b/components/nodata/nodata.vue
@@ -0,0 +1,20 @@
+<template>
+	<view class="nodata">
+		<image class="nodata-img" :src="pic"/>
+		<view class="nodata-text">{{text}}</view>
+	</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		props: {
+			pic:{default: app.globalData.event_url +'/static/img/static/img/empty.png'},
+			text:{default:'没有相关信息'}
+		}
+	}
+</script>
+<style>
+.nodata {width: 100%; text-align: center; padding-top:100rpx;padding-bottom:100rpx}
+.nodata-img{ width: 300rpx; height: 300rpx; display: inline-block; }
+.nodata-text{ display: block; text-align: center; color: #999999; font-size:28rpx; width: 100%; margin-top: 30rpx; }
+</style>
\ No newline at end of file
diff --git a/components/nomore/nomore.vue b/components/nomore/nomore.vue
new file mode 100644
index 0000000..749838e
--- /dev/null
+++ b/components/nomore/nomore.vue
@@ -0,0 +1,24 @@
+<template>
+<view class="nomore">
+	<view class="nomore-line" :style="{borderColor:linecolor}"></view>
+	<view class="nomore-text">
+		<text class="txt" :style="{color:textcolor}">{{text}}</text>
+	</view>
+	<view class="nomore-line" :style="{borderColor:linecolor}"></view>
+</view>
+</template>
+<script>
+	export default {
+		props: {
+			text:{default:'没有更多数据了'},
+			textcolor:{default:'#999'},
+			linecolor:{default:'#eee'},
+		}
+	}
+</script>
+<style>
+.nomore{height:auto;overflow: hidden;display:flex;align-items:center;width:500rpx;padding:30rpx 20rpx;margin:0 auto}
+.nomore-line{height: auto; padding: 0; overflow: hidden;flex:1;height:0;border-top:1px solid #eee}
+.nomore-text{padding:0 32rpx;text-align:center;display:flex;align-items:center;justify-content:center}
+.nomore-text .txt{color:#999;font-size:28rpx}
+</style>
\ No newline at end of file
diff --git a/components/parse/components/wxParseAudio.vue b/components/parse/components/wxParseAudio.vue
new file mode 100644
index 0000000..b277717
--- /dev/null
+++ b/components/parse/components/wxParseAudio.vue
@@ -0,0 +1,28 @@
+<template>
+	<!-- '<audio/>' 组件不再维护，建议使用能力更强的 'uni.createInnerAudioContext' 接口 有时间再改-->
+  <!--增加audio标签支持-->
+  <audio
+    :id="node.attr.id"
+    :class="node.classStr"
+    :style="node.styleStr"
+    :src="node.attr.src"
+    :loop="node.attr.loop"
+    :poster="node.attr.poster"
+    :name="node.attr.name"
+    :author="node.attr.author"
+    controls></audio>
+</template>
+
+<script>
+export default {
+  name: 'wxParseAudio',
+  props: {
+    node: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+  },
+};
+</script>
diff --git a/components/parse/components/wxParseImg.vue b/components/parse/components/wxParseImg.vue
new file mode 100644
index 0000000..50893c1
--- /dev/null
+++ b/components/parse/components/wxParseImg.vue
@@ -0,0 +1,94 @@
+<template>
+	<image
+		mode="widthFix"
+		:lazy-load="node.attr.lazyLoad"
+		:class="node.classStr"
+		:style="newStyleStr || node.styleStr"
+		:data-src="node.attr.src"
+		:src="node.attr.src"
+		@tap="wxParseImgTap"
+		@load="wxParseImgLoad"
+	/>
+</template>
+
+<script>
+export default {
+	name: 'wxParseImg',
+	data() {
+		return {
+			newStyleStr: '',
+			preview: true
+		};
+	},
+	inject: ['parseWidth'],
+	mounted() {},
+	props: {
+		node: {
+			type: Object,
+			default() {
+				return {};
+			}
+		}
+	},
+	
+	methods: {
+		wxParseImgTap(e) {
+			if (!this.preview) return;
+			const { src } = e.currentTarget.dataset;
+			if (!src) return;
+			let parent = this.$parent;
+			while (!parent.preview || typeof parent.preview !== 'function') {
+				// TODO 遍历获取父节点执行方法
+				parent = parent.$parent;
+			}
+			parent.preview(src, e);
+		},
+		// 图片视觉宽高计算函数区
+		wxParseImgLoad(e) {
+			const { src } = e.currentTarget.dataset;
+			if (!src) return;
+			let { width, height } = e.mp.detail;
+
+			const recal = this.wxAutoImageCal(width, height);
+
+			const { imageheight, imageWidth } = recal;
+			const { padding, mode } = this.node.attr;//删除padding
+			// const { mode } = this.node.attr;
+
+			const { styleStr } = this.node;
+			const imageHeightStyle = mode === 'widthFix' ? '' : `height: ${imageheight}px;`;
+
+			if(!styleStr) this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`;//删除padding
+			// this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px;`;
+		},
+		// 计算视觉优先的图片宽高
+		wxAutoImageCal(originalWidth, originalHeight) {
+			// 获取图片的原始长宽
+			const windowWidth = this.parseWidth.value;
+			const results = {};
+
+			if (originalWidth < 60 || originalHeight < 60) {
+				const { src } = this.node.attr;
+				let parent = this.$parent;
+				while (!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.removeImageUrl(src);
+				this.preview = false;
+			}
+
+			// 判断按照那种方式进行缩放
+			if (originalWidth > windowWidth) {
+				// 在图片width大于手机屏幕width时候
+				results.imageWidth = windowWidth;
+				results.imageheight = windowWidth * (originalHeight / originalWidth);
+			} else {
+				// 否则展示原来的数据
+				results.imageWidth = originalWidth;
+				results.imageheight = originalHeight;
+			}
+			return results;
+		}
+	}
+};
+</script>
diff --git a/components/parse/components/wxParseTable.vue b/components/parse/components/wxParseTable.vue
new file mode 100644
index 0000000..18278c9
--- /dev/null
+++ b/components/parse/components/wxParseTable.vue
@@ -0,0 +1,56 @@
+<template>
+	<div class='tablebox'>
+		<rich-text :nodes="nodes" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+	</div>
+</template>
+<script>
+export default {
+	name: 'wxParseTable',
+	props: {
+		node: {
+			type: Object,
+			default() {
+				return {};
+			},
+		},
+	},
+	inject: ['parseSelect'],
+	data() {
+		return {
+			nodes:[]
+		};
+	},
+	mounted() {
+		this.nodes=this.loadNode([this.node]);
+	},
+	methods: {
+		loadNode(node) {
+			console.log(node)
+			let obj = [];
+			for (let children of node) {
+				if (children.node=='element') {
+					let t = {
+						name:children.tag,
+						attrs: {
+							class: children.classStr,
+							style: children.styleStr,
+						},
+						children: children.nodes?this.loadNode(children.nodes):[]
+					}
+					
+					obj.push(t)
+				} else if(children.node=='text'){
+					obj.push({
+						type: 'text',
+						text: children.text
+					})
+				}
+			}
+			return obj
+		}
+	}
+};
+</script>
+<style>
+	@import url("../parse.css");
+</style>
\ No newline at end of file
diff --git a/components/parse/components/wxParseTemplate0.vue b/components/parse/components/wxParseTemplate0.vue
new file mode 100644
index 0000000..5cbe790
--- /dev/null
+++ b/components/parse/components/wxParseTemplate0.vue
@@ -0,0 +1,116 @@
+<template>
+	<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text'">{{node.text}}</block>
+</template>
+
+<script>
+	// #ifdef APP-PLUS | H5
+	import wxParseTemplate from './wxParseTemplate0';
+	// #endif
+	// #ifdef MP
+	import wxParseTemplate from './wxParseTemplate1';
+	// #endif
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+
+	export default {
+		// #ifdef APP-PLUS | H5
+		name: 'wxParseTemplate',
+		// #endif
+		// #ifdef MP
+		name: 'wxParseTemplate0',
+		// #endif
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;// TODO currentTarget才有dataset
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {// TODO 遍历获取父节点执行方法
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate1.vue b/components/parse/components/wxParseTemplate1.vue
new file mode 100644
index 0000000..70779e3
--- /dev/null
+++ b/components/parse/components/wxParseTemplate1.vue
@@ -0,0 +1,107 @@
+<template>
+	<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text'">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate2';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate1',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate10.vue b/components/parse/components/wxParseTemplate10.vue
new file mode 100644
index 0000000..891c8c3
--- /dev/null
+++ b/components/parse/components/wxParseTemplate10.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate11';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate10',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate11.vue b/components/parse/components/wxParseTemplate11.vue
new file mode 100644
index 0000000..d38efbd
--- /dev/null
+++ b/components/parse/components/wxParseTemplate11.vue
@@ -0,0 +1,105 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<rich-text :nodes="node" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<rich-text :nodes="node" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<rich-text :nodes="node" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate11',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate2.vue b/components/parse/components/wxParseTemplate2.vue
new file mode 100644
index 0000000..c68b226
--- /dev/null
+++ b/components/parse/components/wxParseTemplate2.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text'">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate3';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate2',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate3.vue b/components/parse/components/wxParseTemplate3.vue
new file mode 100644
index 0000000..1a1bb29
--- /dev/null
+++ b/components/parse/components/wxParseTemplate3.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate4';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate3',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate4.vue b/components/parse/components/wxParseTemplate4.vue
new file mode 100644
index 0000000..c3497b8
--- /dev/null
+++ b/components/parse/components/wxParseTemplate4.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate5';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate4',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate5.vue b/components/parse/components/wxParseTemplate5.vue
new file mode 100644
index 0000000..5e66618
--- /dev/null
+++ b/components/parse/components/wxParseTemplate5.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate6';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate5',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate6.vue b/components/parse/components/wxParseTemplate6.vue
new file mode 100644
index 0000000..dc44621
--- /dev/null
+++ b/components/parse/components/wxParseTemplate6.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate7';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate6',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate7.vue b/components/parse/components/wxParseTemplate7.vue
new file mode 100644
index 0000000..71636dc
--- /dev/null
+++ b/components/parse/components/wxParseTemplate7.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate8';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate7',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate8.vue b/components/parse/components/wxParseTemplate8.vue
new file mode 100644
index 0000000..326115d
--- /dev/null
+++ b/components/parse/components/wxParseTemplate8.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate9';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate8',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseTemplate9.vue b/components/parse/components/wxParseTemplate9.vue
new file mode 100644
index 0000000..f1224a3
--- /dev/null
+++ b/components/parse/components/wxParseTemplate9.vue
@@ -0,0 +1,107 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr" style="display: inline; border-bottom: 1px solid #555555;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--strong标签-->
+		<view v-else-if="node.tag == 'strong'" :class="node.classStr" :style="node.styleStr" style="font-weight: 700;display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--span标签-->
+		<view v-else-if="node.tag == 'span'" :class="node.classStr"  :style="node.styleStr" style="display: inline;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+		<!--em标签-->
+		<view v-else-if="node.tag == 'em'" :class="node.classStr"  :style="node.styleStr" style="display: inline;font-style: italic;">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate10';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate9',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/components/parse/components/wxParseVideo.vue b/components/parse/components/wxParseVideo.vue
new file mode 100644
index 0000000..1cd9b70
--- /dev/null
+++ b/components/parse/components/wxParseVideo.vue
@@ -0,0 +1,55 @@
+<template>
+	<!-- 这个模板用来解决原生video总是浮在最上层的问题，使用view替换video，播放是再替换回，监听一个事件，用来被遮盖时做替换video -->
+  <!--增加video标签支持，并循环添加-->
+  <view @click="play">
+	  <view v-if="!playState" :class="node.classStr" :style="node.styleStr" style="display: inline-block;margin: auto;max-width: 100%;" class="video-video">
+		  <view style="display: flex;width: 100%;height:100%;flex-direction: row; justify-content: center;align-items: center;">
+			  <image src="https://gwbj.tongwenkeji.com/html/static/play.png" style="width: 20%;" mode="widthFix"></image>
+		  </view>
+	  </view>
+	  <video
+	  :autoplay="false" 
+	  :class="node.classStr" 
+	  :style="node.styleStr" 
+	  class="video-video"
+	  v-if="playState"
+	  :src="node.attr.src"></video>
+	  
+  </view>
+  
+</template>
+
+<script>
+export default {
+  name: 'wxParseVideo',
+  props: {
+    node: {},
+  },
+  data(){
+	  return{
+		  playState:true,
+		  videoStyle:'width: 100%;'
+	  }
+  },
+  methods:{
+	  play(){
+		  console.log('点击了video 播放')
+		  //显示播放器并播放播放器
+		  this.playState = !this.playState
+	  }
+  },
+  mounted() {
+	  //捕获侧滑菜单的遮盖行为，隐藏video
+  	uni.$on('slideMenuShow',e=>{
+		console.log('捕获事件：'+e)
+		if(e == 'show' && this.playState){
+			//正在播放则停止
+			this.playState = false
+		}
+	})
+  }
+};
+</script>
+<style>
+	.video-video{background: #000000;}
+</style>
diff --git a/components/parse/components/wxParseVideo1.vue b/components/parse/components/wxParseVideo1.vue
new file mode 100644
index 0000000..0d37e10
--- /dev/null
+++ b/components/parse/components/wxParseVideo1.vue
@@ -0,0 +1,25 @@
+<template>
+	<!-- 这个模板用来渲染原生video -->
+  <!--增加video标签支持，并循环添加-->
+  <view style="max-width: 100%;">
+	<video
+	:autoplay="playState" 
+	:class="node.classStr" 
+	:style="node.styleStr" 
+	class="video-video"
+	v-if="playState"
+	:src="node.attr.src"></video>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'wxParseVideo',
+  props: {
+    node: {},
+  }
+};
+</script>
+<style>
+	.video-video{z-index: 1;}
+</style>
diff --git a/components/parse/libs/html2json.js b/components/parse/libs/html2json.js
new file mode 100644
index 0000000..0bdf93c
--- /dev/null
+++ b/components/parse/libs/html2json.js
@@ -0,0 +1,310 @@
+/**
+ * html2Json 改造来自: https://github.com/Jxck/html2json
+ *
+ *
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ *
+ * github地址: https://github.com/icindy/wxParse
+ *
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+import wxDiscode from './wxDiscode';
+import HTMLParser from './htmlparser';
+
+function makeMap(str) {
+	const obj = {};
+	const items = str.split(',');
+	for (let i = 0; i < items.length; i += 1) obj[items[i]] = true;
+	return obj;
+}
+
+// Block Elements - HTML 5
+const block = makeMap(
+	'br,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'
+);
+
+// Inline Elements - HTML 5
+const inline = makeMap(
+	'a,abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'
+);
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+const closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');
+
+function removeDOCTYPE(html) {
+	const isDocument = /<body.*>([^]*)<\/body>/.test(html);
+	return isDocument ? RegExp.$1 : html;
+}
+
+function trimHtml(html) {
+	return html
+		.replace(/<!--.*?-->/gi, '')
+		.replace(/\/\*.*?\*\//gi, '')
+		// .replace(/[ ]+</gi, '<')
+		.replace(/<script[^]*<\/script>/gi, '')
+		.replace(/<style[^]*<\/style>/gi, '');
+}
+
+function getScreenInfo() {
+	const screen = {};
+	wx.getSystemInfo({
+		success: (res) => {
+			screen.width = res.windowWidth;
+			screen.height = res.windowHeight;
+		},
+	});
+	return screen;
+}
+
+function html2json(html, customHandler, imageProp, host) {
+	// 处理字符串
+	html = removeDOCTYPE(html);
+	html = trimHtml(html);
+	html = wxDiscode.strDiscode2(html);
+	// 生成node节点
+	const bufArray = [];
+	const results = {
+		nodes: [],
+		imageUrls: [],
+	};
+
+	const screen = getScreenInfo();
+
+	function Node(tag) {
+		this.node = 'element';
+		this.tag = tag;
+
+		this.$screen = screen;
+	}
+
+	HTMLParser(html, {
+		start(tag, attrs, unary) {
+			// node for this element
+			const node = new Node(tag);
+
+			if (bufArray.length !== 0) {
+				const parent = bufArray[0];
+				if (parent.nodes === undefined) {
+					parent.nodes = [];
+				}
+			}
+
+			if (block[tag]) {
+				node.tagType = 'block';
+			} else if (inline[tag]) {
+				node.tagType = 'inline';
+			} else if (closeSelf[tag]) {
+				node.tagType = 'closeSelf';
+			}
+
+			node.attr = attrs.reduce((pre, attr) => {
+				const {
+					name
+				} = attr;
+				let {
+					value
+				} = attr;
+				if (name === 'class') {
+					node.classStr = value;
+				}
+				// has multi attibutes
+				// make it array of attribute
+				if (name === 'style') {
+					node.styleStr = value;
+				}
+				if (value.match(/ /)) {
+					value = value.split(' ');
+				}
+
+				// if attr already exists
+				// merge it
+				if (pre[name]) {
+					if (Array.isArray(pre[name])) {
+						// already array, push to last
+						pre[name].push(value);
+					} else {
+						// single value, make it array
+						pre[name] = [pre[name], value];
+					}
+				} else {
+					// not exist, put it
+					pre[name] = value;
+				}
+
+				return pre;
+			}, {});
+
+			// 优化样式相关属性
+			if (node.classStr) {
+				node.classStr += ` ${node.tag}`;
+			} else {
+				node.classStr = node.tag;
+			}
+			if (node.tagType === 'inline') {
+				node.classStr += ' inline';
+			}
+
+			// 对img添加额外数据
+			if (node.tag === 'img') {
+				let imgUrl = node.attr.src;
+				imgUrl = wxDiscode.urlToHttpUrl(imgUrl, imageProp.domain);
+				Object.assign(node.attr, imageProp, {
+					src: imgUrl || '',
+				});
+				if (imgUrl) {
+					results.imageUrls.push(imgUrl);
+				}
+			}
+
+			// 处理a标签属性
+			if (node.tag === 'a') {
+				node.attr.href = node.attr.href || '';
+			}
+
+			//处理table
+			if (node.tag === 'table' || node.tag === 'tr' || node.tag === 'td') {
+				node.styleStr = ""
+				if (node.attr.width) {
+					node.styleStr += "width:" + node.attr.width + 'px;'
+					if (node.attr.width > node.$screen.width) {
+						//等比缩放height
+						if (node.attr.height) {
+							node.attr.height = (node.$screen.width * node.attr.height) / node.attr.width
+						}
+					}
+				}
+				if (node.attr.height) {
+					node.styleStr += "height:" + node.attr.height + 'px;'
+				}
+
+			}
+			//处理video
+			if (node.tag === 'video') {
+				node.styleStr = ""
+				if (node.attr.width) {
+					node.styleStr += "width:" + node.attr.width + 'px;'
+					if (node.attr.width > node.$screen.width) {
+						//等比缩放height
+						if (node.attr.height) {
+							node.attr.height = (node.$screen.width * node.attr.height) / node.attr.width
+						}
+					}
+				}
+				if (node.attr.height) {
+					node.styleStr += "height:" + node.attr.height + 'px;'
+				}
+
+			}
+
+			// 处理font标签样式属性
+			if (node.tag === 'font') {
+				const fontSize = [
+					'x-small',
+					'small',
+					'medium',
+					'large',
+					'x-large',
+					'xx-large',
+					'-webkit-xxx-large',
+				];
+				const styleAttrs = {
+					color: 'color',
+					face: 'font-family',
+					size: 'font-size',
+				};
+				if (!node.styleStr) node.styleStr = '';
+				Object.keys(styleAttrs).forEach((key) => {
+					if (node.attr[key]) {
+						const value = key === 'size' ? fontSize[node.attr[key] - 1] : node.attr[key];
+						node.styleStr += `${styleAttrs[key]}: ${value};`;
+					}
+				});
+			}
+
+			// 临时记录source资源
+			if (node.tag === 'source') {
+				results.source = node.attr.src;
+			}
+			//#ifndef MP-BAIDU
+			if (customHandler.start) {
+				customHandler.start(node, results);
+			}
+			//#endif
+
+			if (unary) {
+				// if this tag doesn't have end tag
+				// like <img src="hoge.png"/>
+				// add to parents
+				const parent = bufArray[0] || results;
+				if (parent.nodes === undefined) {
+					parent.nodes = [];
+				}
+				parent.nodes.push(node);
+			} else {
+				bufArray.unshift(node);
+			}
+		},
+		end(tag) {
+			// merge into parent tag
+			const node = bufArray.shift();
+			if (node.tag !== tag) {
+				console.error('invalid state: mismatch end tag');
+			}
+
+			// 当有缓存source资源时于于video补上src资源
+			if (node.tag === 'video' && results.source) {
+				node.attr.src = results.source;
+				delete results.source;
+			}
+			//#ifndef MP-BAIDU
+			if (customHandler && customHandler.end) {
+				customHandler.end(node, results);
+			}
+			//#endif
+
+			if (bufArray.length === 0) {
+				results.nodes.push(node);
+			} else {
+				const parent = bufArray[0];
+				if (!parent.nodes) {
+					parent.nodes = [];
+				}
+				parent.nodes.push(node);
+			}
+		},
+		chars(text) {
+			if (!text.trim()) return;
+			// console.log(text)
+			text = wxDiscode.strDiscode(text);
+			//text = text.replace(/&quot;|&#34;|&#x22;/g, "\"");
+			const node = {
+				node: 'text',
+				text,
+			};
+			//#ifndef MP-BAIDU
+			if (customHandler.chars) {
+				customHandler.chars(node, results);
+			}
+			//#endif
+
+			if (bufArray.length === 0) {
+				results.nodes.push(node);
+			} else {
+				const parent = bufArray[0];
+				if (parent.nodes === undefined) {
+					parent.nodes = [];
+				}
+				parent.nodes.push(node);
+			}
+		},
+	});
+
+	return results;
+}
+
+export default html2json;
diff --git a/components/parse/libs/htmlparser.js b/components/parse/libs/htmlparser.js
new file mode 100644
index 0000000..2939da3
--- /dev/null
+++ b/components/parse/libs/htmlparser.js
@@ -0,0 +1,156 @@
+/**
+ *
+ * htmlParser改造自: https://github.com/blowsie/Pure-JavaScript-HTML5-Parser
+ *
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ *
+ * github地址: https://github.com/icindy/wxParse
+ *
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+// Regular Expressions for parsing tags and attributes
+
+const startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z0-9_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+const endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+const attr = /([a-zA-Z0-9_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
+
+function makeMap(str) {
+  const obj = {};
+  const items = str.split(',');
+  for (let i = 0; i < items.length; i += 1) obj[items[i]] = true;
+  return obj;
+}
+
+// Empty Elements - HTML 5
+const empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr');
+
+// Block Elements - HTML 5
+const block = makeMap('address,code,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video');
+
+// Inline Elements - HTML 5
+const inline = makeMap('a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var');
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+const closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');
+
+// Attributes that have their values filled in disabled="disabled"
+const fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected');
+
+function HTMLParser(html, handler) {
+  let index;
+  let chars;
+  let match;
+  let last = html;
+  const stack = [];
+
+  stack.last = () => stack[stack.length - 1];
+
+  function parseEndTag(tag, tagName) {
+    // If no tag name is provided, clean shop
+    let pos;
+    if (!tagName) {
+      pos = 0;
+    } else {
+      // Find the closest opened tag of the same type
+      tagName = tagName.toLowerCase();
+      for (pos = stack.length - 1; pos >= 0; pos -= 1) {
+        if (stack[pos] === tagName) break;
+      }
+    }
+    if (pos >= 0) {
+      // Close all the open elements, up the stack
+      for (let i = stack.length - 1; i >= pos; i -= 1) {
+        if (handler.end) handler.end(stack[i]);
+      }
+
+      // Remove the open elements from the stack
+      stack.length = pos;
+    }
+  }
+
+  function parseStartTag(tag, tagName, rest, unary) {
+    tagName = tagName.toLowerCase();
+
+    if (block[tagName]) {
+      while (stack.last() && inline[stack.last()]) {
+        parseEndTag('', stack.last());
+      }
+    }
+
+    if (closeSelf[tagName] && stack.last() === tagName) {
+      parseEndTag('', tagName);
+    }
+
+    unary = empty[tagName] || !!unary;
+
+    if (!unary) stack.push(tagName);
+
+    if (handler.start) {
+      const attrs = [];
+
+      rest.replace(attr, function genAttr(matches, name) {
+        const value = arguments[2] || arguments[3] || arguments[4] || (fillAttrs[name] ? name : '');
+
+        attrs.push({
+          name,
+          value,
+          escaped: value.replace(/(^|[^\\])"/g, '$1\\"'), // "
+        });
+      });
+
+      if (handler.start) {
+        handler.start(tagName, attrs, unary);
+      }
+    }
+  }
+
+  while (html) {
+    chars = true;
+
+    if (html.indexOf('</') === 0) {
+      match = html.match(endTag);
+
+      if (match) {
+        html = html.substring(match[0].length);
+        match[0].replace(endTag, parseEndTag);
+        chars = false;
+      }
+
+      // start tag
+    } else if (html.indexOf('<') === 0) {
+      match = html.match(startTag);
+
+      if (match) {
+        html = html.substring(match[0].length);
+        match[0].replace(startTag, parseStartTag);
+        chars = false;
+      }
+    }
+
+    if (chars) {
+      index = html.indexOf('<');
+      let text = '';
+      while (index === 0) {
+        text += '<';
+        html = html.substring(1);
+        index = html.indexOf('<');
+      }
+      text += index < 0 ? html : html.substring(0, index);
+      html = index < 0 ? '' : html.substring(index);
+
+      if (handler.chars) handler.chars(text);
+    }
+
+    if (html === last) throw new Error(`Parse Error: ${html}`);
+    last = html;
+  }
+
+  // Clean up any remaining tags
+  parseEndTag();
+}
+
+export default HTMLParser;
diff --git a/components/parse/libs/wxDiscode.js b/components/parse/libs/wxDiscode.js
new file mode 100644
index 0000000..285343f
--- /dev/null
+++ b/components/parse/libs/wxDiscode.js
@@ -0,0 +1,214 @@
+// HTML 支持的数学符号
+function strNumDiscode(str) {
+str = str.replace(/&forall;|&#8704;|&#x2200;/g, '∀');
+str = str.replace(/&part;|&#8706;|&#x2202;/g, '∂');
+str = str.replace(/&exist;|&#8707;|&#x2203;/g, '∃');
+str = str.replace(/&empty;|&#8709;|&#x2205;/g, '∅');
+str = str.replace(/&nabla;|&#8711;|&#x2207;/g, '∇');
+str = str.replace(/&isin;|&#8712;|&#x2208;/g, '∈');
+str = str.replace(/&notin;|&#8713;|&#x2209;/g, '∉');
+str = str.replace(/&ni;|&#8715;|&#x220b;/g, '∋');
+str = str.replace(/&prod;|&#8719;|&#x220f;/g, '∏');
+str = str.replace(/&sum;|&#8721;|&#x2211;/g, '∑');
+str = str.replace(/&minus;|&#8722;|&#x2212;/g, '−');
+str = str.replace(/&lowast;|&#8727;|&#x2217;/g, '∗');
+str = str.replace(/&radic;|&#8730;|&#x221a;/g, '√');
+str = str.replace(/&prop;|&#8733;|&#x221d;/g, '∝');
+str = str.replace(/&infin;|&#8734;|&#x221e;/g, '∞');
+str = str.replace(/&ang;|&#8736;|&#x2220;/g, '∠');
+str = str.replace(/&and;|&#8743;|&#x2227;/g, '∧');
+str = str.replace(/&or;|&#8744;|&#x2228;/g, '∨');
+str = str.replace(/&cap;|&#8745;|&#x2229;/g, '∩');
+str = str.replace(/&cup;|&#8746;|&#x222a;/g, '∪');
+str = str.replace(/&int;|&#8747;|&#x222b;/g, '∫');
+str = str.replace(/&there4;|&#8756;|&#x2234;/g, '∴');
+str = str.replace(/&sim;|&#8764;|&#x223c;/g, '∼');
+str = str.replace(/&cong;|&#8773;|&#x2245;/g, '≅');
+str = str.replace(/&asymp;|&#8776;|&#x2248;/g, '≈');
+str = str.replace(/&ne;|&#8800;|&#x2260;/g, '≠');
+str = str.replace(/&le;|&#8804;|&#x2264;/g, '≤');
+str = str.replace(/&ge;|&#8805;|&#x2265;/g, '≥');
+str = str.replace(/&sub;|&#8834;|&#x2282;/g, '⊂');
+str = str.replace(/&sup;|&#8835;|&#x2283;/g, '⊃');
+str = str.replace(/&nsub;|&#8836;|&#x2284;/g, '⊄');
+str = str.replace(/&sube;|&#8838;|&#x2286;/g, '⊆');
+str = str.replace(/&supe;|&#8839;|&#x2287;/g, '⊇');
+str = str.replace(/&oplus;|&#8853;|&#x2295;/g, '⊕');
+str = str.replace(/&otimes;|&#8855;|&#x2297;/g, '⊗');
+str = str.replace(/&perp;|&#8869;|&#x22a5;/g, '⊥');
+str = str.replace(/&sdot;|&#8901;|&#x22c5;/g, '⋅');
+return str;
+}
+
+// HTML 支持的希腊字母
+function strGreeceDiscode(str) {
+str = str.replace(/&Alpha;|&#913;|&#x391;/g, 'Α');
+str = str.replace(/&Beta;|&#914;|&#x392;/g, 'Β');
+str = str.replace(/&Gamma;|&#915;|&#x393;/g, 'Γ');
+str = str.replace(/&Delta;|&#916;|&#x394;/g, 'Δ');
+str = str.replace(/&Epsilon;|&#917;|&#x395;/g, 'Ε');
+str = str.replace(/&Zeta;|&#918;|&#x396;/g, 'Ζ');
+str = str.replace(/&Eta;|&#919;|&#x397;/g, 'Η');
+str = str.replace(/&Theta;|&#920;|&#x398;/g, 'Θ');
+str = str.replace(/&Iota;|&#921;|&#x399;/g, 'Ι');
+str = str.replace(/&Kappa;|&#922;|&#x39a;/g, 'Κ');
+str = str.replace(/&Lambda;|&#923;|&#x39b;/g, 'Λ');
+str = str.replace(/&Mu;|&#924;|&#x39c;/g, 'Μ');
+str = str.replace(/&Nu;|&#925;|&#x39d;/g, 'Ν');
+str = str.replace(/&Xi;|&#925;|&#x39d;/g, 'Ν');
+str = str.replace(/&Omicron;|&#927;|&#x39f;/g, 'Ο');
+str = str.replace(/&Pi;|&#928;|&#x3a0;/g, 'Π');
+str = str.replace(/&Rho;|&#929;|&#x3a1;/g, 'Ρ');
+str = str.replace(/&Sigma;|&#931;|&#x3a3;/g, 'Σ');
+str = str.replace(/&Tau;|&#932;|&#x3a4;/g, 'Τ');
+str = str.replace(/&Upsilon;|&#933;|&#x3a5;/g, 'Υ');
+str = str.replace(/&Phi;|&#934;|&#x3a6;/g, 'Φ');
+str = str.replace(/&Chi;|&#935;|&#x3a7;/g, 'Χ');
+str = str.replace(/&Psi;|&#936;|&#x3a8;/g, 'Ψ');
+str = str.replace(/&Omega;|&#937;|&#x3a9;/g, 'Ω');
+
+str = str.replace(/&alpha;|&#945;|&#x3b1;/g, 'α');
+str = str.replace(/&beta;|&#946;|&#x3b2;/g, 'β');
+str = str.replace(/&gamma;|&#947;|&#x3b3;/g, 'γ');
+str = str.replace(/&delta;|&#948;|&#x3b4;/g, 'δ');
+str = str.replace(/&epsilon;|&#949;|&#x3b5;/g, 'ε');
+str = str.replace(/&zeta;|&#950;|&#x3b6;/g, 'ζ');
+str = str.replace(/&eta;|&#951;|&#x3b7;/g, 'η');
+str = str.replace(/&theta;|&#952;|&#x3b8;/g, 'θ');
+str = str.replace(/&iota;|&#953;|&#x3b9;/g, 'ι');
+str = str.replace(/&kappa;|&#954;|&#x3ba;/g, 'κ');
+str = str.replace(/&lambda;|&#955;|&#x3bb;/g, 'λ');
+str = str.replace(/&mu;|&#956;|&#x3bc;/g, 'μ');
+str = str.replace(/&nu;|&#957;|&#x3bd;/g, 'ν');
+str = str.replace(/&xi;|&#958;|&#x3be;/g, 'ξ');
+str = str.replace(/&omicron;|&#959;|&#x3bf;/g, 'ο');
+str = str.replace(/&pi;|&#960;|&#x3c0;/g, 'π');
+str = str.replace(/&rho;|&#961;|&#x3c1;/g, 'ρ');
+str = str.replace(/&sigmaf;|&#962;|&#x3c2;/g, 'ς');
+str = str.replace(/&sigma;|&#963;|&#x3c3;/g, 'σ');
+str = str.replace(/&tau;|&#964;|&#x3c4;/g, 'τ');
+str = str.replace(/&upsilon;|&#965;|&#x3c5;/g, 'υ');
+str = str.replace(/&phi;|&#966;|&#x3c6;/g, 'φ');
+str = str.replace(/&chi;|&#967;|&#x3c7;/g, 'χ');
+str = str.replace(/&psi;|&#968;|&#x3c8;/g, 'ψ');
+str = str.replace(/&omega;|&#969;|&#x3c9;/g, 'ω');
+str = str.replace(/&thetasym;|&#977;|&#x3d1;/g, 'ϑ');
+str = str.replace(/&upsih;|&#978;|&#x3d2;/g, 'ϒ');
+str = str.replace(/&piv;|&#982;|&#x3d6;/g, 'ϖ');
+str = str.replace(/&middot;|&#183;|&#xb7;/g, '·');
+return str;
+}
+
+function strcharacterDiscode(str) {
+// 加入常用解析
+
+str = str.replace(/&nbsp;|&#32;|&#x20;/g, " ");
+str = str.replace(/&ensp;|&#8194;|&#x2002;/g, '&ensp;');
+str = str.replace(/&emsp;|&#8195;|&#x2003;/g, '&emsp;');
+str = str.replace(/&quot;|&#34;|&#x22;/g, "\"");
+str = str.replace(/&apos;|&#39;|&#x27;/g, "&apos;");
+str = str.replace(/&acute;|&#180;|&#xB4;/g, "´");
+str = str.replace(/&times;|&#215;|&#xD7;/g, "×");
+str = str.replace(/&divide;|&#247;|&#xF7;/g, "÷");
+str = str.replace(/&amp;|&#38;|&#x26;/g, '&amp;');
+str = str.replace(/&lt;|&#60;|&#x3c;/g, '&lt;');
+str = str.replace(/&gt;|&#62;|&#x3e;/g, '&gt;');
+
+
+
+
+str = str.replace(/&quot;|&#34;|&#x22;/g, "\"");
+str = str.replace(/&quot;|&#39;|&#x27;/g, "'");
+str = str.replace(/&acute;|&#180;|&#xB4;/g, "´");
+str = str.replace(/&times;|&#215;|&#xD7;/g, "×");
+str = str.replace(/&divide;|&#247;|&#xF7;/g, "÷");
+str = str.replace(/&amp;|&#38;|&#x26;/g, '&');
+str = str.replace(/&lt;|&#60;|&#x3c;/g, '<');
+str = str.replace(/&gt;|&#62;|&#x3e;/g, '>');
+return str;
+}
+
+// HTML 支持的其他实体
+function strOtherDiscode(str) {
+str = str.replace(/&OElig;|&#338;|&#x152;/g, 'Œ');
+str = str.replace(/&oelig;|&#339;|&#x153;/g, 'œ');
+str = str.replace(/&Scaron;|&#352;|&#x160;/g, 'Š');
+str = str.replace(/&scaron;|&#353;|&#x161;/g, 'š');
+str = str.replace(/&Yuml;|&#376;|&#x178;/g, 'Ÿ');
+str = str.replace(/&fnof;|&#402;|&#x192;/g, 'ƒ');
+str = str.replace(/&circ;|&#710;|&#x2c6;/g, 'ˆ');
+str = str.replace(/&tilde;|&#732;|&#x2dc;/g, '˜');
+str = str.replace(/&ndash;|&#8211;|&#x2013;/g, '–');
+str = str.replace(/&mdash;|&#8212;|&#x2014;/g, '—');
+str = str.replace(/&lsquo;|&#8216;|&#x2018;/g, '‘');
+str = str.replace(/&rsquo;|&#8217;|&#x2019;/g, '’');
+str = str.replace(/&sbquo;|&#8218;|&#x201a;/g, '‚');
+str = str.replace(/&ldquo;|&#8220;|&#x201c;/g, '“');
+str = str.replace(/&rdquo;|&#8221;|&#x201d;/g, '”');
+str = str.replace(/&bdquo;|&#8222;|&#x201e;/g, '„');
+str = str.replace(/&dagger;|&#8224;|&#x2020;/g, '†');
+str = str.replace(/&Dagger;|&#8225;|&#x2021;/g, '‡');
+str = str.replace(/&bull;|&#8226;|&#x2022;/g, '•');
+str = str.replace(/&hellip;|&#8230;|&#x2026;/g, '…');
+str = str.replace(/&permil;|&#8240;|&#x2030;/g, '‰');
+str = str.replace(/&prime;|&#8242;|&#x2032;/g, '′');
+str = str.replace(/&Prime;|&#8243;|&#x2033;/g, '″');
+str = str.replace(/&lsaquo;|&#8249;|&#x2039;/g, '‹');
+str = str.replace(/&rsaquo;|&#8250;|&#x203a;/g, '›');
+str = str.replace(/&oline;|&#8254;|&#x203e;/g, '‾');
+str = str.replace(/&euro;|&#8364;|&#x20ac;/g, '€');
+str = str.replace(/&trade;|&#8482;|&#x2122;/g, '™');
+str = str.replace(/&larr;|&#8592;|&#x2190;/g, '←');
+str = str.replace(/&uarr;|&#8593;|&#x2191;/g, '↑');
+str = str.replace(/&rarr;|&#8594;|&#x2192;/g, '→');
+str = str.replace(/&darr;|&#8595;|&#x2193;/g, '↓');
+str = str.replace(/&harr;|&#8596;|&#x2194;/g, '↔');
+str = str.replace(/&crarr;|&#8629;|&#x21b5;/g, '↵');
+str = str.replace(/&lceil;|&#8968;|&#x2308;/g, '⌈');
+str = str.replace(/&rceil;|&#8969;|&#x2309;/g, '⌉');
+str = str.replace(/&lfloor;|&#8970;|&#x230a;/g, '⌊');
+str = str.replace(/&rfloor;|&#8971;|&#x230b;/g, '⌋');
+str = str.replace(/&loz;|&#9674;|&#x25ca;/g, '◊');
+str = str.replace(/&spades;|&#9824;|&#x2660;/g, '♠');
+str = str.replace(/&clubs;|&#9827;|&#x2663;/g, '♣');
+str = str.replace(/&hearts;|&#9829;|&#x2665;/g, '♥');
+str = str.replace(/&diams;|&#9830;|&#x2666;/g, '♦');
+return str;
+}
+
+function strDiscode(str) {
+  str = strNumDiscode(str);
+  str = strGreeceDiscode(str);
+  str = strcharacterDiscode(str);
+  str = strOtherDiscode(str);
+  return str;
+}
+
+function strDiscode2(str) {
+	str = str.replace(/&#12288;|&#x3000;/g, '<span class=\'spaceshow\'>　</span>');
+	str = str.replace(/&nbsp;|&#32;|&#x20;/g, "<span class='spaceshow'>&nbsp;</span>");
+	str = str.replace(/&ensp;|&#8194;|&#x2002;/g, '<span class=\'spaceshow\'>&nbsp;</span>');
+	str = str.replace(/&#12288;|&#x3000;/g, '<span class=\'spaceshow\'>　</span>');
+	str = str.replace(/&emsp;|&#8195;|&#x2003;/g, '<span class=\'spaceshow\'>&nbsp;</span>');
+	str = str.replace(/&thinsp;|$#8201;|&#x2009;/g, '<span class=\'spaceshow\'>&nbsp;</span>');
+	str = str.replace(/&zwnj;|&#8204;|&#x200C;/g, '<span class=\'spaceshow\'>‌</span>');
+	str = str.replace(/&zwj;|$#8205;|&#x200D;/g, '<span class=\'spaceshow\'>‍</span>');
+	str = str.replace(/&lrm;|$#8206;|&#x200E;/g, '<span class=\'spaceshow\'>‎</span>');
+	str = str.replace(/&rlm;|&#8207;|&#x200F;/g, '<span class=\'spaceshow\'>‏</span>');
+  return str;
+}
+
+function urlToHttpUrl(url, domain) {
+  if (/^\/\//.test(url)) {
+    return `https:${url}`;
+  } else if (/^\//.test(url)) {
+    return `https://${domain}${url}`;
+  }
+  return url;
+}
+
+export default {
+  strDiscode,
+  strDiscode2,
+  urlToHttpUrl,
+};
diff --git a/components/parse/parse.css b/components/parse/parse.css
new file mode 100644
index 0000000..238eea6
--- /dev/null
+++ b/components/parse/parse.css
@@ -0,0 +1,258 @@
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *         垂直微信小程序开发交流社区
+ *
+ * github地址: https://github.com/icindy/wxParse
+ *
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+/**
+ * 请在全局下引入该文件，@import 'https://dev.lansoft.shop/static/img/static/wxParse.css';
+ */
+.wxParse {
+	user-select:none;
+	width: 100%;
+	font-family: Helvetica, "PingFangSC", 'Microsoft Yahei', '微软雅黑', Arial, sans-serif;
+	color: #333;
+	line-height: 1.5;
+	font-size: 1em;
+	text-align:justify;/* //左右两端对齐 */
+}
+.wxParse view ,.wxParse uni-view{
+	word-break: break-word;
+}
+.wxParse .p {
+	padding-bottom: 0.5em;
+	clear: both;
+	/* letter-spacing: 0;//字间距 */
+}
+.wxParse .inline {
+  display: inline;
+  margin: 0;
+  padding: 0;
+}
+
+.wxParse .div {
+  margin: 0;
+  padding: 0;
+  display: block;
+}
+
+.wxParse .h1{
+  font-size: 2em;
+  line-height: 1.2em;
+  margin: 0.67em 0;
+}
+.wxParse .h2{
+  font-size: 1.5em;
+  margin: 0.83em 0;
+}
+.wxParse .h3{
+  font-size: 1.17em;
+  margin: 1em 0;
+}
+.wxParse .h4{
+  margin: 1.33em 0;
+}
+.wxParse .h5{
+  font-size: 0.83em;
+  margin: 1.67em 0;
+}
+.wxParse .h6{
+  font-size: 0.83em;
+  margin: 1.67em 0;
+}
+
+.wxParse .h1,
+.wxParse .h2,
+.wxParse .h3,
+.wxParse .h4,
+.wxParse .h5,
+.wxParse .h6,
+.wxParse .b,
+.wxParse .strong{
+  font-weight: bolder;
+}
+
+.wxParse .i,
+.wxParse .cite,
+.wxParse .em,
+.wxParse .var,
+.wxParse .address {
+  font-style: italic;
+}
+.wxParse .spaceshow{
+	  white-space: pre;
+}
+.wxParse .pre,
+.wxParse .tt,
+.wxParse .code,
+.wxParse .kbd,
+.wxParse .samp {
+  font-family: monospace;
+}
+.wxParse .pre {
+  overflow: auto;
+  background: #f5f5f5;
+  padding: 16upx;
+  white-space: pre;
+  margin: 1em 0upx;
+  font-size: 24upx;
+}
+.wxParse .code {
+	overflow: auto;
+	padding: 16upx;
+	white-space: pre;
+	margin: 1em 0upx;
+	background: #f5f5f5;
+	font-size: 24upx;
+}
+
+.wxParse .big {
+  font-size: 1.17em;
+}
+
+.wxParse .small,
+.wxParse .sub,
+.wxParse .sup {
+  font-size: 0.83em;
+}
+
+.wxParse .sub {
+  vertical-align: sub;
+}
+.wxParse .sup {
+  vertical-align: super;
+}
+
+.wxParse .s,
+.wxParse .strike,
+.wxParse .del {
+  text-decoration: line-through;
+}
+
+.wxParse .strong,
+.wxParse .text,
+.wxParse .span,
+.wxParse .s {
+  display: inline;
+}
+
+.wxParse .a {
+  color: deepskyblue;
+}
+
+.wxParse .video {
+  text-align: center;
+  margin: 22upx 0;
+}
+
+.wxParse .video-video {
+  width: 100%;
+}
+.wxParse .uni-image{
+	max-width: 100%;
+}
+.wxParse .img {
+  display: block;
+  max-width: 100%;
+  margin-bottom: 0em;/* //与p标签底部padding同时修改 */
+  overflow: hidden;
+}
+
+.wxParse .blockquote {
+  margin: 10upx 0;
+  padding: 22upx 0 22upx 22upx;
+  font-family: Courier, Calibri, "宋体";
+  background: #f5f5f5;
+  border-left: 6upx solid #dbdbdb;
+}
+.wxParse .blockquote .p {
+  margin: 0;
+}
+.wxParse .ul, .wxParse .ol {
+  display: block;
+  margin: 1em 0;
+  padding-left: 2em;
+}
+.wxParse .ol {
+  list-style-type: disc;
+}
+.wxParse .ol {
+  list-style-type: decimal;
+}
+.wxParse .ol>weixin-parse-template,.wxParse .ul>weixin-parse-template {
+  display: list-item;
+  align-items: baseline;
+  text-align: match-parent;
+}
+
+.wxParse .ol>.li,.wxParse .ul>.li {
+  display: list-item;
+  align-items: baseline;
+  text-align: match-parent;
+}
+.wxParse .ul .ul, .wxParse .ol .ul {
+  list-style-type: circle;
+}
+.wxParse .ol .ol .ul, .wxParse .ol .ul .ul, .wxParse .ul .ol .ul, .wxParse .ul .ul .ul {
+    list-style-type: square;
+}
+
+.wxParse .u {
+  text-decoration: underline;
+}
+.wxParse .hide {
+  display: none;
+}
+.wxParse .del {
+  display: inline;
+}
+.wxParse .figure {
+  overflow: hidden;
+}
+.wxParse .tablebox{
+	overflow: auto;
+	background-color: #f5f5f5;
+	background: #f5f5f5;
+	font-size: 13px;
+	padding: 8px;
+}
+.wxParse .table .table,.wxParse .table{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	/* 内边框 */
+	/* width: 100%; */
+	overflow: auto;
+	white-space: pre;
+}
+.wxParse .tbody{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	/* 内边框 */
+	border: 1px solid #dadada;
+}
+.wxParse .table  .thead, .wxParse  .table .tfoot, .wxParse  .table .th{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	background: #ececec;
+	font-weight: 40;
+}
+.wxParse  .table .tr {
+	border-collapse:collapse;
+	box-sizing: border-box;
+	/* border: 2px solid #F0AD4E; */
+	overflow:auto;
+}
+.wxParse  .table .th,
+.wxParse  .table .td{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	border: 2upx solid #dadada;
+	overflow:auto;
+}
+.wxParse .audio, .wxParse .uni-audio-default{
+	display: block;
+}
\ No newline at end of file
diff --git a/components/parse/parse.vue b/components/parse/parse.vue
new file mode 100644
index 0000000..38adc4f
--- /dev/null
+++ b/components/parse/parse.vue
@@ -0,0 +1,237 @@
+<!--**
+ * forked from：https://github.com/F-loat/mpvue-wxParse
+ *
+ * github地址: https://github.com/dcloudio/uParse
+ *
+ * for: uni-app框架下 富文本解析
+ * 
+ * 优化 by zhiqiang.feng@qq.com
+ */-->
+
+<template>
+	
+	<!--基础元素-->
+	<view class="wxParse" :class="className" :style="'user-select:' + userSelect">
+		<block v-for="(node, index) of nodes" :key="index" v-if="!loading">
+			<wxParseTemplate :node="node" />
+		</block>
+	</view>
+</template>
+
+<script>
+import HtmlToJson from './libs/html2json';
+import wxParseTemplate from './components/wxParseTemplate0';
+
+	export default {
+		name: 'wxParse',
+		props: {
+			// user-select:none;
+			userSelect: {
+				type: String,
+				default: 'text' //none |text| all | element
+			},
+			imgOptions: {
+				type: [Object, Boolean],
+				default: function() {
+					return {
+						loop: false,
+						indicator: 'number',
+						longPressActions: false
+						// longPressActions: {
+						// 	 itemList: ['发送给朋友', '保存图片', '收藏'],
+						// 		success: function (res) {
+						// 			console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						// 		},
+						// 		fail: function (res) {
+						// 			console.log(res.errMsg);
+						// 		}    
+						// 	}
+						// }
+					}
+				}
+			},
+			loading: {
+				type: Boolean,
+				default: false
+			},
+			className: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			noData: {
+				type: String,
+				default: ''
+			},
+			startHandler: {
+				type: Function,
+				default () {
+					return node => {
+						node.attr.class = null;
+						node.attr.style = null;
+					};
+				}
+			},
+			endHandler: {
+				type: Function,
+				default() {
+					return node => {
+						node = node
+					};
+				}
+			},
+			charsHandler: {
+				type: Function,
+				default() {
+					return node => {
+						node = node
+					};
+				}
+			},
+			imageProp: {
+				type: Object,
+				default () {
+					return {
+						mode: 'aspectFit',
+						padding: 0,
+						lazyLoad: false,
+						domain: ''
+					};
+				}
+			}
+		},
+		components: {
+			wxParseTemplate
+		},
+		data() {
+			return {
+				nodes: {},
+				imageUrls: [],
+				wxParseWidth: {
+					value: 0
+				}
+			};
+		},
+		computed: {},
+		mounted() {
+			this.setHtml()
+		},
+		methods: {
+			setHtml() {
+				this.getWidth().then((data) => {
+					this.wxParseWidth.value = data;
+				})
+				let {
+					content,
+					noData,
+					imageProp,
+					startHandler,
+					endHandler,
+					charsHandler
+				} = this;
+				let parseData = content || noData;
+				let customHandler = {
+					start: startHandler,
+					end: endHandler,
+					chars: charsHandler
+				};
+				let results = HtmlToJson(parseData, customHandler, imageProp, this);
+
+				this.imageUrls = results.imageUrls;
+				// this.nodes = results.nodes;
+				
+				this.nodes = [];
+				results.nodes.forEach((item) => {
+					setTimeout(() => {
+						if(item.node){
+							this.nodes.push(item)
+						}
+					}, 0);
+				})
+				
+			},
+			getWidth() {
+				return new Promise((res, rej) => {
+					// #ifndef MP-ALIPAY || MP-BAIDU
+					uni.createSelectorQuery()
+						.in(this)
+						.select('.wxParse')
+						.fields({
+								size: true,
+								scrollOffset: true
+							},
+							data => {
+								res(data.width);
+							}
+						).exec();
+					// #endif
+					// #ifdef MP-BAIDU
+					const query = swan.createSelectorQuery();
+					query.select('.wxParse').boundingClientRect();
+					query.exec(obj => {
+						const rect = obj[0]
+						if (rect) {
+							res(rect.width);
+						}
+					});
+					// #endif
+					// #ifdef MP-ALIPAY
+					my.createSelectorQuery()
+						.select('.wxParse')
+						.boundingClientRect().exec((ret) => {
+							res(ret[0].width);
+						});
+					// #endif
+				});
+			},
+			navigate(href, $event, attr) {
+				console.log(href, attr);
+				this.$emit('navigate', href, $event);
+			},
+			preview(src, $event) {
+				if (!this.imageUrls.length || typeof this.imgOptions === 'boolean') {
+
+				} else {
+					uni.previewImage({
+						current: src,
+						urls: this.imageUrls,
+						loop: this.imgOptions.loop,
+						indicator: this.imgOptions.indicator,
+						longPressActions: this.imgOptions.longPressActions
+					});
+				}
+				this.$emit('preview', src, $event);
+			},
+			removeImageUrl(src) {
+				const {
+					imageUrls
+				} = this;
+				imageUrls.splice(imageUrls.indexOf(src), 1);
+			}
+		},
+		// 父组件中提供
+		provide() {
+			return {
+				parseWidth: this.wxParseWidth,
+				parseSelect: this.userSelect
+				// 提示：provide 和 inject 绑定并不是可响应的。这是刻意为之的。然而，如果你传入了一个可监听的对象，那么其对象的属性还是可响应的。
+			};
+		},
+		watch: {
+			content(val){
+				this.setHtml()
+			}
+			// content: {
+			// 	handler: function(newVal, oldVal) {
+			// 		if (newVal !== oldVal) {
+			// 			
+			// 		}
+			// 	},
+			// 	deep: true
+			// }
+		}
+	};
+</script>
diff --git a/components/popmsg/popmsg.vue b/components/popmsg/popmsg.vue
new file mode 100644
index 0000000..cf77a6e
--- /dev/null
+++ b/components/popmsg/popmsg.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="popmsg" :class="popmsg==1?'popmsg-show':(popmsg==2?'popmsg-hide':'')" @tap="gotourl" :data-url="tourl">
+		<image class="popmsg-pic flex0" :src="logo" v-if="logo"/>
+		<view class="popmsg-content">
+			<view class="popmsg-content-title">{{title}}</view>
+			<view class="popmsg-content-desc" v-if="desc">{{desc}}</view>
+		</view>
+		<view class="popmsg-close" @tap.stop="close"><image :src="event_rul +'/static/img/static/img/close2.png'" class="popmsg-close-img"/></view>
+	</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		props: {
+			//popmsg:{default:false},
+			//popdata:{default:{}},
+			//duration: {type: Number,default: 3000}
+		},
+		data() {
+			return {
+				popmsg:0,
+				logo:'',
+				title:'',
+				desc:'',
+				tourl:'',
+				duration:0,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		methods: {
+			open(data) {
+				console.log(data);
+				if(data.type=='tokefu'){
+					this.logo = data.data.headimg;
+					this.title = data.data.nickname+' 发来消息';
+					this.desc = data.data.content;
+					this.tourl = '/admin/kefu/message?mid='+data.data.mid;
+				}else if(data.type=='tokehu'){
+					this.logo = data.data.uheadimg;
+					this.title = data.data.unickname+' 发来消息';
+					this.desc = data.data.content;
+					this.tourl = '/pages/kefu/index?bid='+data.data.bid;
+				}else if(data.type=='peisong'){
+					this.logo = '';
+					this.title = data.data.title;
+					this.desc = data.data.desc;
+					if(data.data.type==1){
+						this.tourl = '/activity/peisong/orderlist';
+					}else{
+						this.tourl = '/activity/peisong/dating';
+					}
+				}else{
+					this.logo = '';
+					this.title = data.data.title;
+					this.desc = data.data.desc;
+					this.tourl = data.data.url;
+				}
+				this.popmsg = 1;
+				const innerAudioContext = uni.createInnerAudioContext();
+				innerAudioContext.autoplay = true;
+				innerAudioContext.src = this.event_rul +'/static/img/static/img/default.mp3';
+				innerAudioContext.onPlay(() => {
+					console.log('开始播放');
+				});
+
+
+				if (this.duration === 0) return
+				clearTimeout(this.popuptimer)
+				this.popuptimer = setTimeout(() => {
+					this.close();
+				}, this.duration);
+			},
+			close() {
+				this.popmsg = 2;
+				clearTimeout(this.popuptimer)
+			},
+			gotourl(e){
+				this.close();
+				this.goto(e);
+			}
+		}
+	}
+</script>
+<style>
+.popmsg{width: 100%;height:100rpx;background:rgba(0,0,0,0.7);position: fixed;z-index:12;color:#fff;font-size:28rpx;top:-100rpx;text-align: left;padding:15rpx 20rpx;overflow:hidden;display:none}
+.popmsg-show{display:flex;top: 0rpx;animation: popmsg-show 0.2s;animation-timing-function:ease;}
+@keyframes popmsg-show{from {top:-100rpx;}to {top:0rpx;}}
+.popmsg-hide{top: -100rpx;animation: popmsg-hide 0.2s;animation-timing-function:ease;}
+@keyframes popmsg-hide{from {top:0rpx;}to {top:-100rpx;}}
+
+.popmsg-pic{width:70rpx;height:70rpx;border-radius:8rpx;margin-right:10rpx;}
+.popmsg-content{flex:1;display:flex;flex-direction:column;justify-content:center;overflow:hidden}
+.popmsg-content-title{height:40rpx;line-height:40rpx;font-weight:bold;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.popmsg-content-desc{color:#eee;height:30rpx;line-height:30rpx;font-size:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.popmsg-close{margin-top:6rpx;width:50rpx;height:50rpx;border-radius:50%;border:1px solid #aaa;display:flex;align-items:center;justify-content:center;opacity:0.7}
+.popmsg-close-img{width:22rpx;height:22rpx}
+</style>
\ No newline at end of file
diff --git a/components/scrolltop/scrolltop.vue b/components/scrolltop/scrolltop.vue
new file mode 100644
index 0000000..cf6f4c7
--- /dev/null
+++ b/components/scrolltop/scrolltop.vue
@@ -0,0 +1,30 @@
+<template>
+<view>
+	<view class="scrolltop" v-show="isshow" @tap="gotop"><image class="image" :src="event_rul + '/static/img/static/img/gotop.png'"/></view>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		props: {
+			isshow:{}
+		},
+		data() {
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		methods:{
+			gotop: function () {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration:100
+				});
+			}
+		}
+	}
+</script>
+<style>
+.scrolltop{position:fixed;bottom:160rpx;right:20rpx;width:60rpx;height:60rpx;background:rgba(0,0,0,0.4);color:#fff;border-radius:50%;padding:12rpx 10rpx 8rpx 10rpx;z-index:9;}
+.scrolltop .image{width:100%;height:100%;}
+</style>
\ No newline at end of file
diff --git a/components/shmily-drag-image/shmily-drag-image.vue b/components/shmily-drag-image/shmily-drag-image.vue
new file mode 100644
index 0000000..2ab1a9f
--- /dev/null
+++ b/components/shmily-drag-image/shmily-drag-image.vue
@@ -0,0 +1,447 @@
+<template>
+  <view class="con">
+    <movable-area class="area" :style="{ height: areaHeight }" @mouseenter="mouseenter" @mouseleave="mouseleave">
+      <block v-for="(item, index) in imageList" :key="item.id">
+        <movable-view
+          class="view"
+          :x="item.x"
+          :y="item.y"
+          direction="all"
+          :damping="40"
+          :disabled="item.disable"
+          @change="onChange($event, item)"
+          @touchstart="touchstart(item)"
+          @mousedown="touchstart(item)"
+          @touchend="touchend(item)"
+          @mouseup="touchend(item)"
+          :style="{ width: viewWidth + 'px', height: viewWidth + 'px', 'z-index': item.zIndex, opacity: item.opacity }"
+        >
+          <view class="area-con" :style="{ width: childWidth, height: childWidth, transform: 'scale(' + item.scale + ')' }">
+            <image class="pre-image bor-rads" :src="item.src" mode="aspectFill"></image>
+            <view class="del-con" @click="delImage(item, index)" @touchstart.stop="delImageMp(item, index)" @touchend.stop="nothing()" @mousedown.stop="nothing()" @mouseup.stop="nothing()">
+              <view class="del-wrap">
+                <image
+                  class="del-image"
+                  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC"
+                ></image>
+              </view>
+            </view>
+          </view>
+        </movable-view>
+      </block>
+      <view
+        class="add"
+        v-if="imageList.length < number"
+        :style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }"
+        @click="addImages"
+      >
+        <view class="add-wrap bor-rads" :style="{ width: childWidth, height: childWidth }">
+          <image
+            style="width: 54rpx;height: 54rpx;"
+            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA2CAYAAACMRWrdAAABIUlEQVRoQ+2a2w2DMAxFeQzWrsMUbadAsEw3S1CqVgppKwLX8BEOP4iHTXx8uUgWdVXoVhdaV0VhSmf7vr/H8V3XzY6V3P9iD+nYOI5P7/01LMI596AwoZV0TIBXIUWFXhKLFBWYSFGhhxQN6SFFQ5i4ogITKSr0cEVDekjRECauqMBEigq9U7piOk2yAti27SUe5ljlTfPEQ6KZecTvwl4P3ytvOv06R2HDMNzes7+6aRrvnHvtf50L13Lp50rx88zcvNlS3JpwKQ67XyK04nq2nFbk/LqVjin0TvmBNgQ2S4UUDcliHgpMpKjQwxUN6SFFQ5i4ogITKSr0cEVDekjRECauqMAsVoph+hVPtYr5+03p9tbYQ96xrYtT4ootbAJGVxxVTapVswAAAABJRU5ErkJggg=="
+          ></image>
+		  <text style="padding-top: 30rpx;color: #999;font-size: 24rpx;">添加照片</text>
+        </view>
+      </view>
+    </movable-area>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+      imageList: [],
+      width: 0,
+      add: {
+        x: 0,
+        y: 0
+      },
+      colsValue: 0,
+      viewWidth: 0,
+      tempItem: null,
+      timer: null,
+      changeStatus: true,
+      preStatus: true,
+    }
+  },
+  props: {
+    // 返回排序后图片
+    list: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    },
+    // 选择图片数量限制
+    number: {
+      type: Number,
+      default: 6
+    },
+    // 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx
+    imageWidth: {
+      type: Number,
+      default: 230
+    },
+    // 图片列数（cols > 0 则 imageWidth 无效）
+    cols: {
+      type: Number,
+      default: 0
+    },
+    // 图片周围空白填充，单位 rpx
+    padding: {
+      type: Number,
+      default: 10
+    },
+    // 拖动图片时放大倍数 [0, ∞)
+    scale: {
+      type: Number,
+      default: 1.1
+    },
+    // 拖动图片时不透明度
+    opacity: {
+      type: Number,
+      default: 0.7
+    },
+    // 自定义添加（需配合 @aaddImage 事件使用）
+    custom: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    areaHeight() {
+      if (this.imageList.length < this.number) {
+        return Math.ceil((this.imageList.length + 1) / this.colsValue) * this.viewWidth + 'px'
+      } else {
+        return Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+      }
+    },
+    childWidth() {
+      return this.viewWidth - this.rpx2px(this.padding) * 2 + 'px'
+    },
+  },
+  created() {
+    this.width = uni.getSystemInfoSync().windowWidth
+    this.viewWidth = this.rpx2px(this.imageWidth)
+  },
+  mounted() {
+    const query = uni.createSelectorQuery().in(this)
+    query.select('.area').boundingClientRect(data => {
+		if(data) {
+			this.colsValue = Math.floor(data.width / this.viewWidth)
+			if(this.cols > 0){
+			  this.colsValue = this.cols
+			  this.viewWidth = data.width / this.cols
+			}
+		}
+		for (let item of this.list) {
+			this.addProperties(item)
+		}
+    })
+    query.exec()
+  },
+  methods: {
+    onChange(e, item) {
+      if(!item) return
+      item.oldX = e.detail.x
+      item.oldY = e.detail.y
+      if (e.detail.source === 'touch') {
+        if(item.moveEnd){
+          item.offset = Math.sqrt(Math.pow(item.oldX - item.absX * this.viewWidth, 2) + Math.pow(item.oldY - item.absY * this.viewWidth, 2))
+        }
+        let x = Math.floor((e.detail.x + this.viewWidth / 2) / this.viewWidth)
+        if(x >= this.colsValue) return
+        let y = Math.floor((e.detail.y + this.viewWidth / 2) / this.viewWidth)
+        let index = this.colsValue * y + x
+        if (item.index != index && index < this.imageList.length) {
+          this.changeStatus = false
+          for (let obj of this.imageList) {
+            if (item.index > index && obj.index >= index && obj.index < item.index) {
+              this.change(obj, 1)
+            } else if (item.index < index && obj.index <= index && obj.index > item.index) {
+              this.change(obj, -1)
+            } else if(obj.id != item.id) {
+              obj.offset = 0
+              obj.x = obj.oldX
+              obj.y = obj.oldY
+              setTimeout(() => {
+                this.$nextTick(() => {
+                  obj.x = obj.absX * this.viewWidth
+                  obj.y = obj.absY * this.viewWidth
+                })
+              }, 0)
+            }
+          }
+          item.index = index
+          item.absX = x
+          item.absY = y
+          this.sortList()
+        }
+      }
+    },
+    change(obj, i){
+      obj.index += i
+      obj.offset = 0
+      obj.x = obj.oldX
+      obj.y = obj.oldY
+      obj.absX = obj.index % this.colsValue
+      obj.absY = Math.floor(obj.index / this.colsValue)
+      setTimeout(() => {
+        this.$nextTick(() => {
+          obj.x = obj.absX * this.viewWidth
+          obj.y = obj.absY * this.viewWidth
+        })
+      }, 0)
+    },
+    touchstart(item) {
+      this.imageList.forEach(v => {
+        v.zIndex = v.index + 9
+      })
+      item.zIndex = 99
+      item.moveEnd = true
+      this.tempItem = item
+      this.timer = setTimeout(() => {
+        item.scale = this.scale
+        item.opacity = this.opacity
+        clearTimeout(this.timer)
+        this.timer = null
+      }, 200)
+    },
+    touchend(item) {
+      this.previewImage(item)
+      item.scale = 1
+      item.opacity = 1
+      item.x = item.oldX
+      item.y = item.oldY
+      item.offset = 0
+      item.moveEnd = false
+      setTimeout(() => {
+        this.$nextTick(() => {
+          item.x = item.absX * this.viewWidth
+          item.y = item.absY * this.viewWidth
+          this.tempItem = null
+          this.changeStatus = true
+        })
+      }, 0)
+    },
+    previewImage(item){
+      if(this.timer && this.preStatus && this.changeStatus && item.offset < 28.28){
+        clearTimeout(this.timer)
+        this.timer = null
+        let src = this.list.findIndex(v => v === item.src)
+        uni.previewImage({
+          urls: this.list,
+          current: src,
+          success: () => {
+            this.preStatus = false
+            setTimeout(() => {
+              this.preStatus = true
+            }, 600)
+          }
+        })
+      } else if (this.timer){
+        clearTimeout(this.timer)
+        this.timer = null
+      }
+    },
+    mouseenter(){
+      //#ifdef H5
+      this.imageList.forEach(v => {
+        v.disable = false
+      })
+      //#endif
+      
+    },
+    mouseleave(){
+      //#ifdef H5
+      if(this.tempItem){
+        this.imageList.forEach(v => {
+          v.disable = true
+          v.zIndex = v.index + 9
+          v.offset = 0
+          v.moveEnd = false
+          if(v.id == this.tempItem.id){
+            if (this.timer){
+              clearTimeout(this.timer)
+              this.timer = null
+            }
+            v.scale = 1
+            v.opacity = 1
+            v.x = v.oldX
+            v.y = v.oldY
+            this.$nextTick(() => {
+              v.x = v.absX * this.viewWidth
+              v.y = v.absY * this.viewWidth
+              this.tempItem = null
+            })
+          }
+        })
+        this.changeStatus = true
+      }
+      //#endif
+    },
+    addImages() {
+      if(this.custom){
+        this.$emit('addImage')
+      } else {
+   //      let checkNumber = this.number - this.imageList.length
+   //      uni.chooseImage({
+   //        count: checkNumber,
+   //        sourceType: ['album', 'camera'],
+   //        success: res => {
+   //          let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res.tempFilePaths.length
+   //          for (let i = 0; i < count; i++) {
+   //            this.addProperties(res.tempFilePaths[i])
+   //          }
+			// this.$emit('changeImg',res)
+   //        }
+   //      })
+			let checkNumber = this.number - this.imageList.length
+		   app.chooseImage(urls => {
+			   let count = checkNumber <= urls.length ? checkNumber : urls.length
+			 for (let i = 0; i < count; i++) {
+			   this.addProperties(urls[i])
+			 }
+			this.$emit('changeImg',urls)
+		   },checkNumber)
+      }
+    },
+    addImage(image){
+      this.addProperties(image)
+    },
+    delImage(item, index){
+      this.imageList.splice(index, 1)
+      for (let obj of this.imageList) {
+        if (obj.index > item.index) {
+          obj.index -= 1
+          obj.x = obj.oldX
+          obj.y = obj.oldY
+          obj.absX = obj.index % this.colsValue
+          obj.absY = Math.floor(obj.index / this.colsValue)
+          this.$nextTick(() => {
+            obj.x = obj.absX * this.viewWidth
+            obj.y = obj.absY * this.viewWidth
+          })
+        }
+      }
+      this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+      this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+      this.sortList()
+    },
+    delImageMp(item, index){
+      //#ifdef MP
+      this.delImage(item, index)
+      //#endif
+    },
+    sortList() {
+      let list = this.imageList.slice()
+      list.sort((a, b) => {
+        return a.index - b.index
+      })
+      for (let i = 0; i < list.length; i++) {
+        list[i] = list[i].src
+      }
+      this.$emit('update:list', list)
+    },
+    addProperties(item){
+      let absX = this.imageList.length % this.colsValue
+      let absY = Math.floor(this.imageList.length / this.colsValue)
+      let x = absX * this.viewWidth
+      let y = absY * this.viewWidth
+      this.imageList.push({
+        src: item,
+        x,
+        y,
+        oldX: x,
+        oldY: y,
+        absX,
+        absY,
+        scale: 1,
+        zIndex: 9,
+        opacity: 1,
+        index: this.imageList.length,
+        id: this.guid(),
+        disable: false,
+        offset: 0,
+        moveEnd: false
+      })
+      this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+      this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+      this.sortList()
+    },
+    nothing(){},
+    rpx2px(v){
+      return this.width * v / 750
+    },
+    guid() {
+    	function S4() {
+    		return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+    	}
+    	return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.con {
+  padding: 30rpx;
+  .area {
+    width: 100%;
+    .view {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .area-con {
+        position: relative;
+        .pre-image {
+          width: 100%;
+          height: 100%;
+        }
+        .del-con {
+          position: absolute;
+          top: -10rpx;
+          right: -10rpx;
+          padding: 0 0 20rpx 20rpx;
+          .del-wrap {
+            width: 36rpx;
+            height: 36rpx;
+			background-color: #ccc;
+			border-radius: 50%;
+            // background-color: rgba(0, 0, 0, 0.4);
+            // border-radius: 0 0 0 10rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .del-image {
+              width: 20rpx;
+              height: 20rpx;
+            }
+          }
+        }
+      }
+    }
+    .add {
+      position: absolute;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .add-wrap{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+		display: flex;
+		flex-direction: column;
+		border: 2rpx solid #ccc;
+        // background-color: #eeeeee;
+      }
+    }
+  }
+  
+  .bor-rads {
+		border-radius: 12rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/components/u-clipboard/js_sdk/index.d.ts b/components/u-clipboard/js_sdk/index.d.ts
new file mode 100644
index 0000000..82776b4
--- /dev/null
+++ b/components/u-clipboard/js_sdk/index.d.ts
@@ -0,0 +1,12 @@
+/**
+ * 获取系统剪贴板内容
+ * @returns 剪贴板内容
+ */
+export declare function getClipboardData(): Promise<string>
+
+/**
+ * 设置系统剪贴板的内容
+ * @param data 需要设置的内容
+ * @returns 设置的内容
+ */
+export declare function setClipboardData(data: string): Promise<string>
diff --git a/components/u-clipboard/js_sdk/index.js b/components/u-clipboard/js_sdk/index.js
new file mode 100644
index 0000000..411917b
--- /dev/null
+++ b/components/u-clipboard/js_sdk/index.js
@@ -0,0 +1,54 @@
+/**
+ * 获取系统剪贴板内容
+ * @returns {Promise<string>} 剪贴板内容
+ */
+export function getClipboardData() {
+  return new Promise((success, fail) => {
+    // #ifndef H5
+    uni.getClipboardData({
+      success: ({ data }) => success(data),
+      fail
+    })
+    // #endif
+
+    // #ifdef H5
+    try {
+      navigator.clipboard.readText().then(success).catch(fail)
+    } catch (error) {
+      fail(error)
+    }
+    // #endif
+  })
+}
+
+/**
+ * 设置系统剪贴板的内容
+ * @param {string} data 需要设置的内容
+ * @returns {Promise<string>} 设置的内容
+ */
+export function setClipboardData(data) {
+  return new Promise((success, fail) => {
+    // #ifndef H5
+    uni.setClipboardData({ data, success, fail })
+    // #endif
+
+    // #ifdef H5
+    const textarea = document.createElement('textarea')
+    try {
+      textarea.value = data
+      textarea.readOnly = true
+      textarea.style.position = 'absolute'
+      textarea.style.left = '-100%'
+      document.body.appendChild(textarea)
+      textarea.select()
+      textarea.setSelectionRange(0, textarea.value.length)
+      document.execCommand('copy')
+      textarea.remove()
+      success(data)
+    } catch (error) {
+      textarea.remove()
+      fail(data)
+    }
+    // #endif
+  })
+}
diff --git a/components/u-clipboard/package.json b/components/u-clipboard/package.json
new file mode 100644
index 0000000..2437e2f
--- /dev/null
+++ b/components/u-clipboard/package.json
@@ -0,0 +1,74 @@
+{
+  "id": "u-clipboard",
+  "displayName": "剪贴板",
+  "version": "1.0.5",
+  "description": "剪贴板操作插件，全平台兼容，支持设置剪贴板的内容和获取剪贴板的内容",
+  "keywords": [
+    "clipboard",
+    "复制",
+    "粘贴",
+    "剪切"
+],
+  "repository": "https://github.com/ponjs/uni-clipboard",
+  "dcloudext": {
+    "category": [
+      "JS SDK",
+      "通用 SDK"
+    ],
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/uni-clipboard",
+    "sale": {
+        "regular": {
+            "price": "0.00"
+        },
+        "sourcecode": {
+            "price": "0.00"
+        }
+    },
+    "contact": {
+        "qq": ""
+    }
+  },
+  "uni_modules": {
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/components/uni-countdown/uni-countdown.vue b/components/uni-countdown/uni-countdown.vue
new file mode 100644
index 0000000..9258b54
--- /dev/null
+++ b/components/uni-countdown/uni-countdown.vue
@@ -0,0 +1,224 @@
+<template>
+	<view class="uni-countdown">
+		<text v-if="showDay" :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+			class="uni-countdown__number">{{ d }}</text>
+		<text v-if="showDay" :style="{ color: splitorColor }" class="uni-countdown__splitor">天</text>
+		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+			class="uni-countdown__number">{{ h }}</text>
+		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? ':' : '时' }}</text>
+		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+			class="uni-countdown__number">{{ i }}</text>
+		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? ':' : '分' }}</text>
+		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+			class="uni-countdown__number">{{ s }}</text>
+		<text v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor">秒</text>
+	</view>
+</template>
+<script>
+	/**
+	 * Countdown 倒计时
+	 * @description 倒计时组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=25
+	 * @property {String} backgroundColor 背景色
+	 * @property {String} color 文字颜色
+	 * @property {Number} day 天数
+	 * @property {Number} hour 小时
+	 * @property {Number} minute 分钟
+	 * @property {Number} second 秒
+	 * @property {Number} timestamp 时间戳
+	 * @property {Boolean} showDay = [true|false] 是否显示天数
+	 * @property {Boolean} showColon = [true|false] 是否以冒号为分隔符
+	 * @property {String} splitorColor 分割符号颜色
+	 * @event {Function} timeup 倒计时时间到触发事件
+	 * @example <uni-countdown :day="1" :hour="1" :minute="12" :second="40"></uni-countdown>
+	 */
+	export default {
+		name: 'UniCountdown',
+		props: {
+			showDay: {
+				type: Boolean,
+				default: true
+			},
+			showColon: {
+				type: Boolean,
+				default: true
+			},
+			start: {
+				type: Boolean,
+				default: true
+			},
+			backgroundColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			borderColor: {
+				type: String,
+				default: '#000000'
+			},
+			color: {
+				type: String,
+				default: '#000000'
+			},
+			splitorColor: {
+				type: String,
+				default: '#000000'
+			},
+			day: {
+				type: Number,
+				default: 0
+			},
+			hour: {
+				type: Number,
+				default: 0
+			},
+			minute: {
+				type: Number,
+				default: 0
+			},
+			second: {
+				type: Number,
+				default: 0
+			},
+			timestamp: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				timer: null,
+				syncFlag: false,
+				d: '00',
+				h: '00',
+				i: '00',
+				s: '00',
+				leftTime: 0,
+				seconds: 0
+			}
+		},
+		watch: {
+			day(val) {
+				this.changeFlag()
+			},
+			hour(val) {
+				this.changeFlag()
+			},
+			minute(val) {
+				this.changeFlag()
+			},
+			second(val) {
+				this.changeFlag()
+			},
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.startData();
+					} else {
+						if (!oldVal) return
+						clearInterval(this.timer)
+					}
+				}
+
+			}
+		},
+		created: function(e) {
+			this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+			this.countDown()
+		},
+		beforeDestroy() {
+			clearInterval(this.timer)
+		},
+		methods: {
+			toSeconds(timestamp, day, hours, minutes, seconds) {
+				if (timestamp) {
+					return timestamp - parseInt(new Date().getTime() / 1000, 10)
+				}
+				return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds
+			},
+			timeUp() {
+				clearInterval(this.timer)
+				this.$emit('timeup')
+			},
+			countDown() {
+				let seconds = this.seconds
+				let [day, hour, minute, second] = [0, 0, 0, 0]
+				if (seconds > 0) {
+					day = Math.floor(seconds / (60 * 60 * 24))
+					hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+					minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+					second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+				} else {
+					this.timeUp()
+				}
+				if (day < 10) {
+					day = '0' + day
+				}
+				if (hour < 10) {
+					hour = '0' + hour
+				}
+				if (minute < 10) {
+					minute = '0' + minute
+				}
+				if (second < 10) {
+					second = '0' + second
+				}
+				this.d = day
+				this.h = hour
+				this.i = minute
+				this.s = second
+			},
+			startData() {
+				this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+				if (this.seconds <= 0) {
+					return
+				}
+				clearInterval(this.timer)
+				this.countDown()
+				this.timer = setInterval(() => {
+					this.seconds--
+					if (this.seconds < 0) {
+						this.timeUp()
+						return
+					}
+					this.countDown()
+				}, 1000)
+			},
+			changeFlag() {
+				if (!this.syncFlag) {
+					this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+					this.startData();
+					this.syncFlag = true;
+				}
+			}
+		}
+	}
+</script>
+<style>
+	.uni-countdown {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		padding: 2rpx 0;
+	}
+
+	.uni-countdown__splitor {
+		display: flex;
+		justify-content: center;
+		line-height: 40rpx;
+		padding: 5rpx;
+		font-size: 24rpx;
+	}
+
+	.uni-countdown__number {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 44rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		margin: 5rpx;
+		text-align: center;
+		font-size: 24rpx;
+	}
+</style>
diff --git a/components/uni-data-picker/config.json b/components/uni-data-picker/config.json
new file mode 100644
index 0000000..dc6b403
--- /dev/null
+++ b/components/uni-data-picker/config.json
@@ -0,0 +1,12 @@
+{
+	"id": "3796",
+	"name": "DataPicker",
+	"desc": "数据驱动的picker选择器",
+	"url": "data-picker",
+	"type": "表单组件",
+	"edition": "0.0.8",
+	"suffix": "vue",
+	"module": ["uni-data-picker","uni-data-pickerview","uni-load-more"],
+	"path": "https://ext.dcloud.net.cn/plugin?id=3796",
+	"update_log": ["- 优化 增加下拉箭头"]
+}
diff --git a/components/uni-data-picker/keypress.js b/components/uni-data-picker/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/components/uni-data-picker/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/components/uni-data-picker/uni-data-picker.vue b/components/uni-data-picker/uni-data-picker.vue
new file mode 100644
index 0000000..8ada3ad
--- /dev/null
+++ b/components/uni-data-picker/uni-data-picker.vue
@@ -0,0 +1,459 @@
+<template>
+	<view class="uni-data-tree" :style="styleData">
+		<view class="uni-data-tree-input" @click="handleInput">
+			<slot :options="options" :data="inputSelected" :error="errorMessage">
+				<view class="input-value" :class="{'input-value-border': border}">
+					<text v-if="errorMessage" class="selected-area error-text">{{errorMessage}}</text>
+					<view v-else-if="loading && !isOpened" class="selected-area">
+						<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+					</view>
+					<scroll-view v-else-if="inputSelected.length" class="selected-area" scroll-x="true">
+						<view class="selected-list">
+							<view class="selected-item" v-for="(item,index) in inputSelected" :key="index">
+								<text>{{item.text}}</text><text v-if="index<inputSelected.length-1" class="input-split-line">{{split}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<text v-else class="selected-area placeholder">{{placeholder}}</text>
+					<view class="arrow-area" v-if="!readonly && border">
+						<view class="input-arrow"></view>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
+		<view class="uni-data-tree-dialog" v-if="isOpened">
+			<view class="dialog-caption">
+				<view class="title-area">
+					<text class="dialog-title">{{popupTitle}}</text>
+				</view>
+				<view class="dialog-close" @click="handleClose">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<data-picker-view class="picker-view" ref="pickerView" v-model="value" :localdata="localdata" :preload="preload"
+			 :collection="collection" :field="field" :orderby="orderby" :where="where" :step-searh="stepSearh" :self-field="selfField"
+			 :parent-field="parentField" :managed-mode="true" @change="onchange" @datachange="ondatachange"></data-picker-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dataPicker from "../uni-data-pickerview/uni-data-picker.js"
+	import DataPickerView from "../uni-data-pickerview/uni-data-pickerview.vue"
+
+	/**
+	 * uni-data-picker
+	 * @description uni-data-picker
+	 * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-data-picker
+	 * @property {String} popup-title 弹出窗口标题
+	 * @property {Array} localdata 本地数据，参考
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} readonly = [true|false] 是否仅读
+	 * @property {Boolean} preload = [true|false] 是否预加载数据
+	 * @value true 开启预加载数据，点击弹出窗口后显示已加载数据
+	 * @value false 关闭预加载数据，点击弹出窗口后开始加载数据
+	 * @property {Boolean} step-searh = [true|false] 是否分布查询
+	 * @value true 启用分布查询，仅查询当前选中节点
+	 * @value false 关闭分布查询，一次查询出所有数据
+	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
+	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
+	 * @property {String|DBCollectionString} collection 表名
+	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+	 * @property {String} orderby 排序字段及正序倒叙设置
+	 * @property {String|JQLString} where 查询条件
+	 * @event {Function} onpopupshow 弹出的选择窗口打开时触发此事件
+	 * @event {Function} onpopuphide 弹出的选择窗口关闭时触发此事件
+	 */
+	export default {
+		name: 'UniDataPicker',
+		mixins: [dataPicker],
+		components: {
+			DataPickerView
+		},
+		props: {
+			options: {
+				type: [Object, Array],
+				default () {
+					return {}
+				}
+			},
+			popupTitle: {
+				type: String,
+				default: '请选择'
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			heightMobile: {
+				type: String,
+				default: ''
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			split: {
+				type: String,
+				default: '/'
+			},
+			styleData:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				isOpened: false,
+				inputSelected: []
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.readonly) {
+					this._processReadonly(this.localdata, this.value)
+					return
+				}
+
+				if (this.isLocaldata) {
+					this.loadData()
+					this.inputSelected = this.selected.slice(0)
+				} else if (this.value.length) {
+					this.getTreePath(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				}
+			},
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			show() {
+				this.isOpened = true
+				this.$nextTick(() => {
+					this.$refs.pickerView.updateData({
+						treeData: this._treeData,
+						selected: this.selected,
+						selectedIndex: this.selectedIndex
+					})
+				})
+			},
+			hide() {
+				this.isOpened = false
+			},
+			handleInput() {
+				if (this.readonly) {
+					return
+				}
+				this.show()
+			},
+			handleClose(e) {
+				this.hide()
+			},
+			ondatachange(e) {
+				this._treeData = this.$refs.pickerView._treeData
+			},
+			onchange(e) {
+				this.hide()
+				this.inputSelected = e
+				this._dispatchEvent(e)
+			},
+			_processReadonly(dataList, valueArray) {
+				var isTree = dataList.findIndex((item) => {
+					return item.children
+				})
+				if (isTree > -1) {
+					if (Array.isArray(valueArray)) {
+						let inputValue = valueArray[valueArray.length - 1]
+						if (typeof inputValue === 'object' && inputValue.value) {
+							inputValue = inputValue.value
+						}
+					}
+					this.inputSelected = this._findNodePath(inputValue, this.localdata)
+					return
+				}
+
+				let result = []
+				for (let i = 0; i < valueArray.length; i++) {
+					var value = valueArray[i]
+					var item = dataList.find((v) => {
+						return v.value == value
+					})
+					if (item) {
+						result.push(item)
+					}
+				}
+				if (result.length) {
+					this.inputSelected = result
+				}
+			},
+			_filterForArray(data, valueArray) {
+				var result = []
+				for (let i = 0; i < valueArray.length; i++) {
+					var value = valueArray[i]
+					var found = data.find((item) => {
+						return item.value == value
+					})
+					if (found) {
+						result.push(found)
+					}
+				}
+				return result
+			},
+			_dispatchEvent(selected) {
+				var value = new Array(selected.length)
+				for (var i = 0; i < selected.length; i++) {
+					value[i] = selected[i].value
+				}
+
+				if (this.formItem) {
+					const item = selected[selected.length - 1]
+					this.formItem.setValue(item.value)
+				}
+
+				this.$emit('change', {
+					detail: {
+						value: selected
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-data-tree {
+		position: relative;
+		font-size: 14px;
+	}
+
+	.error-text {
+		color: #DD524D;
+	}
+
+	.input-value {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: nowrap;
+		font-size: 14px;
+		line-height: 38px;
+		padding: 0 5px;
+		overflow: hidden;
+		/* #ifdef APP-NVUE */
+		height: 40px;
+		/* #endif */
+	}
+
+	.input-value-border {
+		border: 1px solid #e5e5e5;
+		border-radius: 5px;
+	}
+
+	.selected-area {
+		flex: 1;
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.load-more {
+		/* #ifdef APP-NVUE */
+		width: 40px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		margin-right: auto;
+		/* #endif */
+	}
+
+	.selected-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		padding: 0 5px;
+	}
+
+	.selected-item {
+		flex-direction: row;
+		padding: 0 1px;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	.placeholder {
+		color: grey;
+	}
+
+	.input-split-line {
+		opacity: .5;
+	}
+
+	.arrow-area {
+		position: relative;
+		width: 20px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		margin-left: auto;
+		/* #endif */
+		justify-content: center;
+		transform: rotate(-45deg);
+		transform-origin: center;
+	}
+
+	.input-arrow {
+		width: 7px;
+		height: 7px;
+		border-left: 1px solid #999;
+		border-bottom: 1px solid #999;
+	}
+
+	.uni-data-tree-cover {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .4);
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		z-index: 100;
+	}
+
+	.uni-data-tree-dialog {
+		position: fixed;
+		left: 0;
+		top: 20%;
+		right: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		z-index: 102;
+		overflow: hidden;
+		/* #ifdef APP-NVUE */
+		width: 750rpx;
+		/* #endif */
+	}
+
+	.dialog-caption {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-bottom: 1px solid #f0f0f0;
+	}
+
+	.title-area {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		margin: auto;
+		/* #endif */
+		align-items: center;
+		padding: 0 10px;
+	}
+
+	.dialog-title {
+		font-weight: bold;
+		line-height: 44px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 15px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #666;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.picker-view {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	/* #ifdef H5 */
+	@media all and (min-width: 768px) {
+		.uni-data-tree-cover {
+			background-color: transparent;
+		}
+
+		.uni-data-tree-dialog {
+			position: absolute;
+			top: 100%;
+			height: auto;
+			min-height: 400px;
+			max-height: 50vh;
+			background-color: #fff;
+			border-radius: 5px;
+			box-shadow: 0 0 20px 5px rgba(0, 0, 0, .3);
+		}
+
+		.dialog-caption {
+			display: none;
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/components/uni-data-pickerview/uni-data-picker.js b/components/uni-data-pickerview/uni-data-picker.js
new file mode 100644
index 0000000..af69e74
--- /dev/null
+++ b/components/uni-data-pickerview/uni-data-picker.js
@@ -0,0 +1,468 @@
+export default {
+  props: {
+    localdata: {
+      type: [Array, Object],
+      default () {
+        return []
+      }
+    },
+    collection: {
+      type: String,
+      default: ''
+    },
+    action: {
+      type: String,
+      default: ''
+    },
+    field: {
+      type: String,
+      default: ''
+    },
+    orderby: {
+      type: String,
+      default: ''
+    },
+    where: {
+      type: [String, Object],
+      default: ''
+    },
+    pageData: {
+      type: String,
+      default: 'add'
+    },
+    pageCurrent: {
+      type: Number,
+      default: 1
+    },
+    pageSize: {
+      type: Number,
+      default: 20
+    },
+    getcount: {
+      type: [Boolean, String],
+      default: false
+    },
+    getone: {
+      type: [Boolean, String],
+      default: false
+    },
+    gettree: {
+      type: [Boolean, String],
+      default: false
+    },
+    manual: {
+      type: Boolean,
+      default: false
+    },
+    value: {
+      type: [Array, String, Number],
+      default () {
+        return []
+      }
+    },
+    preload: {
+      type: Boolean,
+      default: false
+    },
+    stepSearh: {
+      type: Boolean,
+      default: true
+    },
+    selfField: {
+      type: String,
+      default: ''
+    },
+    parentField: {
+      type: String,
+      default: ''
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      errorMessage: '',
+      loadMore: {
+        contentdown: '',
+        contentrefresh: '',
+        contentnomore: ''
+      },
+      dataList: [],
+      selected: [],
+      selectedIndex: 0,
+      page: {
+        current: this.pageCurrent,
+        size: this.pageSize,
+        count: 0
+      }
+    }
+  },
+  computed: {
+    isLocaldata() {
+      return this.localdata.length > 0
+    },
+    postField() {
+      return `${this.field}, ${this.parentField} as parent_value`
+    }
+  },
+  created() {
+    this.$watch(() => {
+      var al = [];
+      ['pageCurrent',
+        'pageSize',
+        'value',
+        'localdata',
+        'collection',
+        'action',
+        'field',
+        'orderby',
+        'where',
+        'getont',
+        'getcount',
+        'gettree'
+      ].forEach(key => {
+        al.push(this[key])
+      });
+      return al
+    }, (newValue, oldValue) => {
+      let needReset = false
+      for (let i = 2; i < newValue.length; i++) {
+        if (newValue[i] != oldValue[i]) {
+          needReset = true
+          break
+        }
+      }
+      if (newValue[0] != oldValue[0]) {
+        this.page.current = this.pageCurrent
+      }
+      this.page.size = this.pageSize
+
+      this.onPropsChange()
+    })
+    this._treeData = []
+  },
+  methods: {
+    onPropsChange() {
+      this._treeData = []
+    },
+    getCommand(options = {}) {
+      /* eslint-disable no-undef */
+      let db = uniCloud.database()
+
+      const action = options.action || this.action
+      if (action) {
+        db = db.action(action)
+      }
+
+      const collection = options.collection || this.collection
+      db = db.collection(collection)
+
+      const where = options.where || this.where
+      if (!(!where || !Object.keys(where).length)) {
+        db = db.where(where)
+      }
+
+      const field = options.field || this.field
+      if (field) {
+        db = db.field(field)
+      }
+
+      const orderby = options.orderby || this.orderby
+      if (orderby) {
+        db = db.orderBy(orderby)
+      }
+
+      const current = options.pageCurrent !== undefined ? options.pageCurrent : this.page.current
+      const size = options.pageSize !== undefined ? options.pageSize : this.page.size
+      const getCount = options.getcount !== undefined ? options.getcount : this.getcount
+      const getTree = options.gettree !== undefined ? options.gettree : this.gettree
+
+      const getOptions = {
+        getCount,
+        getTree
+      }
+      if (options.getTreePath) {
+        getOptions.getTreePath = options.getTreePath
+      }
+
+      db = db.skip(size * (current - 1)).limit(size).get(getOptions)
+
+      return db
+    },
+    getTreePath(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        getTreePath: {
+          startWith: `${this.selfField}=='${this.value}'`
+        }
+      }).then((res) => {
+        this.loading = false
+        let treePath = []
+        this._extractTreePath(res.result.data, treePath)
+        this.selected = treePath
+        callback && callback()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    loadData() {
+      if (this.isLocaldata) {
+        this._processLocalData()
+        return
+      }
+
+      if (this.value.length) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+          this._updateSelected()
+        })
+        return
+      }
+
+      if (this.stepSearh) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+        })
+      } else {
+        this._loadAllData((data) => {
+          this._treeData = []
+          this._extractTree(data, this._treeData, null)
+          this._updateBindData()
+        })
+      }
+    },
+    _loadAllData(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        gettree: true,
+        startwith: `${this.selfField}=='${this.value}'`
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _loadNodeData(callback, pw) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        where: pw || this._postWhere(),
+        pageSize: 500
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _postWhere() {
+      let result = []
+      let selected = this.selected
+      result.push(`${this.parentField} == null`)
+      if (selected.length) {
+        for (var i = 0; i < selected.length - 1; i++) {
+          result.push(`${this.parentField} == '${selected[i].value}'`)
+        }
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _nodeWhere() {
+      let result = []
+      let selected = this.selected
+      if (selected.length) {
+        result.push(`${this.parentField} == '${selected[selected.length - 1].value}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _updateSelected() {
+      var dl = this.dataList
+      var sl = this.selected
+      for (var i = 0; i < sl.length; i++) {
+        var value = sl[i].value
+        var dl2 = dl[i]
+        for (var j = 0; j < dl2.length; j++) {
+          var item2 = dl2[j]
+          if (item2.value === value) {
+            sl[i].text = item2.text
+            break
+          }
+        }
+      }
+    },
+    _updateBindData(node) {
+      const {
+        dataList,
+        hasNodes
+      } = this._filterData(this._treeData, this.selected)
+
+      let isleaf = this._stepSearh === false && !hasNodes
+
+      if (node) {
+        node.isleaf = isleaf
+      }
+
+      this.dataList = dataList
+      this.selectedIndex = dataList.length - 1
+
+      if (!isleaf && this.selected.length < dataList.length) {
+        this.selected.push({
+          value: null,
+          text: "请选择"
+        })
+      }
+
+      return {
+        isleaf,
+        hasNodes
+      }
+    },
+    _filterData(data, paths) {
+      let dataList = []
+
+      let hasNodes = true
+
+      dataList.push(data.filter((item) => {
+        return item.parent_value === undefined
+      }))
+      for (let i = 0; i < paths.length; i++) {
+        var value = paths[i].value
+        var nodes = data.filter((item) => {
+          return item.parent_value === value
+        })
+
+        if (nodes.length) {
+          dataList.push(nodes)
+        } else {
+          hasNodes = false
+        }
+      }
+
+      return {
+        dataList,
+        hasNodes
+      }
+    },
+    _extractTree(nodes, result, parent_value) {
+      let list = result || []
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        if (parent_value !== null) {
+          child.parent_value = parent_value
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTree(children, result, node.value)
+        }
+      }
+    },
+    _extractTreePath(nodes, result) {
+      let list = result || []
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTreePath(children, result)
+        }
+      }
+    },
+    _findNodePath(key, nodes, path = []) {
+      for (let i = 0; i < nodes.length; i++) {
+        let {
+          value,
+          text,
+          children
+        } = nodes[i]
+
+        path.push({
+          value,
+          text
+        })
+
+        if (value === key) {
+          return path
+        }
+
+        if (children) {
+          const p = this._findNodePath(key, children, path)
+          if (p.length) {
+            return p
+          }
+        }
+
+        path.pop()
+      }
+      return []
+    },
+    _processLocalData() {
+      this._treeData = []
+      this._extractTree(this.localdata, this._treeData)
+
+      var inputValue = this.value
+      if (inputValue === undefined) {
+        return
+      }
+
+      if (Array.isArray(inputValue)) {
+        inputValue = inputValue[inputValue.length - 1]
+        if (typeof inputValue === 'object' && inputValue.value) {
+          inputValue = inputValue.value
+        }
+      }
+
+      this.selected = this._findNodePath(inputValue, this.localdata)
+    }
+  }
+}
diff --git a/components/uni-data-pickerview/uni-data-pickerview.vue b/components/uni-data-pickerview/uni-data-pickerview.vue
new file mode 100644
index 0000000..5047618
--- /dev/null
+++ b/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="uni-data-pickerview">
+		<scroll-view class="selected-area" scroll-x="true" scroll-y="false" :show-scrollbar="false">
+			<view class="selected-list">
+				<view class="selected-item" :class="{'selected-item-active':index==selectedIndex}" v-for="(item,index) in selected"
+				 :key="index" v-if="item.text" @click="handleSelect(index)">
+					<text class="">{{item.text}}</text>
+				</view>
+			</view>
+		</scroll-view>
+		<view class="tab-c">
+			<scroll-view class="list" v-for="(child, i) in dataList" :key="i" v-if="i==selectedIndex" :scroll-y="true">
+				<view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in child" :key="j" @click="handleNodeClick(item, i, j)">
+					<text class="item-text">{{item.text}}</text>
+					<view class="check" v-if="selected.length > i && item.value == selected[i].value"></view>
+				</view>
+			</scroll-view>
+			<view class="loading-cover" v-if="loading">
+				<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+			</view>
+			<view class="error-message" v-if="errorMessage">
+				<text class="error-text">{{errorMessage}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dataPicker from "./uni-data-picker.js"
+
+	/**
+	 * uni-data-pickerview
+	 * @description uni-data-pickerview
+	 * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-data-picker
+	 * @property {Array} localdata 本地数据，参考
+	 * @property {Boolean} step-searh = [true|false] 是否分布查询
+	 * @value true 启用分布查询，仅查询当前选中节点
+	 * @value false 关闭分布查询，一次查询出所有数据
+	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
+	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
+	 * @property {String|DBCollectionString} collection 表名
+	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+	 * @property {String} orderby 排序字段及正序倒叙设置
+	 * @property {String|JQLString} where 查询条件
+	 */
+	export default {
+		name: 'UniDataPickerView',
+		mixins: [dataPicker],
+		props: {
+			managedMode: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			if (this.managedMode) {
+				return
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.isLocaldata) {
+					this.loadData()
+				} else if (this.value.length) {
+					this.getTreePath((res) => {
+						this.loadData()
+					})
+				}
+			},
+			handleSelect(index) {
+				this.selectedIndex = index
+			},
+			handleNodeClick(item, i, j) {
+				if (item.disable) {
+					return
+				}
+
+				const node = this.dataList[i][j]
+				const {
+					value,
+					text
+				} = node
+
+				if (i < this.selected.length - 1) {
+					this.selected.splice(i, this.selected.length - i)
+					this.selected.push(node)
+				} else if (i === this.selected.length - 1) {
+					this.selected[i] = node
+				}
+
+				if (node.isleaf) {
+					this.onSelectedChange(node, node.isleaf)
+					return
+				}
+
+				const {
+					isleaf,
+					hasNodes
+				} = this._updateBindData()
+
+				if (this.isLocaldata && (!hasNodes || isleaf)) {
+					this.onSelectedChange(node, true)
+					return
+				}
+
+				if (!isleaf && !hasNodes) {
+					this._loadNodeData((data) => {
+						if (!data.length) {
+							node.isleaf = true
+						} else {
+							this._treeData.push(...data)
+							this._updateBindData(node)
+						}
+						this.onSelectedChange(node, node.isleaf)
+					}, this._nodeWhere())
+					return
+				}
+
+				this.onSelectedChange(node, false)
+			},
+			updateData(data) {
+				this._treeData = data.treeData
+				this.selected = data.selected
+				if (!this._treeData.length) {
+					this.loadData()
+				} else {
+					//this.selected = data.selected
+					this._updateBindData()
+				}
+			},
+			onDataChange() {
+				this.$emit('datachange')
+			},
+			onSelectedChange(node, isleaf) {
+				if (isleaf) {
+					this._dispatchEvent()
+				} else if (node) {
+					this.$emit('nodeclick', node)
+				}
+			},
+			_dispatchEvent() {
+				this.$emit('change', this.selected.slice(0))
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-data-pickerview {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		overflow: hidden;
+		height: 100%;
+	}
+
+	.error-text {
+		color: #DD524D;
+	}
+
+	.loading-cover {
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(255, 255, 255, .5);
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		z-index: 1001;
+	}
+
+	.load-more {
+		/* #ifndef APP-NVUE */
+		margin: auto;
+		/* #endif */
+	}
+
+	.error-message {
+		background-color: #fff;
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		padding: 15px;
+		opacity: .9;
+		z-index: 102;
+	}
+
+	/* #ifdef APP-NVUE */
+	.selected-area {
+		width: 750rpx;
+	}
+
+	/* #endif */
+
+	.selected-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		padding: 0 5px;
+		border-bottom: 1px solid #f8f8f8;
+	}
+
+	.selected-item {
+		margin-left: 10px;
+		margin-right: 10px;
+		padding: 12px 0;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	.selected-item-active {
+		border-bottom: 2px solid #007aff;
+	}
+
+	.selected-item-text {
+		color: #007aff;
+	}
+
+	.tab-c {
+		position: relative;
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		overflow: hidden;
+	}
+
+	.list {
+		flex: 1;
+	}
+
+	.item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 12px 15px;
+		border-bottom: 1px solid #f0f0f0;
+	}
+
+	.is-disabled {
+		opacity: .5;
+	}
+
+	.item-text {
+		flex: 1;
+		color: #333333;
+	}
+
+	.check {
+		margin-right: 5px;
+		border: 2px solid #007aff;
+		border-left: 0;
+		border-top: 0;
+		height: 12px;
+		width: 6px;
+		transform-origin: center;
+		/* #ifndef APP-NVUE */
+		transition: all 0.3s;
+		/* #endif */
+		transform: rotate(45deg);
+	}
+</style>
diff --git a/components/uni-drawer/uni-drawer.vue b/components/uni-drawer/uni-drawer.vue
new file mode 100644
index 0000000..a3ded77
--- /dev/null
+++ b/components/uni-drawer/uni-drawer.vue
@@ -0,0 +1,166 @@
+<template>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
+		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Drawer 抽屉
+	 * @description 抽屉侧滑菜单
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
+	 * @property {Boolean} mask = [true | false] 是否显示遮罩
+	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
+	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
+	 * 	@value left 从左侧滑出
+	 * 	@value right 从右侧侧滑出
+	 * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
+	 * @event {Function} close 组件关闭时触发事件
+	 */
+	export default {
+		name: 'UniDrawer',
+		props: {
+			/**
+			 * 显示模式（左、右），只在初始化生效
+			 */
+			mode: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 蒙层显示状态
+			 */
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 遮罩是否可点击关闭
+			 */
+			maskClick: {
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 抽屉宽度
+			 */
+			width: {
+				type: Number,
+				default: 220
+			}
+		},
+		data() {
+			return {
+				visibleSync: false,
+				showDrawer: false,
+				rightMode: false,
+				watchTimer: null,
+				drawerWidth: 220
+			}
+		},
+		created() {
+			// #ifndef APP-NVUE
+			this.drawerWidth = this.width
+			// #endif
+			this.rightMode = this.mode === 'right'
+		},
+		methods: {
+			clear() {},
+			close(type) {
+				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
+				if ((type === 'mask' && !this.maskClick) || !this.visibleSync) return
+				this._change('showDrawer', 'visibleSync', false)
+			},
+			open() {
+				// fixed by mehaotian 处理重复点击打开的事件
+				if (this.visibleSync) return
+				this._change('visibleSync', 'showDrawer', true)
+			},
+			_change(param1, param2, status) {
+				this[param1] = status
+				if (this.watchTimer) {
+					clearTimeout(this.watchTimer)
+				}
+				this.watchTimer = setTimeout(() => {
+					this[param2] = status
+					this.$emit('change', status)
+				}, status ? 50 : 300)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-drawer {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		overflow: hidden;
+		z-index: 999;
+	}
+
+	.uni-drawer__content {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+		top: 0;
+		width: 220px;
+		bottom: 0;
+		background-color: #ffffff;
+		transition: transform 0.3s ease;
+	}
+
+	.uni-drawer--left {
+		left: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX(-220px);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(-100%);
+		/* #endif */
+	}
+
+	.uni-drawer--right {
+		right: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX(220px);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(100%);
+		/* #endif */
+	}
+
+	.uni-drawer__content--visible {
+		transform: translateX(0px);
+	}
+
+	.uni-drawer__mask {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition: opacity 0.3s;
+	}
+
+	.uni-drawer__mask--visible {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-load-more/uni-load-more.vue b/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..d50f83b
--- /dev/null
+++ b/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,359 @@
+<template>
+	<view class="uni-load-more" @click="onClick">
+		<!-- #ifdef APP-NVUE -->
+		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon" :style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true" class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<svg width="24" height="24" viewBox="25 25 50 50" v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+		:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--android-H5">
+			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>
+		</svg>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE || H5 -->
+		<view v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+		:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--android-MP">
+			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE -->
+		<view v-else-if="!webviewHide && status === 'loading' && showIcon" :style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
+			<image src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZVHb98LM+F5bHL8khA1iSeiyQBCRM+YGqKUnnJTDLGI0BGZlKDIU2MMglUiDApEZvSsZnQtBRJtKwQNKQMFYeRDR10WOLd8ljYXdh+v8v5fR3Od+797t1dnOnO/Ofce77z+J//+b/P+ZqtXbs2sJ9MJhNUV1cHJ06cCJo3bx7EPc2aNcvpy7pWrVoF+/fvDyoqKoI2bdoE9fX1F7TjN8a+EXBn/fkfvw942Tf+wYMHg9mzZwfjxo0LDhw4EPa1x2MbFw/fOGfPng1qa2tzcCkILsLDydq2bRsunpOTMM7TD/W/tZDZhPdeKD+yGxHhdu3aBV27dg3OnDlzMVANMheLAO3btw8KCwuDmpoaX5OxbgUIMEq7K8IcPnw4KCsrC/r37x8cP378/4cAXAB3vqSkJMuiDhTkw+XcuXNhOWbMmKBly5YhUT8xArhyFvP0BfwRsAuwxJZJsm/nzp2DTp06he/OU+cZ64K6o0ePBkOHDg2GDx8e6gEbJ5Q/NHNuAJQ1hgBeHUDlR7nVTkY8rQAvAi4z34vR/mPs1FoRsaCgIJThI0eOBC1atEiFGGV+5MiRoS45efJkqFjJFXV1dQuA012m2WcwTw98fy6CqBdsaiIO4CScrGPHjvk4odhavPquRtFWXEC25VgkREKOCh/qDSq+vn37htzD/mZTOmOc5U7zKzBPEedygWshcDyWvs30igAbU+6oyMgJBCFhwQE0fccxN60Ay9iebbjoDh06hMowjQxT4fXq1SskArmHZpkArvixp/kWzHdMeArExSJEaiXIjjRjRJ4DaAGWpibLzXN3Fm1vA5teBgh3j1Rv3bp1YgKwPdmf2p9zcyNYYgPKMfY0T5f5nNYdw158nJ8QawW4CLKwiOBSEgO/hok2eBydR+3dYH+PLxA5J8Vv0KBBwenTp0P2JWAx6+yFEBfs8lMY+y0SWMBNI9E4ThKi58VKTg3FQZS1RQF1cz27eC0QHMu+3E0SkUowjhVt5VdaWhp07949ZHv2Qd1EjDXM2cla1M0nl3GxAs3J9yREzyTdFVKVFOaE9qRA8GM0WebRuo9JGZKA7Mv2SeS/Z8+eoQ9BArMfFrLGo6jvxbhHbJZnKX2Rzz1O7QhJJ9Cs2ZMaWIyq/zhdeqPNfIoHd58clIQD+JSXl4dKlyIAuBdVXZwFVWKspSSoxE++h8x4k3uCnEhE4I5KwRiFWGOU0QWKiCYLbdoRMRKAu2kQ9vkfLU6dOhX06NEjlH+yMRZSinnuyWnYosVcji8CEA/6Cg2JF+IIUBqnGKUTCNwtwBN4f89RiK1R96DEgO2o0NDmtEdvVFdVVYV+P3UAPUEs6GFwV3PHmXkD4vh74iDFJysVI/MlaQhwKeBNTLYX5VuA8T4/gZxA4MRGFxDB6R7OmYPfyykGRJbyie+XnGYnQIC/coH9+vULiYrxrkL9ZA9+0ykaHIfEpM7ge8TiJ2CsHYwyMfafAF1yCGBHYIbCVDjDjKt7BeB51D+LgQa6OkG7IDYEEtvQ7lnXLKLtLdLuJBpE4gPUXcW2+PkZwOex+4cGDhwYDBkyRL7/HFcEwUGPo/8uWRUpYnfxGHco8HkewLHLyYmAawAPuIFZxhOpDfJQ8gbUv41yORAptMWBNr6oqMhWird5+u+iHmBb2nhjDV7HWBNQTgK8y11l5NetWzc5ULscAtSj7nbNI0skhWeUZCc0W4nyH/jO4Vz0u1IeYhbk4AiwM6tjxIWByHsoZ9qcIBPJd/y+DwPfBESOmCa/QF3WiZHucLlEDpNxcNhmheEOPgdQNx6/VZFQzFZ5TN08AHXQt2Ii3EdyFuUsPtTcGPhW5iMiCNELvz+Gdn9huG4HUJaW/w3g0wxV0XaG7arG2WeKiUWYM4Y7GO5ezshTARbbWGw/DvXkpp/ivVvE0JVoMxN4rpGzJMhE5Pl+xlATsDIqikP9F9D2z3h9nOksEUFhK+qO4rcPkoalMQ/HqJLIyb3F3JdjrCcw1yZ8joyJLR5gCo54etlag7qIoeNh1N1BRYj3DTFJ0elotxPlVzkGuYAmL0VSJVGAJA41c4Z6A3BzTLfn0HYwYKEI6CUAMzZEWvLsIcQOo1AmmyyM72nHJCfYsogflGV6jEk9vyQZXSuq6w4c16NsGcGZbwOPr+H1RkOk2LEzjNepxQkihHSCQ4ynAYNRx2zMKV92CQMWqj8J0BRE8EShxRFN6YrfCRhC0x3r/Zm4IbQCcmJoV0kMamllccR6FjHqUC5F2R/wS2dcymOlfAKOS4KmzQb5cpNC2MC7JhVn5wjXoJ44rYhLh8n0eXOCorJxa7POjbSlCGVczr34/RsAmrcvo9s+wGp3tzVhntxiXiJ4nvEYb4FJkf0O8HocAePmLvCxnL0AORraVekJk6TYjDabRVXfRE2lCN1h6ZQRN1+InUbsCpKwoBZHh0dODN9JBCUffItXxEavTQkUtnfTVAplCWL3JISz29h4NjotnuSsQKJCk8dF+kJR6RARjrqFVmfPnj3ZbK8cIJ0msd6jgHPGtfVTQ8VLmlvh4mct9sobRmPic0DyDQQnx/NlfYUgyz59+oScsH379pAwXABD32nTpoUHIToESeI5mnbE/UqDdyLcafEBf2MCqgC7NwxIbMREJQ0g4D4sfJwnD+AmRrII05cfMWJE+L1169bQr+fip06dGp4oJ83lmYd5wj/EmMa4TaHivo4EeCguYZBnkB5g2aWA69OIEnUHOaGysjIYMGBAMGnSpODYsWPZwCpFmm4lNq+4gSLQA7jcX8DwtjEyRC8wjabnXEx9kfWnTJkSJkAo90xpJVV+FmcVNeYAF5zWngS4C4O91MBxmAv8blLEpbjI5sz9MTdAhcgkCT1RO8mZkAjfiYpTEvStAS53Uw1vAiUGgZ3GpuQEYvoiBqlIan7kSDHnTwJQFNiPu0+5VxCVYhcZIjNrdXUDdp+Eq5AZ3Gkg8QAyVZRZIk4Tl4QAbF9cXJxNYZMAtAokgs4BrNxEpCtteXg7DDTMDKYNSuQdKsnJBek7HxewvxaosWxLYXtw+cJp18217wql4aKCfBNoEu0O5VU+PhctJ0YeXD4C6JQpyrlpSLTojpGGGN5YwNziChdIZLk4lvLcFJ9jMX3QdiImY9bmGQU+TRUL5CHITTRlgF8D9ouD1MfmLoEPl5xokIumZ2cfgMpHt47IW9N64Hsh7wQYYjyIugWuF5fCqYncXRd5vPMWyizzvhi/32+nvG0dZc9vR6fZOu0md5e+uC408FvKSIOZwXlGvxPv95izA2Vtvg1xKFWARI+vMX66HUhpQQb643uW1bSjuTWyw2SBvDrBvjFic1eGGlz5esq3ko9uSIlBRqPuFcCv8F4WIcN12nVaBd0SaYwI6PDDImR11JkqgHcPmQssjxIn6bUshygDFJUTxPMpHk+jfjPgupgdnYV2R/g7xSjtpah8RJBewhwf0gGK6XI92u4wXFEU40afJ4DN4h5LcAd+40HI3JgJecuT0c062W0i2hQJUTcxan3/CMW1PF2K6bbA+Daz4xRs1D3Br1Cm0OihKCqizW78/nXAF/G5TXrEcVzaNMH6CyMswqsAHqDyDLEyou8lwOXnKF8DjI6KjV3KzMBiXkDH8ij/H214J5A596ekrZ3F0zXlWeL7+P5eUrNo3/QwC15uxthuzidy7DzKRwEDaAViiDgKbTbz7CJnzo0bN7pIfIiid8SuPwn25o3QCmpnyjlZkyxPP8EomCJzrGb7GJMx7tNsq4MT2xMUYaiErZOluTzKsnz3gwCeCZyVRZJfYplNEokEjwrPtxlxjeYAk+F1F74VAzPxQRNYYdtpOUvWs8J1sGhBJMNsb7igN8plJs1eSmLIhLKE4rvaCX27gOhLpLOsIzJ7qn/i+wZzcvSOZ23/du8TZjwV8zHIXoP4R3ifBxiFz1dcVpa3aPntPE+c6TmIWE9EtcMmAcPdWAhYhAXxcLOQi9L1WhD1Sc8p1d2oL7XGiRKp8F4A2i8K/nfI+y/gsTDJ/YC/8+AD5Uh04KHiGl+cIFPnBDDrPMjwRGkLXyxO4VGbfQWnDH2v0bVWE3C9QOXlepbgjEfIJQI6XDG3z5ahD9cw2pS78ipB85wyScNTvsVzlzzhL8/jRrnmVjfFJK/m3m4nj9vbgQTguT8XZTjsm672R5uJKEaQmBI/c58gyus8ZDagLpEVSJBIyHp4jn++xqPV71OgQgJYEWOtZ/haxRtKmWOBu8xdBLftWltsY84zE6WIEy/eIOWL+BaayMx+KHtL7EAkqdNDLiEXmEMUHniedtJqg9HmZtfvt26vNi0BdG3Ft3g8ZOf7PAu59TxtzivLNIekyi+wD1i8CuUiD9FXAa8C+/xS3JPmZnomyc7H+fb4/Se0bk41Fel621r4cgVxbq91V4jVqwB7HTe2M7jgB+QWHavZkDRPmZcASoZEmBx6i75bGjPcMdL4/VKGFAGWZkGzPG0XAbdL9A81G5LOmUnC9hHKJeO7dcUMjblSl12867ElFTtaGl20xvvLGPdVz/8TVuU7y0x1PG7vtNg24oz9Uo/Z412++VFWI7Fcog9tu9Lm6gvRmIPv9x1xmQAu6RDkXtbOtlGEmpgD5Nvnyc0dcv0EE6cfdi1HmhMf9wDF3k3gtRvEedhxjpgfqPb9PU9iEJHnyOUA7bQUXh6kq/D7l2iTjWv7XOD530BDr8jIrus+srXjt4MzumJMHuTsBa63YKE1+RR5lBjEikCCnWKWiHdzOgKO+nRIBAF88za/IFmJ3eMZov4CYxGBabcpGL8EYx+SeMXJeRwHNsV/h+vdxeuhEpN3ZyNY78Gm2fknJxVGhyjixPiQvVkNzT1elD9Py/aTAL64Hb9vcYmC9zfdXdT/C1LeGbg4rnBaAihDFJH12W5ulfNCNe/xTsP3bp8ikzJs5BF+5PNfAQYAPaseTdsEcaYAAAAASUVORK5CYII="
+						 mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<text class="uni-load-more__text" :style="{color: color}">{{ status === 'more' ? contentText.contentdown : status === 'loading' ? contentText.contentrefresh : contentText.contentnomore }}</text>
+	</view>
+</template>
+
+<script>
+	const platform = uni.getSystemInfoSync().platform
+
+	/**
+	 * LoadMore 加载更多
+	 * @description 用于列表中，做滚动加载使用，展示 loading 的各种状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=29
+	 * @property {String} status = [more|loading|noMore] loading 的状态
+	 * 	@value more loading前
+	 * 	@value loading loading中
+	 * 	@value noMore 没有更多了
+	 * @property {Number} iconSize 指定图标大小
+	 * @property {Boolean} iconSize = [true|false] 是否显示 loading 图标
+	 * @property {String} iconType = [snow|circle|auto] 指定图标样式
+	 * 	@value snow ios雪花加载样式
+	 * 	@value circle 安卓唤醒加载样式
+	 * 	@value auto 根据平台自动选择加载样式
+	 * @property {String} color 图标和文字颜色
+	 * @property {Object} contentText 各状态文字说明，值为：{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}
+	 * @event {Function} clickLoadMore 点击加载更多时触发
+	 */
+	export default {
+		name: 'UniLoadMore',
+		props: {
+			status: {
+				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			iconType: {
+				type: String,
+				default: 'auto'
+			},
+			iconSize: {
+				type: Number,
+				default: 24
+			},
+			color: {
+				type: String,
+				default: '#777777'
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: '上拉显示更多',
+						contentrefresh: '正在加载...',
+						contentnomore: '没有更多数据了'
+					}
+				}
+			}
+		},
+		data() {
+			return {
+                webviewHide: false,
+				platform: platform
+			}
+		},
+		// #ifndef APP-NVUE
+		computed:{
+			iconSnowWidth(){
+				return (Math.floor(this.iconSize/24)||1)*2
+			}
+		},
+		// #endif
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+		},
+		methods: {
+			onClick() {
+				this.$emit('clickLoadMore', {
+					detail: {
+						status: this.status,
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+	.uni-load-more {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 15px;
+	}
+
+	.uni-load-more__img {
+		width: 24px;
+		height: 24px;
+		margin-right: 8px;
+	}
+
+	.uni-load-more__img--nvue {
+		color: #666666;
+	}
+
+	.uni-load-more__img--android,
+	.uni-load-more__img--ios {
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-load-more__img--android {
+		animation: loading-ios 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.uni-load-more__img--ios-H5 {
+		position: relative;
+		animation: loading-ios-H5 1s 0s step-end infinite;
+	}
+
+	.uni-load-more__img--ios-H5>image {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+
+	@keyframes loading-ios-H5 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		8% {
+			transform: rotate(30deg);
+		}
+
+		16% {
+			transform: rotate(60deg);
+		}
+
+		24% {
+			transform: rotate(90deg);
+		}
+
+		32% {
+			transform: rotate(120deg);
+		}
+
+		40% {
+			transform: rotate(150deg);
+		}
+
+		48% {
+			transform: rotate(180deg);
+		}
+
+		56% {
+			transform: rotate(210deg);
+		}
+
+		64% {
+			transform: rotate(240deg);
+		}
+
+		73% {
+			transform: rotate(270deg);
+		}
+
+		82% {
+			transform: rotate(300deg);
+		}
+
+		91% {
+			transform: rotate(330deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+
+	/* #ifdef H5 */
+	.uni-load-more__img--android-H5 {
+		animation: loading-android-H5-rotate 2s linear infinite;
+		transform-origin: center center;
+	}
+
+	.uni-load-more__img--android-H5>circle {
+		display: inline-block;
+		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
+		stroke: currentColor;
+		stroke-linecap: round;
+	}
+
+	@keyframes loading-android-H5-rotate {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-H5-dash {
+		0% {
+			stroke-dasharray: 1, 200;
+			stroke-dashoffset: 0;
+		}
+
+		50% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -40;
+		}
+
+		100% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -120;
+		}
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE || H5 */
+	.uni-load-more__img--android-MP {
+		position: relative;
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+		animation: loading-ios 1s 0s ease infinite;
+	}
+
+	.uni-load-more__img--android-MP>view {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: solid 2px transparent;
+		border-top: solid 2px #777777;
+		transform-origin: center;
+	}
+
+	.uni-load-more__img--android-MP>view:nth-child(1){
+		animation: loading-android-MP-1 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP>view:nth-child(2){
+		animation: loading-android-MP-2 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP>view:nth-child(3){
+		animation: loading-android-MP-3 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-1{
+		0%{
+			transform: rotate(0deg);
+		}
+		50%{
+			transform: rotate(90deg);
+		}
+		100%{
+			transform: rotate(360deg);
+		}
+	}
+	@keyframes loading-android-MP-2{
+		0%{
+			transform: rotate(0deg);
+		}
+		50%{
+			transform: rotate(180deg);
+		}
+		100%{
+			transform: rotate(360deg);
+		}
+	}
+	@keyframes loading-android-MP-3{
+		0%{
+			transform: rotate(0deg);
+		}
+		50%{
+			transform: rotate(270deg);
+		}
+		100%{
+			transform: rotate(360deg);
+		}
+	}
+	/* #endif */
+</style>
diff --git a/components/uni-popup-dialog/uni-popup-dialog.vue b/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..872dd70
--- /dev/null
+++ b/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{title}}</text>
+		</view>
+		<view class="uni-dialog-content">
+			<text class="uni-dialog-content-text" v-if="mode === 'base'">{{content}}</text>
+			<input v-else class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholder" :focus="focus">
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @click="close">
+				<text class="uni-dialog-button-text">取消</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">确定</text>
+			</view>
+		</view>
+		<view v-if="popup.isDesktop" class="uni-popup-dialog__close" @click="close">
+			<span class="uni-popup-dialog__close-icon "></span>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		props: {
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			placeholder: {
+				type: [String, Number],
+				default: '请输入内容'
+			},
+			/**
+			 * 对话框主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'error'
+			},
+			/**
+			 * 对话框模式 base/input
+			 */
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			/**
+			 * 对话框标题
+			 */
+			title: {
+				type: String,
+				default: '提示'
+			},
+			/**
+			 * 对话框内容
+			 */
+			content: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 拦截取消事件 ，如果拦截取消事件，必须监听close事件，执行 done()
+			 */
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				val: ""
+			}
+		},
+		inject: ['popup'],
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				this.val = val
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.mkclick = false
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		mounted() {
+			this.focus = true
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				this.$emit('confirm', () => {
+					this.popup.close()
+					if (this.mode === 'input') this.val = this.value
+				}, this.mode === 'input' ? this.val : '')
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			close() {
+				if (this.beforeClose) {
+					this.$emit('close', () => {
+						this.popup.close()
+					})
+					return
+				}
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 5px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 5px 15px 15px 15px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6e6e6e;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 14px;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+
+	.uni-popup-dialog__close {
+		cursor: pointer;
+		position: absolute;
+		top: 9px;
+		right: 17px;
+	}
+
+	.uni-popup-dialog__close-icon {
+		display: inline-block;
+		width: 13px;
+		height: 1px;
+		background: #909399;
+		transform: rotate(45deg);
+	}
+
+	.uni-popup-dialog__close-icon::after {
+		content: '';
+		display: block;
+		width: 13px;
+		height: 1px;
+		background: #909399;
+		transform: rotate(-90deg);
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-popup-message/uni-popup-message.vue b/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..0f923a4
--- /dev/null
+++ b/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,138 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+[type]">
+			<text class="uni-popup-message-text" :class="'uni-popup__'+[type]+'-text'">{{message}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'UniPopupMessage',
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			}
+		},
+		inject: ['popup'],
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.childrenMsg = this
+		},
+		methods: {
+			open() {
+				if (this.duration === 0) return
+				clearTimeout(this.popuptimer)
+				this.popuptimer = setTimeout(() => {
+					this.popup.close()
+				}, this.duration)
+			},
+			close() {
+				clearTimeout(this.popuptimer)
+			}
+		}
+	}
+</script>
+<style scoped>
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-popup-share/uni-popup-share.vue b/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..2c900c0
--- /dev/null
+++ b/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{title}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">取消</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniPopupShare',
+		props: {
+			title: {
+				type: String,
+				default: '分享到'
+			}
+		},
+		inject: ['popup'],
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'wx'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					{
+						text: '百度',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+						name: 'copy'
+					},
+					{
+						text: '其他',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+						name: 'more'
+					}
+				]
+			}
+		},
+		created() {},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				}, () => {
+					this.popup.close()
+				})
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.uni-popup-share {
+		background-color: #fff;
+	}
+
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-popup/message.js b/components/uni-popup/message.js
new file mode 100644
index 0000000..0ff9a02
--- /dev/null
+++ b/components/uni-popup/message.js
@@ -0,0 +1,22 @@
+export default {
+	created() {
+		if (this.type === 'message') {
+			// 不显示遮罩
+			this.maskShow = false 
+			// 获取子组件对象
+			this.childrenMsg = null
+		}
+	},
+	methods: {
+		customOpen() {
+			if (this.childrenMsg) {
+				this.childrenMsg.open()
+			}
+		},
+		customClose() {
+			if (this.childrenMsg) {
+				this.childrenMsg.close()
+			}
+		}
+	}
+}
diff --git a/components/uni-popup/popup.js b/components/uni-popup/popup.js
new file mode 100644
index 0000000..8e02434
--- /dev/null
+++ b/components/uni-popup/popup.js
@@ -0,0 +1,50 @@
+import message from './message.js';
+// 定义 type 类型:弹出类型：top/bottom/center
+const config = {
+	// 顶部弹出
+	top: 'top',
+	// 底部弹出
+	bottom: 'bottom',
+	// 居中弹出
+	center: 'center',
+	// 消息提示
+	message: 'top',
+	// 对话框
+	dialog: 'center',
+	// 分享
+	share: 'bottom',
+}
+
+export default {
+	data() {
+		return {
+			config: config,
+			popupWidth: 0,
+			popupHeight: 0
+		}
+	},
+	mixins: [message],
+	computed: {
+		isDesktop() {
+			return this.popupWidth >= 500 && this.popupHeight >= 500
+		}
+	},
+	mounted() {
+		const fixSize = () => {
+			const {
+				windowWidth,
+				windowHeight,
+				windowTop
+			} = uni.getSystemInfoSync()
+			this.popupWidth = windowWidth
+			this.popupHeight = windowHeight + windowTop
+		}
+		fixSize()
+		// #ifdef H5
+		window.addEventListener('resize', fixSize)
+		this.$once('hook:beforeDestroy', () => {
+			window.removeEventListener('resize', fixSize)
+		})
+		// #endif
+	},
+}
diff --git a/components/uni-popup/share.js b/components/uni-popup/share.js
new file mode 100644
index 0000000..462bb83
--- /dev/null
+++ b/components/uni-popup/share.js
@@ -0,0 +1,16 @@
+export default {
+	created() {
+		if (this.type === 'share') {
+			// 关闭点击
+			this.mkclick = false
+		}
+	},
+	methods: {
+		customOpen() {
+			console.log('share 打开了');
+		},
+		customClose() {
+			console.log('share 关闭了');
+		}
+	}
+}
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..5de1e4d
--- /dev/null
+++ b/components/uni-popup/uni-popup.vue
@@ -0,0 +1,312 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']" @touchmove.stop.prevent="clear">
+		<uni-transition v-if="maskShow" class="uni-mask--hook" :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+		<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+			<view class="uni-popup__wrapper-box" @click.stop="clear">
+				<slot />
+			</view>
+		</uni-transition>
+	</view>
+</template>
+
+<script>
+	import uniTransition from '../uni-transition/uni-transition.vue'
+	import popup from './popup.js'
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [ture|false] 是否开启动画
+	 * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 */
+
+	export default {
+		name: 'UniPopup',
+		components: {
+			uniTransition
+		},
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			maskClick: {
+				type: Boolean,
+				default: true
+			}
+		},
+		provide() {
+			return {
+				popup: this
+			}
+		},
+		mixins: [popup],
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(newVal) {
+					this[this.config[newVal]]()
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					this[this.config[this.type]]()
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				maskClass: {
+					'position': 'fixed',
+					'bottom': 0,
+					'top': 0,
+					'left': 0,
+					'right': 0,
+					'backgroundColor': 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					'position': 'fixed',
+					'left': 0,
+					'right': 0,
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+			}
+		},
+		created() {
+			this.mkclick = this.maskClick
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+		},
+		methods: {
+			clear(e) {
+				// TODO nvue 取消冒泡
+				e.stopPropagation()
+			},
+			open() {
+				this.showPopup = true
+				this.$nextTick(() => {
+					new Promise(resolve => {
+						clearTimeout(this.timer)
+						this.timer = setTimeout(() => {
+							this.showTrans = true
+							// fixed by mehaotian 兼容 app 端
+							this.$nextTick(() => {
+								resolve();
+							})
+						}, 50);
+					}).then(res => {
+						// 自定义打开事件
+						clearTimeout(this.msgtimer)
+						this.msgtimer = setTimeout(() => {
+							this.customOpen && this.customOpen()
+						}, 100)
+						this.$emit('change', {
+							show: true,
+							type: this.type
+						})
+					})
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$nextTick(() => {
+					this.$emit('change', {
+						show: false,
+						type: this.type
+					})
+					clearTimeout(this.timer)
+					// 自定义关闭事件
+					this.customOpen && this.customClose()
+					this.timer = setTimeout(() => {
+						this.showPopup = false
+					}, 300)
+				})
+			},
+			onTap() {
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top() {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					'position': 'fixed',
+					'left': 0,
+					'right': 0,
+				}
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom() {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					'position': 'fixed',
+					'left': 0,
+					'right': 0,
+					'bottom': 0
+				}
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center() {
+				this.popupstyle = 'center'
+				this.ani = ['zoom-out', 'fade']
+				this.transClass = {
+					'position': 'fixed',
+					/* #ifndef APP-NVUE */
+					'display': 'flex',
+					'flexDirection': 'column',
+					/* #endif */
+					'bottom': 0,
+					'left': 0,
+					'right': 0,
+					'top': 0,
+					'justifyContent': 'center',
+					'alignItems': 'center'
+				}
+			}
+		}
+	}
+</script>
+<style scoped>
+	@charset "UTF-8";
+
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.uni-popup__mask {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		opacity: 0;
+	}
+
+	.mask-ani {
+		transition-property: opacity;
+		transition-duration: 0.2s;
+	}
+
+	.uni-top-mask {
+		opacity: 1;
+	}
+
+	.uni-bottom-mask {
+		opacity: 1;
+	}
+
+	.uni-center-mask {
+		opacity: 1;
+	}
+
+	.uni-popup__wrapper {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+	}
+
+	.top {
+		/* #ifdef H5 */
+		top: var(--window-top);
+		/* #endif */
+		/* #ifndef H5 */
+		top: 0;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+
+	.bottom {
+		bottom: 0;
+	}
+
+	.uni-popup__wrapper-box {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: relative;
+		/* iphonex 等安全区设置，底部安全区适配 */
+		/* #ifndef APP-NVUE */
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+	}
+
+	.content-ani {
+		transition-property: transform, opacity;
+		transition-duration: 0.2s;
+	}
+
+	.uni-top-content {
+		transform: translateY(0);
+	}
+
+	.uni-bottom-content {
+		transform: translateY(0);
+	}
+
+	.uni-center-content {
+		transform: scale(1);
+		opacity: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-transition/uni-transition.vue b/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..95a7e11
--- /dev/null
+++ b/components/uni-transition/uni-transition.vue
@@ -0,0 +1,280 @@
+<template>
+	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject" @click="change">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const animation = uni.requireNativePlugin('animation');
+	// #endif
+	/**
+	 * Transition 过渡动画
+	 * @description 简单过渡动画组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+	 * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+	 *  @value fade 渐隐渐出过渡
+	 *  @value slide-top 由上至下过渡
+	 *  @value slide-right 由右至左过渡
+	 *  @value slide-bottom 由下至上过渡
+	 *  @value slide-left 由左至右过渡
+	 *  @value zoom-in 由小到大过渡
+	 *  @value zoom-out 由大到小过渡
+	 * @property {Number} duration 过渡动画持续时间
+	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+	 */
+	export default {
+		name: 'uniTransition',
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			modeClass: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			duration: {
+				type: Number,
+				default: 300
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				transform: '',
+				ani: {
+					in: '',
+					active: ''
+				}
+			};
+		},
+		watch: {
+			show: {
+				handler(newVal) {
+					if (newVal) {
+						this.open()
+					} else {
+						this.close()
+					}
+				},
+				immediate: true
+			}
+		},
+		computed: {
+			stylesObject() {
+				let styles = {
+					...this.styles,
+					'transition-duration': this.duration / 1000 + 's'
+				}
+				let transfrom = ''
+				for (let i in styles) {
+					let line = this.toLine(i)
+					transfrom += line + ':' + styles[i] + ';'
+				}
+				return transfrom
+			}
+		},
+		created() {
+			// this.timer = null
+			// this.nextTick = (time = 50) => new Promise(resolve => {
+			// 	clearTimeout(this.timer)
+			// 	this.timer = setTimeout(resolve, time)
+			// 	return this.timer
+			// });
+		},
+		methods: {
+			change() {
+				this.$emit('click', {
+					detail: this.isShow
+				})
+			},
+			open() {
+				clearTimeout(this.timer)
+				this.isShow = true
+				this.transform = ''
+				this.ani.in = ''
+				for (let i in this.getTranfrom(false)) {
+					if (i === 'opacity') {
+						this.ani.in = 'fade-in'
+					} else {
+						this.transform += `${this.getTranfrom(false)[i]} `
+					}
+				}
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this._animation(true)
+					}, 50)
+				})
+
+			},
+			close(type) {
+				clearTimeout(this.timer)
+				this._animation(false)
+			},
+			_animation(type) {
+				let styles = this.getTranfrom(type)
+				// #ifdef APP-NVUE
+				if (!this.$refs['ani']) return
+				animation.transition(this.$refs['ani'].ref, {
+					styles,
+					duration: this.duration, //ms
+					timingFunction: 'ease',
+					needLayout: false,
+					delay: 0 //ms
+				}, () => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+				// #endif
+				// #ifndef APP-NVUE
+				this.transform = ''
+				for (let i in styles) {
+					if (i === 'opacity') {
+						this.ani.in = `fade-${type?'out':'in'}`
+					} else {
+						this.transform += `${styles[i]} `
+					}
+				}
+				this.timer = setTimeout(() => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+
+				}, this.duration)
+				// #endif
+
+			},
+			getTranfrom(type) {
+				let styles = {
+					transform: ''
+				}
+				this.modeClass.forEach((mode) => {
+					switch (mode) {
+						case 'fade':
+							styles.opacity = type ? 1 : 0
+							break;
+						case 'slide-top':
+							styles.transform += `translateY(${type?'0':'-100%'}) `
+							break;
+						case 'slide-right':
+							styles.transform += `translateX(${type?'0':'100%'}) `
+							break;
+						case 'slide-bottom':
+							styles.transform += `translateY(${type?'0':'100%'}) `
+							break;
+						case 'slide-left':
+							styles.transform += `translateX(${type?'0':'-100%'}) `
+							break;
+						case 'zoom-in':
+							styles.transform += `scale(${type?1:0.8}) `
+							break;
+						case 'zoom-out':
+							styles.transform += `scale(${type?1:1.2}) `
+							break;
+					}
+				})
+				return styles
+			},
+			_modeClassArr(type) {
+				let mode = this.modeClass
+				if (typeof(mode) !== "string") {
+					let modestr = ''
+					mode.forEach((item) => {
+						modestr += (item + '-' + type + ',')
+					})
+					return modestr.substr(0, modestr.length - 1)
+				} else {
+					return mode + '-' + type
+				}
+			},
+			// getEl(el) {
+			// 	console.log(el || el.ref || null);
+			// 	return el || el.ref || null
+			// },
+			toLine(name) {
+				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-transition {
+		transition-timing-function: ease;
+		transition-duration: 0.3s;
+		transition-property: transform, opacity;
+		z-index: 998;
+	}
+
+	.fade-in {
+		opacity: 0;
+	}
+
+	.fade-active {
+		opacity: 1;
+	}
+
+	.slide-top-in {
+		/* transition-property: transform, opacity; */
+		transform: translateY(-100%);
+	}
+
+	.slide-top-active {
+		transform: translateY(0);
+		/* opacity: 1; */
+	}
+
+	.slide-right-in {
+		transform: translateX(100%);
+	}
+
+	.slide-right-active {
+		transform: translateX(0);
+	}
+
+	.slide-bottom-in {
+		transform: translateY(100%);
+	}
+
+	.slide-bottom-active {
+		transform: translateY(0);
+	}
+
+	.slide-left-in {
+		transform: translateX(-100%);
+	}
+
+	.slide-left-active {
+		transform: translateX(0);
+		opacity: 1;
+	}
+
+	.zoom-in-in {
+		transform: scale(0.8);
+	}
+
+	.zoom-out-active {
+		transform: scale(1);
+	}
+
+	.zoom-out-in {
+		transform: scale(1.2);
+	}
+</style>
\ No newline at end of file
diff --git a/components/waterfall-article/waterfall-article.vue b/components/waterfall-article/waterfall-article.vue
new file mode 100644
index 0000000..8e43361
--- /dev/null
+++ b/components/waterfall-article/waterfall-article.vue
@@ -0,0 +1,124 @@
+<template>
+  <view class="waterfalls-box" :style="{ height: height + 'px' }">
+    <view
+      v-for="(item, index) of list"
+      class="waterfalls-list"
+      :key="item[idKey]"
+      :id="'waterfalls-list-id-' + item[idKey]"
+      :ref="'waterfalls-list-id-' + item[idKey]"
+      :style="{
+        '--offset': offset + 'px',
+        '--cols': cols,
+        top: allPositionArr[index] ? allPositionArr[index].top : 0,
+        left: allPositionArr[index] ? allPositionArr[index].left : 0,
+      }"
+      @click="goto" :data-url="'/pagesA/article/detail?id='+item[idKey]"
+    >
+      <image
+        class="waterfalls-list-image"
+        mode="widthFix"
+        :style="imageStyle"
+        :src="item[imageSrcKey] || ' '"
+        @load="imageLoadHandle(index)"
+        @error="imageLoadHandle(index)"
+      />
+      <view class="article-waterfall-info">
+				<view class="p1">{{item.name}}</view>
+				<view class="p2">
+					<text style="overflow:hidden" class="flex1" v-if="showtime=='1'">{{item.createtime}}</text>
+					<text style="overflow:hidden" v-if="showreadcount=='1'">阅读 {{item.readcount}}</text>
+				</view>
+			</view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  props: {
+    list: { type: Array, required: true },
+    // offset 间距，单位为 px
+    offset: { type: Number, default: 8 },
+    // 列表渲染的 key 的键名，值必须唯一，默认为 id
+    idKey: { type: String, default: "id" },
+    // 图片 src 的键名
+    imageSrcKey: { type: String, default: "pic" },
+    // 列数
+    cols: { type: Number, default: 2, validator: (num) => num >= 2 },
+    imageStyle: { type: Object },
+		showtime: {type: String, default: "1" },
+		showreadcount: {type: String, default: "1" }
+  },
+  data() {
+    return {
+      topArr: [], // left, right 多个时依次表示第几列的数据
+      allPositionArr: [], // 保存所有的位置信息
+      allHeightArr: [], // 保存所有的 height 信息
+      height: 0, // 外层包裹高度
+      oldNum: 0,
+      num: 0,
+    };
+  },
+  created() {
+    this.refresh();
+  },
+  methods: {
+    imageLoadHandle(index) {
+      const id = "waterfalls-list-id-" + this.list[index][this.idKey],
+        query = uni.createSelectorQuery().in(this);
+      query
+        .select("#" + id)
+        .fields({ size: true }, (data) => {
+          this.num++;
+					//console.log(data.height);
+          this.$set(this.allHeightArr, index, data.height);
+          if (this.num === this.list.length) {
+            for (let i = this.oldNum; i < this.num; i++) {
+              const getTopArrMsg = () => {
+                let arrtmp = [...this.topArr].sort((a, b) => a - b);
+                return {
+                  shorterIndex: this.topArr.indexOf(arrtmp[0]),
+                  shorterValue: arrtmp[0],
+                  longerIndex: this.topArr.indexOf(arrtmp[this.cols - 1]),
+                  longerValue: arrtmp[this.cols - 1],
+                };
+              };
+
+              const { shorterIndex, shorterValue } = getTopArrMsg();
+              const position = {
+                top: shorterValue + "px",
+                left: (data.width + this.offset) * shorterIndex + "px",
+              };
+              this.$set(this.allPositionArr, i, position);
+              this.topArr[shorterIndex] =
+                shorterValue + this.allHeightArr[i] + this.offset;
+              this.height = getTopArrMsg().longerValue - this.offset;
+            }
+            this.oldNum = this.num;
+            // 完成渲染 emit `image-load` 事件
+            this.$emit("image-load");
+          }
+        })
+        .exec();
+    },
+    refresh() {
+      let arr = [];
+      for (let i = 0; i < this.cols; i++) {
+        arr.push(0);
+      }
+      this.topArr = arr;
+      this.num = 0;
+      this.oldNum = 0;
+      this.height = 0;
+    },
+  },
+};
+</script>
+<style scoped>
+.waterfalls-box {position: relative;width: 100%;overflow: hidden;}
+.waterfalls-box .waterfalls-list {width: calc((100% - var(--offset) * (var(--cols) - 1)) / var(--cols));position: absolute;background-color: #fff;border-radius: 8rpx;left: calc(-50% - var(--offset));}
+.waterfalls-box .waterfalls-list .waterfalls-list-image {width: 100%;will-change: transform;border-radius:8rpx 8rpx 0 0;display: block;}
+
+.article-waterfall-info{padding:10rpx 20rpx 20rpx 20rpx;display:flex;flex-direction:column;}
+.article-waterfall-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.article-waterfall-info .p2{flex-grow:0;flex-shrink:0;display:flex;align-items:center;padding-top:10rpx;font-size:24rpx;color:#a88;overflow:hidden}
+</style>
diff --git a/components/wxface/wxface.vue b/components/wxface/wxface.vue
new file mode 100644
index 0000000..d7b7011
--- /dev/null
+++ b/components/wxface/wxface.vue
@@ -0,0 +1,31 @@
+<template>
+<view class="wxface-dialog" id="facedialog"><scroll-view class="wxface-face" scroll-y="true"><view class="wxface-face-item" @tap="selectface" data-face="[微笑]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/0.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[撇嘴]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/1.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[色]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/2.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[发呆]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/3.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[得意]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/4.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[流泪]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/5.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[害羞]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/6.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[闭嘴]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/7.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[睡]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/8.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[大哭]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/9.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[尴尬]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/10.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[发怒]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/11.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[调皮]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/12.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[呲牙]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/13.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[惊讶]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/14.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[难过]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/15.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[酷]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/16.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[囧]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/17.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[抓狂]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/18.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[吐]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/19.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[偷笑]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/20.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[愉快]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/21.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[白眼]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/22.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[傲慢]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/23.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[困]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/25.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[惊恐]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/26.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[流汗]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/27.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[憨笑]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/28.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[悠闲]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/29.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[奋斗]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/30.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[咒骂]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/31.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[疑问]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/32.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[嘘]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/33.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[晕]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/34.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[衰]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/36.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[骷髅]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/37.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[敲打]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/38.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[再见]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/39.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[擦汗]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/40.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[抠鼻]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/41.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[鼓掌]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/42.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[糗大了]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/43.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[坏笑]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/44.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[左哼哼]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/45.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[右哼哼]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/46.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[哈欠]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/47.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[鄙视]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/48.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[委屈]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/49.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[快哭了]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/50.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[阴险]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/51.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[亲亲]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/52.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[吓]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/53.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[可怜]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/54.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[菜刀]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/55.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[西瓜]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/56.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[啤酒]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/57.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[篮球]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/58.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[乒乓]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/59.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[咖啡]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/60.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[饭]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/61.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[猪头]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/62.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[玫瑰]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/63.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[凋谢]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/64.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[嘴唇]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/65.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[爱心]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/66.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[心碎]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/67.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[蛋糕]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/68.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[闪电]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/69.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[炸弹]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/70.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[刀]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/71.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[足球]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/72.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[瓢虫]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/73.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[便便]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/74.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[月亮]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/75.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[太阳]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/76.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[礼物]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/77.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[拥抱]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/78.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[强]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/79.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[弱]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/80.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[握手]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/81.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[胜利]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/82.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[抱拳]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/83.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[勾引]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/84.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[拳头]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/85.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[差劲]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/86.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[爱你]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/87.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[NO]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/88.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[OK]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/89.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[跳跳]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/90.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[发抖]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/91.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[怄火]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/92.png'"></image></view><view class="wxface-face-item" @tap="selectface" data-face="[转圈]"><image class="wxface-face-image" :src="pre_url + '/static/chat/wxface/93.png'"></image></view></scroll-view></view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				pre_url:app.globalData.pre_url
+			}
+		},
+		props: {
+			params:{},
+			data:{}
+		},
+		methods:{
+			selectface:function(e){
+				var face = e.currentTarget.dataset.face
+				this.$emit('selectface',face);
+			}
+		}
+	}
+</script>
+<style>
+
+.wxface-dialog{border: 1px solid #f4f4f4; width:750rpx;position: fixed; bottom:100rpx; left:0rpx; right: 0rpx; margin: 0 auto;background:#fff;z-index:9;height:400rpx}
+.wxface-face{width:750rpx;position:relative; max-height:400rpx; overflow: auto; padding: 20rpx; font-size: 0;display:flex;flex-direction:row;flex-wrap:wrap}
+.wxface-face-item{cursor: pointer; display: inline-block; vertical-align: bottom; padding:10rpx 4rpx; text-align: center; width:70rpx; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}
+.wxface-face-image{width:44rpx; height: 44rpx;}
+
+</style>
\ No newline at end of file
diff --git a/components/yybuydialog/yybuydialog.vue b/components/yybuydialog/yybuydialog.vue
new file mode 100644
index 0000000..1f61f67
--- /dev/null
+++ b/components/yybuydialog/yybuydialog.vue
@@ -0,0 +1,209 @@
+<template>
+<view>
+	<view v-if="isload">
+		<view class="buydialog-mask" @tap="buydialogChange"></view>
+		<view class="buydialog" :class="menuindex>-1?'tabbarbot':''">
+			<view class="close" @tap="buydialogChange">
+				<image :src="event_rul + '/static/img/static/img/close.png'" class="image"/>
+			</view>
+			<view class="title">
+				<image :src="nowguige.pic || product.pic" class="img" @tap="previewImage" :data-url="nowguige.pic || product.pic"/>
+				<view class="price" :style="{color:t('color1')}">￥{{nowguige.sell_price}} <text v-if="nowguige.market_price > nowguige.sell_price" class="t2">￥{{nowguige.market_price}}</text></view>
+				<view class="choosename">已选规格: {{nowguige.name}}</view>
+			</view>
+			<view v-if="nowguige.balance_price" style="width:94%;margin:10rpx 3%;font-size:24rpx;" :style="{color:t('color1')}">首付款金额：{{nowguige.advance_price}}元，尾款金额：{{nowguige.balance_price}}元</view>
+			<view style="max-height:50vh;overflow:scroll">
+				<view v-for="(item, index) in guigedata" :key="index" class="guigelist flex-col">
+					<view class="name">{{item.title}}</view>
+					<view class="item flex flex-y-center">
+						<block v-for="(item2, index2) in item.items" :key="index2">
+							<view :data-itemk="item.k" :data-idx="item2.k" :class="'item2 ' + (ggselected[item.k]==item2.k ? 'on':'')" @tap="ggchange">{{item2.title}}</view>
+						</block>
+					</view>
+				</view>
+			</view>
+			<view class="buynum flex flex-y-center">
+				<view class="flex1">购买数量：</view>
+				<view class="addnum">
+					<view class="minus"><image class="img" :src="event_rul + '/static/img/static/img/cart-minus.png'" @tap="gwcminus"/></view>
+					<input class="input" type="number" :value="gwcnum" @input="gwcinput"></input>
+					<view class="plus"><image class="img" :src="event_rul + '/static/img/static/img/cart-plus.png'" @tap="gwcplus"/></view>
+				</view>
+			</view>
+			<view class="op">
+					<button class="tobuy" :style="{backgroundColor:t('color1')}" @tap="tobuy" v-if="btntype==2">确 定</button>
+			</view>
+		</view>
+	</view>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				ks:'',
+				product:{},
+				guigelist:{},
+				guigedata:{},
+				ggselected:{},
+				nowguige:{},
+				gwcnum:1,
+				isload:false,
+				loading:false,
+				canaddcart:true,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props: {
+			btntype:{default:0},
+			menuindex:{default:-1},
+			controller:{default:'ApiYuyue'},
+			needaddcart:{default:true},
+			proid:{}
+		},
+		mounted:function(){
+			this.getdata();
+		},
+		methods:{
+			getdata:function(){
+				var that = this;
+				that.loading = true;
+				app.post(this.controller+'/getproductdetail',{id:that.proid},function(res){
+					that.loading = false;
+					that.product = res.product;
+					that.guigelist = res.guigelist;
+					that.guigedata = res.guigedata
+					var guigedata = res.guigedata;
+					var ggselected = [];
+					for (var i = 0; i < guigedata.length; i++) {
+						ggselected.push(0);
+					}
+					that.ks = ggselected.join(','); 
+					that.nowguige = that.guigelist[that.ks];
+					that.ggselected = ggselected
+					that.isload = true;
+					if(that.product.freighttype==3 || that.product.freighttype==4){ //虚拟商品不能加入购物车
+						that.canaddcart = false;
+					}
+				});
+			},
+			buydialogChange:function(){
+				this.$emit('buydialogChange');
+			},
+			//选择规格
+			ggchange: function (e){
+				var idx = e.currentTarget.dataset.idx;
+				var itemk = e.currentTarget.dataset.itemk;
+				var ggselected = this.ggselected;
+				ggselected[itemk] = idx;
+				var ks = ggselected.join(',');
+				this.ggselected = ggselected;
+				this.ks = ks;
+				this.nowguige = this.guigelist[this.ks];
+			},
+			tobuy: function (e) {
+				var that = this;
+				var ks = that.ks;
+				var proid = that.product.id;
+				var ggid = that.guigelist[ks].id;
+				var num = that.gwcnum;
+				if (num < 1) num = 1;
+				var ggname = that.guigelist[ks].name;
+				var prodata = proid + ',' + ggid + ',' + num;
+				var data = [];
+				data.ggname = ggname;
+				data.proid = proid;
+				data.ggid = ggid;
+				data.num = num;
+				this.$emit('buydialogChange');
+				this.$emit('currgg',data);
+			},
+			//加入购物车操作
+			addcart: function () {
+				var that = this;
+				var ks = that.ks;
+				var num = that.gwcnum;
+				var proid = that.product.id;
+				var ggid = that.guigelist[ks].id;
+				var stock = that.guigelist[ks].stock;
+				if (num < 1) num = 1;
+				if (stock < num) {
+					app.error('库存不足');
+					return;
+				}
+				if(this.needaddcart){
+					app.post(this.controller+'/addcart', {proid: proid,ggid: ggid,num: num}, function (res) {
+						if (res.status == 1) {
+							app.success('添加成功');
+						} else {
+							app.error(res.msg);
+						}
+					});
+				}
+				this.$emit('addcart',{proid: proid,ggid: ggid,num: num});
+				this.$emit('buydialogChange');
+			},
+			//加
+			gwcplus: function (e) {
+				var gwcnum = this.gwcnum + 1;
+				var ks = this.ks;
+				this.gwcnum = this.gwcnum + 1;
+			},
+			//减
+			gwcminus: function (e) {
+				var gwcnum = this.gwcnum - 1;
+				var ks = this.ks;
+				if (gwcnum <= 0) {
+					return;
+				}
+				this.gwcnum = this.gwcnum - 1;
+			},
+			//输入
+			gwcinput: function (e) {
+				console.log(e)
+				var ks = this.ks;
+				var gwcnum = parseInt(e.detail.value);
+				if (gwcnum < 1) return 1;
+				//if (gwcnum > this.guigelist[ks].stock) {
+				//	return this.guigelist[ks].stock > 0 ? this.guigelist[ks].stock : 1;
+				//}
+				console.log(gwcnum);
+				this.gwcnum = gwcnum;
+			},
+		}
+	}
+</script>
+<style>
+
+.buydialog-mask{ position: fixed; top: 0px; left: 0px; width: 100%; background: rgba(0,0,0,0.5); bottom: 0px;z-index:10}
+.buydialog{ position: fixed; width: 100%; left: 0px; bottom: 0px; background: #fff;z-index:11;border-radius:20rpx 20rpx 0px 0px}
+.buydialog .close{ position: absolute; top: 0; right: 0;padding:20rpx;z-index:12}
+.buydialog .close .image{ width: 30rpx; height:30rpx; }
+.buydialog .title{ width: 94%;position: relative; margin: 0 3%; padding:20rpx 0px; border-bottom:0; height: 190rpx;}
+.buydialog .title .img{ width: 160rpx; height: 160rpx; position: absolute; top: 20rpx; border-radius: 10rpx; border: 0 #e5e5e5 solid;background-color: #fff}
+.buydialog .title .price{ padding-left:180rpx;width:100%;font-size: 36rpx;height:70rpx; color: #FC4343;overflow: hidden;}
+.buydialog .title .price .t1{ font-size:26rpx}
+.buydialog .title .price .t2{ font-size:26rpx;text-decoration:line-through;color:#aaa}
+.buydialog .title .choosename{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+.buydialog .title .stock{ padding-left:180rpx;width: 100%;font-size: 24rpx;height: 42rpx;line-height:42rpx;color:#888888}
+
+.buydialog .guigelist{ width: 94%; position: relative; margin: 0 3%; padding:0px 0px 10px 0px; border-bottom: 0; }
+.buydialog .guigelist .name{ height:70rpx; line-height: 70rpx;}
+.buydialog .guigelist .item{ font-size: 30rpx;color: #333;flex-wrap:wrap}
+.buydialog .guigelist .item2{ height:60rpx;line-height:60rpx;margin-bottom:4px;border:0; border-radius:4rpx; padding:0 40rpx;color:#666666; margin-right: 10rpx; font-size:26rpx;background:#F4F4F4}
+.buydialog .guigelist .on{color:#FC4343;background:rgba(252,67,67,0.1);font-weight:bold}
+.buydialog .buynum{ width: 94%; position: relative; margin: 0 3%; padding:10px 0px 10px 0px; }
+.buydialog .addnum {font-size: 30rpx;color: #666;width:auto;display:flex;align-items:center}
+.buydialog .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.buydialog .addnum .img{width:24rpx;height:24rpx}
+.buydialog .addnum .input{flex:1;width:70rpx;border:0;text-align:center;color:#2B2B2B;font-size:24rpx}
+
+.buydialog .op{width:90%;margin:20rpx 5%;border-radius:36rpx;overflow:hidden;display:flex;margin-top:100rpx;}
+.buydialog .addcart{flex:1;height:72rpx; line-height: 72rpx; color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold}
+.buydialog .tobuy{flex:1;height: 72rpx; line-height: 72rpx; color: #fff; border-radius: 0px; border: none;font-size:28rpx;font-weight:bold}
+.buydialog .nostock{flex:1;height: 72rpx; line-height: 72rpx; background:#aaa; color: #fff; border-radius: 0px; border: none;}
+</style>
\ No newline at end of file
diff --git a/diary/attention/attention.vue b/diary/attention/attention.vue
new file mode 100644
index 0000000..a88361f
--- /dev/null
+++ b/diary/attention/attention.vue
@@ -0,0 +1,1015 @@
+<template>
+	<view class="attention overflow-hd">
+		<view class="attention-h">
+			<view class="nav-bar">
+				<view class="nav_max" :style="{'width': titleWidth}">
+					<view class="attention-scarch flex al-item-center" @click="search">
+						<view class="input_box flex">
+						  <text  class="iconfont icon-search"></text>	
+						  <!-- <input disabled="true" placeholder="大家都在搜..." type="text"  v-model="searchVlaue"  /> -->
+						</view>
+					</view>
+					<view class="flex flex1 j-center">
+						<view class="item position-r" @tap="goto" data-url='/diary/attention/attention' data-opentype="redirectTo">
+							<text class="txt font-w">关注</text>
+							<text class="heng position-a"></text>
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/evernote/evernote' data-opentype="redirectTo">
+							<text class="txt n-tv">笔记</text>
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/video/video' data-opentype="redirectTo">
+							<text class="txt n-tv">视频</text>
+						</view>
+						<!-- #ifdef MP -->
+						<view class="item position-r" @tap="goto" data-url='/diary/live/live' data-opentype="redirectTo">
+							<text class="txt n-tv">直播</text>
+						</view>
+						<!-- #endif -->
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<view class="" :style="{'height': hearHeight + 'px'}"></view>
+		<view class="swe-h" v-if="interestedList.length > 0">
+			左滑发现更多感兴趣的人
+		</view>
+		<view class="swer-list" v-if="interestedList.length > 0">
+			<scroll-view :scroll-x="true" class="scroll-list" @scrolltolower="scrollList">
+					<block v-for="(item, idx) in interestedList" :key="item.id">
+						<view class="scroll-view-item ">
+							<view class="scroll-view-item-c">
+								<image v-if="item.headimg" class="scroll-list-img" :src="item.headimg" mode="" @tap="goto" :data-url="'/diary/info/info?id=' + item.id"></image>
+								<!-- <text v-else style="font-size: 80rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text> -->
+								<text class="scroll-list-title pt" @tap="goto" :data-url="'/diary/info/info?id=' + item.id">{{item.nickname}}</text>
+								<text class="scroll-list-xq pt color-gray">你可能感兴趣</text>
+								<view v-if="item.focuds == 0" class="scroll-list-gz ygz flex al-item-center j-center" :style="{'border-color':'#0A5D3B', 'color':'#0A5D3B'}" @click="attention(item.id, idx)">
+									已关注
+								</view>
+								<view v-else class="scroll-list-gz flex al-item-center j-center" style=" background: linear-gradient(150deg, #00AE68 0%, #096742 100%);" @click="attention(item.id, idx)">
+									<text style="font-size: 34rpx;margin-right: 8rpx;">+ </text> 关注
+								</view>
+
+							</view>
+						</view>
+					</block>
+			</scroll-view>
+		</view>
+		<view class="attention-list-box">
+			<block v-for="(item, idx) in followNoteList" :key="item.id" >
+				<view class="attention-list-box-c" >
+					<view class="list-box-title">
+						<view class="list-box-title-l">
+							<image v-if="item.headimg" class="list-box-img" :src="item.headimg" mode="" @tap="goto" :data-url="'/diary/info/info?id=' + item.mid"></image>
+							<!-- <text v-else style="font-size: 80rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text> -->
+							<text class="list-box-title-t" @tap="goto" :data-url="'/diary/info/info?id=' + item.mid">{{item.nickname}}</text>
+						</view>
+						<view class="list-box-title-r color-gray">{{ getTimes(item.createtime) }}</view>
+					</view>
+					<view :id="'city' + idx" class="list-box-img-list" @click="toDetail(item.id)">
+						<block v-for="(pics, idx) in item.pics" :key="idx">
+							<image v-if="pics" class="list-img" :src="pics" mode=""></image>
+							<view v-else style="width: 220rpx;height: 220rpx;text-align: center;line-height: 220rpx;">
+								<text  style="font-size: 160rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text>
+							</view>
+						</block>
+					</view>
+					<view class="list-box-tip-c">
+						<view class="list-box-tip-c-l" v-if="item.topiclist.length > 0">
+							<view class="tip-c-l-cont" v-for="(topic,idx) in item.topiclist" :key="topic.id" @tap="goto" :data-url="'/diary/topic/topic?id='+topic.id">
+								<!-- <image class="tip-c-l-img" src="../../admin/images/comwithdrawlog.png" mode=""></image> -->
+								<text class="tip-c-l-img-t" :style="{'background-color': t('color1')}">#</text>
+								<text style="flex: 1;">{{topic.topic_name}}</text>
+							</view>
+							
+						</view>
+						<!-- <text class="list-box-tip-c-jia" :style="{'background-color': t('color1')}"></text> -->
+					</view>
+					<view class="tip-c-l-cont-t con-hi" v-if="item.title">{{item.title}}</view>
+					<view class="list-box-tip-con" @click="toDetail(item.id)">
+						<text :class="isShowText == false ? 'con-hi': 'con-sw'">{{item.content}}</text>
+						<view class="list-box-tip-con-btn" :style="{'color': '#0A5D3B'}">
+							<text>{{'详情'}}</text>
+							<!-- <text class="icon-st iconfont" :class="isShowText == false ? 'icon-xia': 'icon-shang'" :style="{'color': t('color1')}"></text> -->
+						</view>
+					</view>
+					<view class="list-box-tip-bto">
+						<view class="list-box-tip-bto-title">
+							<button open-type="share" class="bto-title-l" @click="pinlunIdx = idx">
+								<text class="icons-t iconfont icon-fenxiang"></text>
+								<!-- <text class="color-gray" style="padding-left: 6rpx;">24</text> -->
+							</button>
+							<view class="bto-title-r">
+								<view class="bto-title-r-icon" style="margin-right: 30rpx;" @click="zan(item.id, idx)">
+									<text v-if="item.iszan == 0" class="icons-t iconfont icon-aixin"></text>
+									<text v-else class="icons-t iconfont icon-aixin_shixin" :style="{'color': 'red'}"></text>
+									<text class="color-gray" style="padding-left: 6rpx;">{{item.zan}}</text>
+								</view>
+								<view class="bto-title-r-icon" style="margin-right: 30rpx;" @click="hoarding(item.id, idx)">
+									<text v-if="item.isfavorite == 0" class="icons-t iconfont icon-shoucang"></text>
+									<text v-else class="icons-t iconfont icon-Collection" :style="{'color': 'red'}"></text>
+									<text class="color-gray" style="padding-left: 6rpx;">{{item.favorite_count}}</text>
+								</view>
+								<view  class="bto-title-r-icon" @tap="commentClick(idx)">
+									<text  class="icons-t iconfont icon-xiaoxi"></text>
+									<text class="color-gray" style="padding-left: 6rpx;">{{item.pinglun_count}}</text>
+								</view>
+							</view>
+						</view>
+						<view  class="list-box-tip-bto-review" v-if="item.pinglunlist.length > 0">
+						
+							<view class="bto-review-con" v-for="(plixs, idx) in item.pinglunlist" :key="idx">
+								<text class="bto-review-titl" >{{plixs.nickname + '：'}}</text>
+								<rich-text class="bto-review-tx" :nodes="plixs.content"></rich-text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<view class="add" :style="{'background-color': t('color1')}" @click="addShow= true"></view>
+		<view class="add_box" @click="addShow = false" v-if="addShow">
+			<view class="content" @click.stop="">
+				<view class="item" @click="toAdd('diary')">
+				发布笔记
+				</view>
+				<view class="item" @click="toAdd('video')">
+				发布视频 
+				</view>
+				<view class="item" @click="addShow= false">
+				取消
+				</view>
+			</view>
+		</view>
+		<!--评论-->
+		<view class="plbox-show-mk" v-if="showcomment" @touchmove.stop.prevent="moveHandle">
+		<view class="plbox"  :style="menuindex > -1 ? 'bottom:110rpx':''">
+			<view class="plbox_title"><text class="plbox_title-t1">评论</text><text class="plbox_title-t2">({{followNoteList[pinlunIdx].pinglun_count}})</text></view>
+			<image :src="event_rul + '/static/img/static/img/close.png'" class="plbox-close" @tap.stop="commentClick"/>
+			<scroll-view class="plbox_content" scroll-y="true" @scrolltolower="getmorecomment">
+				<block v-for="(item, idx) in followNoteList[pinlunIdx].pinglunlist" :key="item.id">
+				<view class="plbox_content-item">
+					<view class="plbox_content-item-f1 flex0"><image :src="item.headimg" class="plbox_content-item-f1-img"></image></view>
+					<view class="plbox_content-item-f2 flex-col">
+						<text class="plbox_content-item-f2-t1">{{item.nickname}}</text>
+						<view class="plbox_content-item-f2-t2 plbox_content-plcontent">
+						<!-- <text class="plbox_content-plcontent-text">{{item.content}}</text> -->
+						<rich-text class="bto-review-tx" :nodes="item.content"></rich-text>
+
+						</view>
+						<view class="plbox_content-item-f2-t3">
+							<!-- <text class="plbox_content-item-f2-t3-x1">{{}}</text> -->
+							<!-- <view class="plbox_content-item-f2-t3-x2" ><text class="plbox_content-item-f2-phuifu" @tap="replyClick" :data-id="item.id" :data-nickname="item.nickname">回复</text></view> -->
+							<!-- <view class="plbox_content-item-f2-pzan" @tap="pzan" :data-id="item.id" :data-index="idx"><image :src="event_rul +'/static/img/static/img/zan-' + (item.iszan==1?'2':'1') + '.png'" class="plbox_content-item-f2-pzan-img"/><text class="plbox_content-item-f2-pzan-txt">{{item.zan}}</text></view> -->
+						</view>
+					</view>
+				</view>
+				</block>
+
+				<view v-if="nomore"><text class="comment-nomore">没有更多数据了</text></view>
+				<view v-if="followNoteList[pinlunIdx].pinglunlist.length == 0"><text class="comment-nodata">暂无评论!</text></view>
+				<view class="" style="display: flex; justify-content: center;align-items: center;" :style="{color: t('color1')}">
+					<view class="" style="display: flex; align-items: center;padding: 10rpx;" @click="toDetail(followNoteList[pinlunIdx].id)" >
+						查看更多
+						<text class="iconfont icon-lujing136" :style="{color: t('color1')}" style="font-size: 40rpx; padding-left: 10rpx;"></text>
+					</view>
+				</view>
+			</scroll-view>
+			<loading v-if="loading"></loading>
+			<view style="height:160rpx"></view>
+			<!-- <view class="plbox-replyshadow" v-if="hfid!=0" @tap.stop="replyshadowClick"></view> -->
+			<view class="pinglun">
+				<image @tap="toggleFaceBox" class="pinglun-faceicon" :src="event_rul + '/static/img/static/img/face-icon.png'"></image>
+				<input @confirm="sendMessage" @focus="onInputFocus" @input="messageChange" class="pinglun-input" confirmHold="true" confirmType="send" cursorSpacing="20" type="text" :value="message" :placeholder="messageholder"/>
+				<view class="pinglun-buybtn" @tap="sendcomment(item)"><text class="pinglun-buybtn-txt">发表</text></view>
+			</view>
+			<wxface v-if="faceshow" @selectface="selectface"></wxface>
+		</view>
+		</view>
+		<loading v-if="loading"></loading>
+		<nomore v-if="!isData"></nomore>
+		<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+		<view class="tsinfo" v-show='!isNote'> 
+		<!--  :style="{'background-image': 'url('+ event_rul +'/static/img/static/icon/9d3ab5fa33dedcde23ba05c8e9cdf999.png)'}" -->
+			<text>发布笔记,让大家开始认识你吧</text>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {	
+			return{
+				navHeight: 0,
+				titleWidth: 0,
+				opt:{},
+				loading:false,
+				isData: true,
+				searchVlaue: '',
+				hearHeight: 0,
+				isShowText: false,
+				fenx: false,
+				shouc: false,
+				addShow:false,
+				pages: 1,
+				interestedList: [], // 感兴趣的人
+				isInterested: true,
+				followNoteList: [], // 关主人的笔记
+				followNotePages: 1,
+				inTWXT: '',
+				pageScroll: 0,  // 页面跳到的位置
+				
+				//评论
+				showcomment:false, 
+				menuindex:-1,
+				pinlunIdx: 0,
+				nomore: false,
+				nodata:false,
+				faceshow: false,
+				pagenum:1,
+				hfid:0,
+				messageholder:'发表评论',
+				message: '',
+				animation:'',
+				isNote:1,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad(opt) {
+			this.opt = app.getopts(opt);
+		   let elemetn
+			// #ifdef MP-WEIXIN
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			uni.getSystemInfo({
+				success: res => {
+					elemetn = res.statusBarHeight
+				}
+			})
+			this.titleWidth = menuButtonInfo.left + 'px'
+			 // #endif
+			// #ifdef MP-WEIXIN
+			this.navHeight = ((menuButtonInfo.bottom + menuButtonInfo.top) - elemetn) + 'px'
+			// console.log(menuButtonInfo,elemetn, 'navheight')
+			// #endif
+			 // #ifndef MP 
+			this.navHeight = 45 + 'px'
+			this.titleWidth = '100vw'
+			 // #endif 
+			 
+
+			 
+			this.getInterested()
+			this.getFollowNote()
+			
+
+		},
+		onReady() {
+			let query = uni.createSelectorQuery().in(this)
+			query.select('.attention-h').boundingClientRect()
+			query.exec(res => {
+				this.hearHeight = res[0].height
+				// console.log(res,  'yuansu------')
+			})
+		},
+		onReachBottom(e) {
+			if(this.isData) {
+				this.getFollowNote()
+			}
+			// console.log(e, '----')
+		},
+		onShareAppMessage:function(){
+			return this._sharewx({title:this.followNoteList[this.pinlunIdx].title,pic:this.followNoteList[this.pinlunIdx].pics[0]});
+		},
+		onShareTimeline:function(){
+			var sharewxdata = this._sharewx({title:this.followNoteList[this.pinlunIdx].title,pic:this.followNoteList[this.pinlunIdx].pics[0]});
+			var query = (sharewxdata.path).split('?')[1];
+			return {
+				title: sharewxdata.title,
+				imageUrl: sharewxdata.imageUrl,
+				query: query
+			}
+		},
+		onPageScroll(e) {
+			this.pageScroll = e.scrollTop
+		},
+		methods:{
+
+			search() {
+				uni.navigateTo({
+					url:'/diary/search/search?keyword='+this.searchVlaue
+				})
+			},
+			
+			toAdd(e){
+				this.addShow = false;
+				
+				uni.navigateTo({
+					url:'/diary/issue/issue?type='+e
+				})
+			},
+			addZero(num) {
+			    return num < 10 ? '0' + num : num;
+			},
+			getTimes(time) {
+				let times = new Date(time*1000)
+				let year = times.getFullYear()
+				let month = this.addZero(times.getMonth() + 1)
+				let date = this.addZero(times.getDate())
+				let hoursys = this.addZero(times.getHours())
+				let minutesys = this.addZero(times.getMinutes())
+				let secondsys = this.addZero(times.getSeconds())
+				
+				let dateNow = new Date().getTime();  // 获取当前时间
+				let timeDiff = dateNow - (time * 1000);  //时间差的毫秒数
+				let days = Math.floor(timeDiff / (24 * 3600 * 1000)); // 计算出天数
+				let leavel1 = timeDiff % (24 * 3600 * 1000); // 计算天数后剩余的时间
+				let hours = Math.floor(leavel1 / (3600 * 1000)); // 计算天数后剩余的小时数
+				let leavel2 = timeDiff % (3600 * 1000); // 计算剩余小时后剩余的毫秒数
+				let minutes = Math.floor(leavel2 / (60 * 1000));
+				// console.log(days, hours,minutes, 'mmmmmmmmmmm999999999999',times)
+				return  days > 0 ? year +'.'+ month +'.'+ date + ' ' +hoursys +':' + minutesys : (24 > hours  &&  hours > 0) ?  hours + '小时前' : minutes > 0 ? minutes + '分钟前'  : '刚刚'
+				
+			},
+			// 详情页
+			toDetail(id){
+				uni.navigateTo({
+					url:'/activity/luntan/detail?id='+id
+				})
+				this.showcomment = false
+			},
+			// 点击关注
+			attention(id, idxs) {
+				app.post('ApiMy/addFollow',{follow_id:id,type:'user'}, res => {
+
+					if(res.msg == '已关注') {
+
+						this.interestedList[idxs].focuds = 0
+						this.$forceUpdate()
+					}else {
+
+						this.interestedList[idxs].focuds = 1
+						this.$forceUpdate()
+					}
+					// console.log(res,this.interestedList, '--关注--')
+				})
+			},
+			// 感兴趣的人
+			getInterested() {
+				this.loading = true
+				app.post('ApiMy/Interested',{pagenum:this.pages}, res => {
+					// console.log(res, 'garen-----')
+					this.isNote = res.isNote
+					if(res.datalist.length > 0) {
+						this.interestedList = [...this.interestedList, ...res.datalist]
+						this.interestedList.forEach((item, idx) => {
+							this.interestedList[idx].focuds = 1
+						})
+						this.pages++
+					}else {
+						this.isInterested = false
+					}
+					this.loading = false
+				})
+			},
+			// 左滑加载更多
+			scrollList(e) {
+				if(this.isInterested) {
+					this.getInterested()
+				}
+				// console.log(e, 'zuohua jiaz ------')
+			},
+			// 关主人的笔记
+			getFollowNote() {
+				this.loading = true
+				app.post('ApiMy/followNote',{pagenum:this.followNotePages}, res => {
+					// console.log(res, 'getFollowNote-----')
+					if(res.datalist.length > 0) {
+						this.followNoteList = [...this.followNoteList, ...res.datalist]
+						this.followNotePages++
+					}else {
+						this.isData = false
+					}
+					this.loading = false
+				})
+			},
+			// 收藏
+			hoarding(id, idx) {
+				app.post('ApiShop/addfavorite',{proid: id,type:'note'}, res => {
+					if (res.msg == '已取消') {
+						this.followNoteList[idx].isfavorite = 0
+						this.followNoteList[idx].favorite_count -= 1
+						
+					}else {
+						this.followNoteList[idx].isfavorite = 1
+						this.followNoteList[idx].favorite_count += 1
+					}
+					// console.log(res, 'hoarding-----')
+				})
+			},
+			// 点赞
+			zan(id, idx) {
+				app.post('ApiLuntan/zan',{id: id}, res => {
+					if(res.type == 1) {
+						this.followNoteList[idx].iszan = 1
+						this.followNoteList[idx].zan += 1
+					}else {
+						this.followNoteList[idx].iszan = 0
+						this.followNoteList[idx].zan -= 1
+					}
+					
+					// console.log(res, 'zan-----')
+				})
+			},
+			// 阻止滑动穿透
+			moveHandle() {
+				return
+			},
+			// 回复
+			replyClick:function(e){
+				var id = e.currentTarget.dataset.id
+				this.message = '';
+				this.hfid = e.currentTarget.dataset.id;
+				this.messageholder = '回复 '+e.currentTarget.dataset.nickname+'：';
+			},
+			// 弹出评论
+			commentClick:function(num){
+				var that = this;
+				this.pinlunIdx = num
+				this.showcomment = !this.showcomment;
+				if(this.showcomment){
+					// this.getcommentlist();
+				}
+			},
+			getmorecomment: function () {
+				this.pagenum = this.pagenum + 1;
+				if(!this.nomore && !this.nodata){
+					this.getcommentlist(true);
+				}
+			},
+	
+			// 评论
+			replyshadowClick:function(){
+				this.hfid = 0;
+				this.message = '';
+				this.messageholder = '发表评论';
+			},
+			// 表情显示
+			toggleFaceBox: function () {
+			  this.faceshow = !this.faceshow
+			},
+			onInputFocus: function (e) {
+			  this.faceshow = false
+			},
+			messageChange: function (e) {
+			  this.message = e.detail.value;
+			  this.trimMessage = e.detail.value.trim();
+			},
+			selectface: function (face) {
+			  this.message = "" + this.message + face;
+					this.trimMessage = this.message.trim();
+			},
+			// 发表评论
+			sendcomment(){
+				let message = this.message;
+				app.showLoading('提交中');
+				app.post('ApiLuntan/subpinglun',{id:this.followNoteList[this.pinlunIdx].id,type:"0",content:message}, res => {
+					app.showLoading(false)
+					if(res.msg == '发表评论成功') {
+						this.followNoteList = []
+						this.followNotePages = 1
+						this.getFollowNote()
+						this.message = '';
+						this.hfid = 0;
+						this.messageholder = '发表评论';
+						this.faceshow = false;
+						this.showcomment = false
+						this.isData = true
+						uni.showToast({
+							title: '发表成功',
+							duration:2000
+						})
+						
+						let id = '#city' + this.pinlunIdx
+						uni.pageScrollTo({
+							selector: id,
+						    duration: 300
+						}, 1000)
+					}else {
+						uni.showModal({
+							title: '提示',
+							content: res.msg,
+							showCancel: false,selector:id
+						});
+					}
+
+					// console.log(res,'gagallllfabbb6666-----' )
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tsinfo{
+		    position: fixed;
+		    right: 140rpx;
+		    top: 66%;
+			z-index: 10;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			height: 76rpx;
+			border-radius: 8rpx;
+			background-size: 100%;
+			background-color: rgba(255,255,255, .8);
+			border: 2rpx solid #0A5D3B;
+			animation: tsinfo 1.2s infinite;
+		text{
+			position: relative;
+			padding:0 16rpx;
+			color: #0A5D3B;
+			font-size: 26rpx;
+			letter-spacing:2rpx;
+		}	
+
+	}
+	.tsinfo::after {
+		content: '';
+		width: 10rpx;
+		height: 10rpx;
+		border-top: 2rpx solid #0A5D3B;
+		border-right: 2rpx solid #0A5D3B;
+		background-color: rgba(255,255,255, .8);
+		position: absolute;
+		top: 50%;
+		right: -8rpx;
+		transform: translateY(-50%) rotate(45deg);
+	}
+
+	.add {
+	width: 100rpx;
+	height: 100rpx;
+	line-height: 100rpx;
+	text-align: center;
+	border-radius: 28rpx;
+	border:6rpx solid #fff;
+	background-image: linear-gradient(to bottom right, #00AE68, #096742);
+	position: fixed;
+	right: 24rpx;
+	top: 65%;
+	}
+	.add:after {
+		content: '';
+		width: 50%;
+		height: 4rpx;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add:before {
+		content: '';
+		width: 4rpx;
+		height: 50%;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add_box{
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		z-index: 9999999;
+	
+		.content{
+			background-color: #fff;
+			padding-bottom: 20rpx;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			.item{
+				padding: 30rpx;
+				// border-bottom: 1px solid red;
+			}
+		}
+	}
+	.attention {
+	
+		.color-gray {
+			color: #999;
+		}
+		.attention-h {
+			width: 100%;
+			background-color: #fff;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 2;
+		}
+		.nav-bar {
+			display: flex;
+			align-items: center;
+			z-index:9;
+			padding: 20rpx 72rpx 20rpx 24rpx;
+			box-sizing: border-box;
+			.nav_max{
+				display: flex;
+				justify-content: space-around;
+				
+			   .item{
+				   display: flex;
+				   align-items: center;
+				   justify-content: center;
+				   flex-direction: column;
+				   font-size: 30rpx;
+					 margin: 0 18rpx;
+				   .txt{
+					   font-size: 32rpx;
+					   color: #333333;
+					   z-index: 2;
+				   }
+				   .n-tv {
+					   color: #999;
+				   }
+				   .heng{
+						bottom: -6rpx;
+					   width: 44rpx;
+					   border-radius: 4rpx;
+					   height: 6rpx;
+					   background-color: #0A5D3B;
+					   
+				   }
+			   }
+			}
+		}
+		.con-hi {
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+			word-wrap: break-word;
+			word-break: break-all;
+		}
+		.attention-scarch {
+			
+			padding-left: 4rpx;
+			.input_box{
+				display: flex;
+				.iconfont{
+					font-size: 50rpx;
+				}
+				input{
+					flex: 1;
+				}
+			
+			}
+		}
+		
+		.swe-h {
+			padding: 20rpx 24rpx;
+		}
+		
+		.swer-list {
+			
+			.scroll-list {
+				width: calc(100% + 24rpx);
+				padding: 0 24rpx;
+				white-space: nowrap;
+				position: relative;
+				.scroll-view-item {
+					width: 260rpx;
+					height: 340rpx;
+					margin-left:20rpx;
+					background-color: #fff;
+					border-radius: 20rpx;
+					display: inline-block;
+					position: relative;
+
+					
+					.scroll-view-item-c {
+						width: 100%;
+						padding: 0 20rpx;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						justify-content: center;
+						position: absolute;
+						top: 50%;
+						left: 50%;
+						transform: translate(-50%, -50%);
+					}
+					
+					.pt {
+						width: 100%;
+						padding-top: 20rpx;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						overflow: hidden;
+						text-align: center;
+					}
+					.scroll-list-img {
+						width: 108rpx;
+						height: 108rpx;
+						border-radius: 300rpx;
+					}
+					
+					.scroll-list-title {
+						font-size: 24rpx;
+						font-weight: bold;
+					}
+					.scroll-list-xq {
+						font-size: 20rpx;
+					}
+					.scroll-list-gz {
+						width: 160rpx;
+						height: 60rpx;
+						font-size: 24rpx;
+						margin-top: 20rpx;
+						color: #fff;
+						border-radius: 200rpx;
+						box-sizing: border-box;
+					}
+					.ygz {
+						border: 2rpx solid #ccc;
+						color: #999;
+					}
+				}
+				.scroll-view-item:first-child {
+					margin-left: 0;
+				}
+			}
+		}
+		
+		.attention-list-box {
+			
+			.attention-list-box-c {
+				width: 100%;
+				padding: 0 24rpx;
+				margin: 20rpx 0;
+				background-color: #fff;
+				
+				.list-box-title {
+					padding: 20rpx 0;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					
+					.list-box-title-l {
+						display: flex;
+						align-items: center;
+						.list-box-img {
+							width: 80rpx;
+							height: 80rpx;
+							border-radius: 300rpx;
+							
+						}
+						.list-box-title-t {
+							padding-left: 20rpx;
+							font-weight: bold;
+						}
+					}
+				}
+				
+				.list-box-img-list {
+					display: flex;
+					flex-wrap: wrap;
+					// justify-content: center;
+					
+					.list-img {
+						width: 226rpx;
+						height: 226rpx;
+						margin-left: calc((100% - 678rpx)/2);
+						border-radius: 10rpx;
+						margin-bottom: 12rpx;
+					}
+					.list-img:nth-child(3n + 1) {
+						margin-left: 0;
+					}
+				}
+				
+				.list-box-tip-c {
+					// display: flex;
+					// justify-content: space-between;
+					// align-items: center;
+					
+					.list-box-tip-c-l {
+						width: 100%;
+						padding: 10rpx 0;
+						overflow-x: scroll;
+						display: flex;
+						white-space: nowrap;	
+						
+						.tip-c-l-cont:first-child{
+							margin-left: 0;
+						}
+						.tip-c-l-cont {
+							padding: 6rpx 0;
+							margin-left: 30rpx;
+							display: flex;
+							align-items: center;
+							
+							.tip-c-l-img {
+								width: 40rpx;
+								height: 40rpx;
+								margin-right: 10rpx;
+								height: 20rpx;
+								border-radius: 50%;
+							}
+							.tip-c-l-img-t {
+								width: 40rpx;
+								height: 40rpx;
+								margin-right: 10rpx;
+								line-height: 40rpx;
+								text-align: center;
+								border-radius: 50%;
+								color: #fff;
+							}
+						}
+
+					}
+					.list-box-tip-c-jia {
+						width: 70rpx;
+						height: 70rpx;
+						line-height: 70rpx;
+						text-align: center;
+						border-radius: 20rpx;
+						position: relative;
+					}
+					.list-box-tip-c-jia:after {
+						content: '';
+						width: 50%;
+						height: 4rpx;
+						background-color: #fff;
+						position: absolute;
+						top: 50%;
+						left: 50%;
+						transform: translate(-50%, -50%);
+					}
+					.list-box-tip-c-jia:before {
+						content: '';
+						width: 4rpx;
+						height: 50%;
+						background-color: #fff;
+						position: absolute;
+						top: 50%;
+						left: 50%;
+						transform: translate(-50%, -50%);
+					}
+				}
+				.tip-c-l-cont-t {
+					margin-top: 12rpx;
+					font-weight: bold;
+				}
+				.list-box-tip-con {
+					padding:20rpx 0 40rpx;
+					// min-height: 80rpx;
+					line-height: 40rpx;
+					position: relative;
+					
+					.con-sw {
+						
+					}
+					
+					.list-box-tip-con-btn {
+						position: absolute;
+						right: 0;
+						bottom: 0;
+						display: flex;
+						
+						.icon-st {
+							padding: 0 6rpx;
+							position: static;
+							font-size: 30rpx;
+						}
+					}
+				}
+				
+				.list-box-tip-bto {
+					display: flex;
+					flex-direction: column;
+					
+					.list-box-tip-bto-title {
+						padding: 20rpx 0;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						.icons-t {
+							font-size: 40rpx;
+						}
+						
+						.bto-title-l {
+							height: 50rpx;
+							line-height: 50rpx;
+							margin: 0;
+							display: flex;
+							align-items: center;
+						}
+						
+						.bto-title-r {
+							display: flex;
+							align-items: center;
+							
+							.bto-title-r-icon {
+								display: flex;
+								align-items: center;
+							}
+						}
+					}
+					
+					.list-box-tip-bto-review {
+						padding: 20rpx;
+						display: flex;
+						flex-direction: column;
+						background-color: #f6f6f6;
+						margin-bottom: 20rpx;
+						border-radius: 10rpx;
+	
+						
+						.bto-review-con {
+							padding: 6rpx 0;
+							display: flex;
+							align-items: center;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							overflow: hidden;
+							
+							.bto-review-titl {
+								font-weight: bold;
+							}
+							
+							.bto-review-tx {
+								// padding-left: 14rpx;
+								// text-overflow: ellipsis;
+								// white-space: nowrap;
+								// overflow: hidden;
+								// word-wrap: break-word;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	// 评论
+	.wxfaceimg {
+		vertical-align: middle;
+	}
+	.pinglun{width:750rpx;padding:0 20rpx;margin:0 auto;display:flex;flex-direction:row;align-items:center;position:absolute;bottom:0;left:0;right:0;height:100rpx;background:#fff;z-index:8;border-top:1px solid #f7f7f7}
+	.pinglun-faceicon {	width:46rpx;height:46rpx;	margin-left: 10rpx;margin-right:18rpx}
+	.pinglun-input{flex:1;color:#000;font-size:32rpx;padding:0;line-height:100rpx}
+	.pinglun-buybtn{margin-left:0.08rpx;background:#FD4A46;height:60rpx;line-height:60rpx;padding:0 30rpx;border-radius:6rpx}
+	.pinglun-buybtn-txt{color:#fff;font-size:28rpx;height:60rpx;line-height:60rpx;}
+
+	.plbox{width:750rpx;height:700rpx;padding:20rpx 20rpx;background:#fff;z-index:6;position:fixed;z-index: 33;left: 0;bottom: 0;}
+	.plbox-show-mk {width: 100%; height: 100%;position: fixed;top: 0;left: 0;background-color: rgba(0, 0, 0, .4);z-index: 9999999;}
+	.plbox-replyshadow{position:absolute;z-index:7;background:rgba(0,0,0,0.4);width:750rpx;flex:1;left:0;right:0;top:0;bottom:0;}
+	.plbox-close{position:absolute;top:10rpx;right:10rpx;z-index:7;width:50rpx;height:50rpx;padding:10rpx;}
+	.plbox_title{height:60rpx;line-height:60rpx;margin-bottom:20rpx;display:flex;flex-direction:row}
+	.plbox_title-t1{font-size:28rpx;color:#000;font-weight:bold}
+	.plbox_title-t2{font-size:28rpx;color:#000;font-weight:bold}
+	.plbox_content{height:500rpx;overflow:scroll;display:flex;}
+	.plbox_content-plcontent{display:flex;flex-direction:row;vertical-align: middle;color:#111}
+	.plbox_content-plcontent-text{ color:#111;font-size:28rpx}
+	.plbox_content-plcontent-image{ width:44rpx;height:44rpx;vertical-align: inherit;}
+	.plbox_content-item{flex:1;margin-bottom:20rpx;display:flex;flex-direction:row}
+	.plbox_content-item-f1{width:80rpx;}
+	.plbox_content-item-f1-img{width:60rpx;height:60rpx;border-radius:50%}
+	.plbox_content-item-f2{flex:1}
+	.plbox_content-item-f2-t1{font-size:28rpx}
+	.plbox_content-item-f2-t2{color:#000;margin:10rpx 0;line-height:60rpx;}
+	.plbox_content-item-f2-t3{display:flex;flex-direction:row;flex:1}
+	.plbox_content-item-f2-t3-x1{color:#999;font-size:26rpx;}
+	.plbox_content-item-f2-t3-x2{flex:1;display:flex;flex-direction:row;}
+	.plbox_content-item-f2-pzan{display:flex;flex-direction:row}
+	.plbox_content-item-f2-pzan-img{width:32rpx;height:32rpx;margin-right:10rpx}
+	.plbox_content-item-f2-pzan-txt{font-size:28rpx;color:#666}
+	.plbox_content-item-f2-phuifu{margin-left:6px;color:#507DAF;font-size:26rpx}
+	.plbox_content-relist{flex:1;background:#f5f5f5;padding:20rpx 20rpx 10rpx 20rpx;margin-bottom:20rpx}
+	.plbox_content-relist-item2{font-size:24rpx;margin-bottom:10rpx}
+	.plbox_content-relist-headimg{width:30rpx;height:30rpx;border-radius:15rpx;margin-right:8rpx}
+	.plbox_content-relist-nickname{color:#333;font-size:24rpx}
+	.plbox_content-relist-f2{margin-top:10rpx}
+	
+	@keyframes tsinfo {
+		0% {transform:  translateX(8rpx);}
+		50% {transform:  translateX(-8rpx);}
+		100% {transform: translateX(8rpx);}
+	}
+</style>
diff --git a/diary/comment/comment.vue b/diary/comment/comment.vue
new file mode 100644
index 0000000..10e6f9f
--- /dev/null
+++ b/diary/comment/comment.vue
@@ -0,0 +1,343 @@
+<template>
+	<view class="container">
+		<view class="content">
+			<view class="item" v-for="(item,index) in datalist" :key='index' @click="toDetail(item)">
+			   <view class="left flex1">
+			   	<view class="l_left" style="width: 80rpx;">
+			   		<image :src="item.headimg" mode=""></image>
+			   	</view>
+				<view class="l_right" style="width: 500rpx;">
+					<view class="p1">
+						{{item.nickname}}
+					</view>
+					<view class="p2">
+						<text>{{item.title}}</text>
+						<text>{{item.create_time}}</text>
+					</view>
+					<view class="p3" style="word-break: break-all; word-wrap: break-word;" v-html='item.content'>
+					</view>
+					<view class="p4">
+						<view class="left" @click.stop="commentClick(item)">
+							<text class="iconfont icon-xiaoxi"></text>
+							回复{{item.type ==1 || item.type ==2?'笔记':'视频' }}
+						</view>
+					<view class="right" @click.stop="zanFn(item)">
+						<text v-if="!item.iszan" class="iconfont icon-aixin"></text>
+						<text v-else style="color:red;" class="iconfont icon-aixin_shixin"></text>
+											
+					</view>
+					</view>
+				</view>
+			   </view>
+			   <view class="right"  style="width: 80rpx;">
+			   	<image :src="item.coverimg" mode=""></image>
+			   </view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+		<view class="plbox-show-mk" v-if="showcomment" @touchmove.stop.prevent="moveHandle">
+			<view class="plbox"  :style="menuindex > -1 ? 'bottom:110rpx':''">
+				<view class="plbox_title"><text class="plbox_title-t1">回复评论</text><text class="plbox_title-t2"></text></view>
+				<image :src="event_rul + '/static/img/static/img/close.png'" class="plbox-close" @tap.stop="commentClick"/>
+				<!-- <loading v-if="loading"></loading> -->
+				<view style="height:160rpx"></view>
+				<!-- <view class="plbox-replyshadow" v-if="hfid!=0" @tap.stop="replyshadowClick"></view> -->
+				<view class="pinglun">
+					<image @tap="toggleFaceBox" class="pinglun-faceicon" :src="event_rul + '/static/img/static/img/face-icon.png'"></image>
+					<input @confirm="sendMessage" @focus="onInputFocus" @input="messageChange" class="pinglun-input" confirmHold="true" confirmType="send" cursorSpacing="20" type="text" :value="message" :placeholder="messageholder"/>
+					<view class="pinglun-buybtn" @tap="sendcomment(item)"><text class="pinglun-buybtn-txt">发表</text></view>
+				</view>
+				<wxface v-if="faceshow" @selectface="selectface"></wxface>
+			</view>	
+		</view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default{
+		data(){
+			return {
+				item:'',
+				loading:false,
+				isload: false,
+				nomore:false,
+				nodata:false,
+				pagenum: 1,
+				datalist:[],
+				showcomment:false,
+				message:'',
+				trimMessage:'',
+				faceshow:false,
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad(){
+			this.getList();
+		},
+		onReachBottom: function () {
+		  if (!this.nodata && !this.nomore) {
+		    this.pagenum = this.pagenum + 1;
+			this.getList()
+		  }
+		},
+		methods:{
+			toDetail(item){
+			let	url = '/activity/luntan/detail'
+				if(item.type == 3 || item.type == 4){
+					url = '/activity/shortvideo/detail'
+				}
+				uni.navigateTo({url:url+'?id='+item.ref_id})
+				
+			},
+			
+			messageChange: function (e) {
+			  this.message = e.detail.value;
+			  this.trimMessage = e.detail.value.trim();
+			},
+			zanFn(item){
+				let url ='/ApiShortvideo/pzan'
+				if(item.type == 1 ||item.type == 2  ){
+					url = 'ApiLuntan/pzan'
+				}
+				app.post(url,{id:item.comment_id},(res)=>{
+					
+					if(item.type == 1 ||item.type == 2  ){
+						item.iszan = res.type
+						console.log(item)
+							
+					}else{
+						item.iszan = res.type
+					}
+					
+				})
+			},
+			// 发表评论
+			sendcomment(){
+				
+				let message = this.message;
+				app.showLoading('提交中');
+				// console.log(;为什么)
+			 let 	url = 'ApiShortvideo/subpinglun';
+			 let data = {id:this.item.ref_id,hfid:this.item.comment_id,content:message,type:1}
+				if(this.item.type == 1 || this.item.type == 2 ){
+					url = 'ApiLuntan/subpinglun'
+					data = {
+						content:message,
+						hfid:this.item.comment_id,
+						userId:app.globalData.mid,
+						id:this.item.ref_id,
+						type:1
+					}
+				}
+				app.post(url,data, res => {
+					app.showLoading(false)
+					if(res.msg == '发表评论成功') {
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
+						this.message = '';
+						this.showcomment = false;
+						// this.followNoteList = []
+						// this.followNotePages = 1
+						// this.getFollowNote()
+						// this.message = '';
+						// this.hfid = 0;
+						// this.messageholder = '发表评论';
+						// this.faceshow = false;
+						// this.showcomment = false
+						// this.isData = true
+						// uni.showToast({
+						// 	title: '发表成功',
+						// 	duration:2000
+						// })
+						
+						// let id = '#city' + this.pinlunIdx
+						// uni.pageScrollTo({
+						// 	selector: id,
+						//     duration: 300
+						// }, 1000)
+					}else {
+						uni.showModal({
+							title: '提示',
+							content: res.msg,
+							showCancel: false,
+						});
+					}
+			
+					// console.log(res,'gagallllfabbb6666-----' )
+				})
+			},
+			commentClick:function(item){
+				var that = this;
+				// this.pinlunIdx = num
+				if(item){
+					that.item = item
+				}
+				this.showcomment = !this.showcomment;
+				// if(this.showcomment){
+					// this.getcommentlist();
+				// }
+			},
+			selectface: function (face) {
+			  this.message = "" + this.message + face;
+					this.trimMessage = this.message.trim();
+			},
+			onInputFocus: function (e) {
+			  this.faceshow = false
+			},
+			// 表情显示
+			toggleFaceBox: function () {
+			  this.faceshow = !this.faceshow
+			},
+			getList(){
+				var that = this;
+				var pagenum = that.pagenum;
+					that.loading = true;
+					that.nomore = false;
+					that.nodata = false;
+				app.post('ApiMy/commentList', {pagenum: pagenum}, function (res) {
+						that.loading = false;
+				  var data = res.datalist;
+				  if (pagenum == 1) {
+				    that.datalist = data;
+				    if (data.length == 0) {
+				      that.nodata = true;
+				    }
+				  }else{
+				    if (data.length == 0) {
+				      that.nomore = true;
+				    } else {
+				      var datalist = that.datalist;
+				      var newdata = datalist.concat(data);
+				      that.datalist = newdata;
+				    }
+				  }
+						that.loaded();
+				});
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.pinglun{width:750rpx;padding:0 20rpx;margin:0 auto;display:flex;flex-direction:row;align-items:center;position:absolute;bottom:0;left:0;right:0;height:100rpx;background:#fff;z-index:8;border-top:1px solid #f7f7f7}
+	.pinglun-faceicon {	width:46rpx;height:46rpx;	margin-left: 10rpx;margin-right:18rpx}
+	.pinglun-input{flex:1;color:#000;font-size:32rpx;padding:0;line-height:100rpx}
+	.pinglun-buybtn{margin-left:0.08rpx;background:#FD4A46;height:60rpx;line-height:60rpx;padding:0 30rpx;border-radius:6rpx}
+	.pinglun-buybtn-txt{color:#fff;font-size:28rpx;height:60rpx;line-height:60rpx;}
+	
+	.plbox{width:750rpx;height:rpx;padding:20rpx 20rpx;background:#fff;z-index:6;position:fixed;z-index: 33;left: 0;bottom: 0;}
+	.plbox-show-mk {width: 100%; height: 100%;position: fixed;top: 0;left: 0;background-color: rgba(0, 0, 0, .4);z-index: 9999999;}
+	.plbox-replyshadow{position:absolute;z-index:7;background:rgba(0,0,0,0.4);width:750rpx;flex:1;left:0;right:0;top:0;bottom:0;}
+	.plbox-close{position:absolute;top:10rpx;right:10rpx;z-index:7;width:50rpx;height:50rpx;padding:10rpx;}
+	.plbox_title{height:60rpx;line-height:60rpx;margin-bottom:20rpx;display:flex;flex-direction:row}
+	.plbox_title-t1{font-size:28rpx;color:#000;font-weight:bold}
+	.plbox_title-t2{font-size:28rpx;color:#000;font-weight:bold}
+	.plbox_content{height:500rpx;overflow:scroll;display:flex;}
+	.plbox_content-plcontent{display:flex;flex-direction:row;vertical-align: middle;color:#111}
+	.plbox_content-plcontent-text{ color:#111;font-size:28rpx}
+	.plbox_content-plcontent-image{ width:44rpx;height:44rpx;vertical-align: inherit;}
+	.plbox_content-item{flex:1;margin-bottom:20rpx;display:flex;flex-direction:row}
+	.plbox_content-item-f1{width:80rpx;}
+	.plbox_content-item-f1-img{width:60rpx;height:60rpx;border-radius:50%}
+	.plbox_content-item-f2{flex:1}
+	.plbox_content-item-f2-t1{font-size:28rpx}
+	.plbox_content-item-f2-t2{color:#000;margin:10rpx 0;line-height:60rpx;}
+	.plbox_content-item-f2-t3{display:flex;flex-direction:row;flex:1}
+	.plbox_content-item-f2-t3-x1{color:#999;font-size:26rpx;}
+	.plbox_content-item-f2-t3-x2{flex:1;display:flex;flex-direction:row;}
+	.plbox_content-item-f2-pzan{display:flex;flex-direction:row}
+	.plbox_content-item-f2-pzan-img{width:32rpx;height:32rpx;margin-right:10rpx}
+	.plbox_content-item-f2-pzan-txt{font-size:28rpx;color:#666}
+	.plbox_content-item-f2-phuifu{margin-left:6px;color:#507DAF;font-size:26rpx}
+	.plbox_content-relist{flex:1;background:#f5f5f5;padding:20rpx 20rpx 10rpx 20rpx;margin-bottom:20rpx}
+	.plbox_content-relist-item2{font-size:24rpx;margin-bottom:10rpx}
+	.plbox_content-relist-headimg{width:30rpx;height:30rpx;border-radius:15rpx;margin-right:8rpx}
+	.plbox_content-relist-nickname{color:#333;font-size:24rpx}
+	.plbox_content-relist-f2{margin-top:10rpx}
+	.container{
+		background-color: #fff;
+		min-height: 100vj;
+	}
+   .content{
+	   padding: 30rpx 40rpx;
+	   .item{
+		   display: flex;
+		   justify-content: space-between;
+		   margin-bottom: 20rpx;
+		   
+		   .left{
+			   display: flex;
+			   .l_left{
+				   image{
+					   width: 60rpx;
+					   height: 60rpx;
+					   border-radius: 60rpx;
+					   border: 1px solid #ccc;
+					   margin-right: 20rpx;
+				   }
+			   }
+			   .l_right{
+				   .p1{
+					   font-weight: bold;
+					   font-size: 28rpx;
+					   margin-bottom: 10rpx;
+				   }
+				   .p2{
+					   color: #666;
+					   margin-bottom: 10rpx;
+					   text{
+						   margin-right: 20rpx;
+						   font-size: 24rpx;
+					   }
+				   }
+				   .p3{
+					   margin-bottom: 10rpx;
+				   }
+				   .p4{
+					   display: flex;
+					   align-items: center;
+					   margin-bottom: 20rpx;
+					   .left{
+						   display: flex;
+						   align-items: center;
+						   height: 40rpx;
+						   border-radius: 40rpx;
+						   background-color: #f2f2f4;
+						   padding: 0 20rpx;
+						   margin-right: 10rpx;
+						   .iconfont{
+							   margin-right: 6rpx;
+							   font-size: 34rpx;
+						   }
+					   }
+					   .right{
+						   width: 40rpx;
+						   height: 40rpx;
+						   border-radius: 40rpx;
+						   display: flex;
+						   align-items: center;
+						   justify-content: center;
+						   background-color: #f2f2f4;
+						   .iconfont{
+							   // font-size: 2rpx;
+						   }
+					   }
+					
+				   }
+			   }
+		   }
+		   .right{
+			   image{
+				   width: 80rpx;
+				   height: 80rpx;
+				   border-radius: 10rpx;
+			   }
+		   }
+	   }
+   }
+</style>
diff --git a/diary/evernote/evernote.vue b/diary/evernote/evernote.vue
new file mode 100644
index 0000000..e7b5472
--- /dev/null
+++ b/diary/evernote/evernote.vue
@@ -0,0 +1,402 @@
+<template>
+	<view class="container">
+	
+		<view class="attention-h">
+			<view class="nav-bar">
+				<view class="nav_max" :style="{'width': titleWidth}">
+					<view class="attention-scarch flex al-item-center">
+						<view class="input_box"  @click="goto" data-url='/diary/search/search'>
+						  <text  class="iconfont icon-search"></text>	
+						 <!-- <input disabled=""  placeholder="大家都在搜..." type="text" /> -->
+						</view>
+					</view>
+					<view class="flex flex1 j-center">
+						<view class="item position-r" @tap="goto" data-url='/diary/attention/attention' data-opentype="redirectTo">
+							<text class="txt n-tv">关注</text>
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/evernote/evernote' data-opentype="redirectTo">
+							<text class="txt font-w">笔记</text>
+							<text class="heng position-a"></text>
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/video/video' data-opentype="redirectTo">
+							<text class="txt n-tv">视频</text>
+						</view>
+						<!-- #ifdef MP -->
+						<view class="item position-r" @tap="goto" data-url='/diary/live/live' data-opentype="redirectTo">
+							<text class="txt n-tv">直播</text>
+						</view>
+						<!-- #endif -->
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="" :style="{'height': hearHeight + 'px'}"></view>
+		<view class="info_box">
+			<view class="list_box">
+				<view class="content">				
+					<diary-falls-list @listZanFn='listZanFn' :datalist='datalist' v-if="datalist && datalist.length>0"> </diary-falls-list>
+					<nomore text="没有更多内容了" v-if="nomore"></nomore>
+					<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+					
+				</view>
+			</view>
+		</view>
+		<view :style="{'background-color': t('color1')}" class="add" @click=" addFn">
+		</view>
+		<view class="add_box" @click="addShow = false" v-if="addShow">
+			<view class="content" @click.stop="">
+				<view class="item" @click="toAdd('diary')">
+				发布笔记
+				</view>
+				<view class="item" @click="toAdd('video')">
+				发布视频 
+				</view>
+				<view class="item" @click="addShow= false">
+				取消
+				</view>
+			</view>
+		</view>
+		<dp-tabbar></dp-tabbar>
+		<view class="tsinfo"  v-show='!info.isNote' >
+			<!-- :style="{'background-image': 'url('+ event_rul +'/static/img/static/icon/9d3ab5fa33dedcde23ba05c8e9cdf999.png)'}" -->
+			<text>发布笔记,让大家开始认识你吧</text>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default{
+		onLoad() {
+			let elemetn
+			// #ifdef MP-WEIXIN
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			uni.getSystemInfo({
+				success: res => {
+					elemetn = res.statusBarHeight
+				}
+			})
+			this.titleWidth = menuButtonInfo.left + 'px'
+			 // #endif
+			// #ifdef MP-WEIXIN
+			this.navHeight = ((menuButtonInfo.bottom + menuButtonInfo.top) - elemetn) + 'px'
+			// console.log(menuButtonInfo,elemetn,this.titleWidth, 'navheight')
+			// #endif
+			 // #ifndef MP 
+			this.navHeight = 45 + 'px'
+			this.titleWidth = '100vw'
+			 // #endif 
+			this.getRecList	()
+		
+		},
+		onReady() {
+			let query = uni.createSelectorQuery().in(this)
+			query.select('.attention-h').boundingClientRect()
+			query.exec(res => {
+				this.hearHeight = res[0].height
+			})
+		},
+		onShow(){
+			this.getInfo()
+		},
+		data(){
+			return{
+				hearHeight:0,
+				navHeight: 0,
+				titleWidth: 0,
+				addShow:false,
+				info:{
+					isNote:1,
+				},
+				pagenum:1,
+				keyword:'',
+				loading:false,
+				isload: false,
+				nomore:false,
+				nodata:false,
+				datalist:[],
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		 onReachBottom: function () {
+		   if (!this.nodata && !this.nomore) {
+		     this.pagenum = this.pagenum + 1;
+		 	 this.getRecList()
+		   }
+		 },
+		methods:{
+
+			listZanFn(e){
+				this.datalist[e.index].iszan = e.show;
+				if(this.datalist[e.index].binfo){
+					this.datalist[e.index].zan_num = e.num;
+				}else{
+					this.datalist[e.index].zan = e.num;
+				}
+			
+			},
+			addFn(){
+				if(app.globalData.mid == 0){
+					uni.showModal({
+						title: '提示',
+						content: '发布需要先登录',
+						success: function (res) {
+							if (res.confirm) {
+								app.goto('/pages/index/login')
+							} else if (res.cancel) {
+								
+							}
+						}
+					});
+				}else{
+					this.addShow= true
+				
+				}
+			},
+			searchFn(){
+				uni.navigateTo({
+					url:'/diary/search/search?keyword='+this.keyword
+				})
+			},
+			toAdd(e){
+				this.addShow = false;
+				
+				uni.navigateTo({
+					url:'/diary/issue/issue?type='+e
+				})
+			},
+	
+			resetList(){
+				this.pagenum = 1;
+				this.getRecList()
+				
+			},
+
+			getRecList() {
+				let that = this;
+			    var page = that.pagenum;
+				that.loading = true;
+				that.nomore = false;
+				that.nodata = false;
+			   app.get('ApiZhiwei/appNotVideoListIndex', {page: page,type_field:1,type:1}, function (res) {
+				 that.loading = false;
+			     var data = res.data;
+			     if (page == 1) {
+			       that.datalist = data;
+			       if (data.length == 0) {
+			         that.nodata = true;
+			       }
+			     }else{
+			       if (data.length == 0) {
+			         that.nomore = true;
+			       } else {
+			         var datalist = that.datalist;
+			         var newdata = datalist.concat(data);
+			         that.datalist = newdata;
+			       }
+			     }
+				  	that.loaded();
+			   });
+			 },
+			getInfo(){
+				app.post('ApiZhiwei/appIndex',{},(res)=>{
+					this.info = res.data
+				})
+			},
+			
+		},
+	}
+</script>
+
+<style lang="scss">
+	.tsinfo{
+		    position: fixed;
+		    right: 140rpx;
+		    top: 66%;
+			z-index: 10;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			height: 76rpx;
+			border-radius: 8rpx;
+			background-size: 100%;
+			background-color: rgba(255,255,255, .8);
+			border: 2rpx solid #0A5D3B;
+			animation: tsinfo 1.2s infinite;
+		text{
+			position: relative;
+			padding:0 16rpx;
+			color: #0A5D3B;
+			font-size: 26rpx;
+			letter-spacing:2rpx;
+		}
+	}
+	
+	.tsinfo::after {
+		content: '';
+		width: 10rpx;
+		height: 10rpx;
+		border-top: 2rpx solid #0A5D3B;
+		border-right: 2rpx solid #0A5D3B;
+		background-color: rgba(255,255,255, .8);
+		position: absolute;
+		top: 50%;
+		right: -8rpx;
+		transform: translateY(-50%) rotate(45deg);
+	}
+	
+	.nav-bar{
+		display: flex;
+		align-items: center;
+		z-index:9;
+		padding: 20rpx 72rpx 20rpx 24rpx;
+		box-sizing: border-box;
+	}
+	.attention-h {
+		width: 100%;
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 3;
+	}
+
+	.add {
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		border-radius: 28rpx;
+		border:6rpx solid #fff;
+		background-image: linear-gradient(to bottom right, #00AE68, #096742);
+		position: fixed;
+		right: 20rpx;
+		top: 65%;
+	}
+	.add:after {
+		content: '';
+		width: 50%;
+		height: 4rpx;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add:before {
+		content: '';
+		width: 4rpx;
+		height: 50%;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add_box{
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		z-index: 9999999;
+	
+		.content{
+			background-color: #fff;
+			padding-bottom: 20rpx;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			.item{
+				padding: 30rpx;
+				// border-bottom: 1px solid red;
+			}
+		}
+	}
+	.list_box{
+	.content{
+		padding: 20rpx;
+		// margin-top: 20rpx;
+		background-color: #f8f9fa;
+		.nav_min{
+			display: flex;
+			margin-bottom: 20rpx;
+			.item{
+				margin-right: 20rpx;
+			}
+			.itemz{
+				font-weight: bold;
+			}
+		}
+	}
+	}
+	.nav_max{
+		display: flex;
+		justify-content: space-around;
+       .item{
+		   display: flex;
+		   align-items: center;
+		   justify-content: center;
+		   flex-direction: column;
+		   font-size: 30rpx;
+			 margin: 0 18rpx;
+		   .txt{
+			   font-size: 32rpx;
+			   color: #333333;
+			   z-index: 2;
+		   }
+		   .n-tv {
+			   color: #999;
+		   }
+		   .heng{
+			   bottom: -6rpx;
+			   width: 44rpx;
+			   border-radius: 4rpx;
+			   height: 6rpx;
+			   background-color: #0A5D3B;
+			   
+		   }
+	   }
+	}
+	
+	.info_box{
+
+		.content {
+			
+		}
+	}
+	.attention-scarch {
+		
+		padding-left: 4rpx;
+	}
+	.input_box{
+		display: flex;
+	
+		.iconfont{
+			font-size: 50rpx;
+		}
+		input{
+			flex: 1;
+		}
+	
+	}
+	.container{
+		background-color: #fff;
+		min-height: 100vh;
+	}
+	
+	@keyframes tsinfo {
+		0% {transform:  translateX(8rpx);}
+		50% {transform:  translateX(-8rpx);}
+		100% {transform: translateX(8rpx);}
+	}
+</style>
diff --git a/diary/index/index.vue b/diary/index/index.vue
new file mode 100644
index 0000000..915926e
--- /dev/null
+++ b/diary/index/index.vue
@@ -0,0 +1,601 @@
+<template>
+	<view class="container">
+	
+	<view class="attention-h">
+		<view class="nav-bar" :style="{'height': navHeight}">
+			<view style="width: 70%; margin-bottom:4px; height: 32px; justify-content: space-around;" class="nav_max">
+				<view class="attention-scarch flex al-item-center">
+					<view class="input_box"  @click="goto" data-url='/diary/search/search'>
+					  <text  class="iconfont icon-search"></text>	
+					 <!-- <input disabled=""  placeholder="大家都在搜..." type="text" /> -->
+					</view>
+				</view>
+				<view class="item position-r" @tap="goto" data-url='/diary/attention/attention' data-opentype="redirectTo">
+					<text class="txt n-tv">关注</text>
+				</view>
+				<view class="item position-r" @tap="goto" data-url='/diary/index/index' data-opentype="redirectTo">
+					<text class="txt">推荐</text>
+					<text class="heng position-a"></text>
+				</view>
+				<view class="item position-r" @tap="goto" data-url='/diary/live/live' data-opentype="redirectTo">
+					<text class="txt n-tv">直播</text>
+					<!-- <text class="heng"></text> -->
+				</view>
+			</view>
+		</view>
+
+	</view>
+
+		<view class="" :style="{'height': hearHeight + 'px'}"></view>
+		<view class="swiper_box">
+			<swiper style="width: 100%; height: 100%;" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
+				<swiper-item @click="goto" :data-url='item.page_url'  v-for="(item,index) in info.banner_list" :key='index'> 
+					<image :src="item.pic_url" mode=""></image>
+				</swiper-item>
+			
+			</swiper>
+	
+		</view>
+		
+		<view class="nav_box">
+			<!-- <view class="item">
+				<text class="iconfont icon-icon--"></text>
+				<text>烹饪教程</text>
+			</view>
+			<view class="item">
+				<text style="background-color: #efcb6f;" class="iconfont icon-shucai"></text>
+				<text>怎么选菜</text>
+			</view> -->
+			<view class="item" @click="toCenter(item.id)" v-for="(item,index) in info.top_tab" :key='index'>
+				<text :style="{'background-color':colors[index%3].color}"  :class="'iconfont '+colors[index%3].icofont "></text>
+				
+				<text class="txt">{{item.topic_name}}</text>
+			</view>
+		</view>
+		<view class="info_box">
+			<view class="title_box">
+				<view class="left">
+					热门话题
+				</view>
+				<view class="right" style="display: flex; align-items: center;" @click="goto" data-url='/diary/topic/plaza'>
+				<text>话题广场</text>  <text class="iconfont icon-arrow-right"></text>
+				</view>
+			</view>
+			<view class="scroll_box">
+				<scroll-view scroll-x="true" >
+				<view style="display: flex;">
+					<view class="item" @click="toCenter(item.id)" v-for="(item,index) in info.top_hot" :key='index'>
+						<view class="top">
+							<image :src="item.topic_pic" mode=""></image>
+						</view>
+						<view class="bot">
+							<text class="icon">#</text>
+							<text class="txt">{{item.topic_name}}</text>
+						</view>
+					</view>
+				</view>
+				</scroll-view>
+			</view>
+			<view class="list_box">
+				<view class="nav_max">
+					<view class="item" @click="recTypeFn(1)">
+						<text class="txt">笔记</text>
+						<text class="heng" v-if="recType == 1"></text>
+						<text v-else style="height:8rpx;width:1rpx; margin-top:-10rpx;"></text>
+					</view>
+					<view class="item" @click="recTypeFn(2)">
+						<text class="txt">视频</text>
+						<text class="heng" v-if="recType == 2"></text>
+						<text v-else style="height:8rpx;width:1rpx; margin-top:-10rpx;"></text>
+					</view>
+				</view>
+				<view class="content">
+					
+					<view class="nav_min">
+						<view class="item " @click="recType_filedFn(1)" :class="{'itemz':recType_filed == 1}">
+							综合
+						</view>
+						<view class="item" @click="recType_filedFn(2)"  :class="{'itemz':recType_filed == 2}">
+							最热
+						</view>
+						<view class="item" @click="recType_filedFn(3)"  :class="{'itemz':recType_filed == 3}">
+							最新
+						</view>
+					</view>
+					
+					<diary-falls-list @listZanFn='listZanFn' :datalist='datalist' v-if="datalist && datalist.length>0" :navType="recType == 2 ? 'video' : ''"> </diary-falls-list>
+					
+					<nomore text="没有更多内容了" v-if="nomore"></nomore>
+					<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+					
+				</view>
+			</view>
+		</view>
+		<view :style="{'background-color': t('color1')}" class="add" @click=" addFn">
+		</view>
+		<view class="add_box" @click="addShow = false" v-if="addShow">
+			<view class="content" @click.stop="">
+				<view class="item" @click="toAdd('diary')">
+				发布笔记
+				</view>
+				<view class="item" @click="toAdd('video')">
+				发布视频 
+				</view>
+				<view class="item" @click="addShow= false">
+				取消
+				</view>
+			</view>
+		</view>
+		<dp-tabbar></dp-tabbar>
+		<view class="tsinfo"  v-show='!info.isNote' >
+			<!-- :style="{'background-image': 'url('+ event_rul +'/static/img/static/icon/9d3ab5fa33dedcde23ba05c8e9cdf999.png)'}" -->
+			<text>发布笔记,让大家开始认识你吧</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default{
+		onLoad() {
+			let elemetn
+			// #ifdef MP-WEIXIN
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			uni.getSystemInfo({
+				success: res => {
+					elemetn = res.statusBarHeight
+				}
+			})
+			 // #endif
+			// #ifdef MP-WEIXIN
+			this.navHeight = ((menuButtonInfo.bottom + menuButtonInfo.top) - elemetn) + 'px'
+			// console.log(menuButtonInfo,elemetn, 'navheight')
+			// #endif
+			 // #ifndef MP 
+			this.navHeight = 60 + 'px'
+			 // #endif 
+			this.getRecList	()
+		
+		},
+		onReady() {
+			let query = uni.createSelectorQuery().in(this)
+			query.select('.attention-h').boundingClientRect()
+			query.exec(res => {
+				this.hearHeight = res[0].height
+			})
+		},
+		onShow(){
+		this.getInfo()
+			
+			 
+		},
+		data(){
+			return{
+				
+				hearHeight:0,
+				navHeight: 0,
+				colors:[
+					{
+					color:'#dbde5d',
+					icofont:'icon-icon--',
+				},
+				{
+					color:'#f0cd6e',
+					icofont:'icon-shucai',
+				},
+				{
+					color:'#fcb84c',
+					icofont:'icon-new',
+				},
+				],
+				addShow:false,
+				recType:1,
+				recType_filed:1,
+				info:{
+					isNote:1,
+				},
+				pagenum:1,
+				keyword:'',
+				loading:false,
+				isload: false,
+				nomore:false,
+				nodata:false,
+				datalist:[],
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		 onReachBottom: function () {
+		   if (!this.nodata && !this.nomore) {
+		     this.pagenum = this.pagenum + 1;
+		 	 this.getRecList()
+		   }
+		 },
+		methods:{
+
+				listZanFn(e){
+				this.datalist[e.index].iszan = e.show;
+				if(this.datalist[e.index].binfo){
+this.datalist[e.index].zan_num = e.num;
+}else{
+this.datalist[e.index].zan = e.num;
+}
+			
+			},
+			addFn(){
+				if(app.globalData.mid == 0){
+					uni.showModal({
+						title: '提示',
+						content: '发布需要先登录',
+						success: function (res) {
+							if (res.confirm) {
+								// console.log('用户点击确定');
+								// uni.navigateTo({
+								// 	url:'/pages/index/login',
+								// })
+								app.goto('/pages/index/login')
+								console.log(app)
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}else{
+					this.addShow= true
+				
+				}
+			},
+			searchFn(){
+				uni.navigateTo({
+					url:'/diary/search/search?keyword='+this.keyword
+				})
+			},
+			toAdd(e){
+				this.addShow = false;
+				
+				uni.navigateTo({
+					url:'/diary/issue/issue?type='+e
+				})
+			},
+			recType_filedFn(e){
+				this.recType_filed = e;
+				this.resetList();
+			},
+			recTypeFn(e){
+				this.recType = e;
+				this.resetList(0)
+			},
+			resetList(){
+				this.pagenum = 1;
+				this.getRecList()
+				
+			},
+			toCenter(id){
+		 		uni.navigateTo({
+					url:'/diary/topic/topic?id='+id
+				})
+			},
+			getRecList() {
+				let that = this;
+			   var page = that.pagenum;
+				  			that.loading = true;
+				  			that.nomore = false;
+				  			that.nodata = false;
+			   app.get('ApiZhiwei/appNotVideoListIndex', {page: page,type_field:this.recType_filed,type:this.recType}, function (res) {
+				  				that.loading = false;
+			     var data = res.data;
+			     if (page == 1) {
+			       that.datalist = data;
+			       if (data.length == 0) {
+			         that.nodata = true;
+			       }
+			     }else{
+			       if (data.length == 0) {
+			         that.nomore = true;
+			       } else {
+			         var datalist = that.datalist;
+			         var newdata = datalist.concat(data);
+			         that.datalist = newdata;
+			       }
+			     }
+				  				that.loaded();
+			   });
+			 },
+			getInfo(){
+				app.post('ApiZhiwei/appIndex',{},(res)=>{
+					this.info = res.data
+				})
+			},
+			
+		},
+	}
+</script>
+
+<style lang="scss">
+	.tsinfo{
+		    position: fixed;
+		    right: 140rpx;
+		    top: 51%;
+			z-index: 10;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			height: 76rpx;
+			border-radius: 8rpx;
+			background-size: 100%;
+			background-color: rgba(255,255,255, .8);
+			border: 2rpx solid #0A5D3B;
+			animation: tsinfo 1.2s infinite;
+		text{
+			position: relative;
+			padding:0 16rpx;
+			color: #0A5D3B;
+			font-size: 26rpx;
+			letter-spacing:2rpx;
+		}
+	}
+	
+	.tsinfo::after {
+		content: '';
+		width: 10rpx;
+		height: 10rpx;
+		border-top: 2rpx solid #0A5D3B;
+		border-right: 2rpx solid #0A5D3B;
+		background-color: rgba(255,255,255, .8);
+		position: absolute;
+		top: 50%;
+		right: -8rpx;
+		transform: translateY(-50%) rotate(45deg);
+	}
+	
+	.nav-bar{
+		display: flex;
+		align-items: flex-end;
+		z-index:9;
+	}
+	.attention-h {
+		width: 100%;
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 3;
+	}
+
+	.add {
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		border-radius: 28rpx;
+		border:6rpx solid #fff;
+		background-image: linear-gradient(to bottom right, #00AE68, #096742);
+		position: fixed;
+		right: 20rpx;
+		top: 50%;
+	}
+	.add:after {
+		content: '';
+		width: 50%;
+		height: 4rpx;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add:before {
+		content: '';
+		width: 4rpx;
+		height: 50%;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add_box{
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		z-index: 9999999;
+	
+		.content{
+			background-color: #fff;
+			padding-bottom: 20rpx;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			.item{
+				padding: 30rpx;
+				// border-bottom: 1px solid red;
+			}
+		}
+	}
+	.list_box{
+	.content{
+		padding: 20rpx;
+		margin-top: 20rpx;
+		background-color: #f8f9fa;
+		.nav_min{
+			display: flex;
+			margin-bottom: 20rpx;
+			// padding: 2;
+			.item{
+				margin-right: 20rpx;
+			}
+			.itemz{
+				font-weight: bold;
+			}
+		}
+	}
+	}
+	.nav_max{
+		display: flex;
+		justify-content: space-around;
+		// height: 32px;
+       .item{
+		   display: flex;
+		   align-items: center;
+		   justify-content: center;
+		   flex-direction: column;
+		   font-size: 30rpx;
+		   // font-weight: bold;
+		   padding: 0 20rpx;
+		   .txt{
+			   font-size: 32rpx;
+			   color: #333333;
+			   z-index: 2;
+		   }
+		   .n-tv {
+			   color: #999;
+		   }
+		   .heng{
+			   // z-index: 1;
+			   // margin-top: 4rpx;
+			   bottom: 0;
+			   width: 44rpx;
+			   border-radius: 4rpx;
+			   height: 6rpx;
+			   background-color: #0A5D3B;
+			   
+		   }
+	   }
+	}
+	
+	.info_box{
+		.scroll_box{
+			padding: 20rpx;
+			.item{
+				display: flex;
+				
+                flex-direction: column;
+				margin-right: 20rpx;
+				width: 300rpx;
+				.top{
+					width: 300rpx;
+					height: 160rpx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.bot{
+					font-size: 30rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					padding: 20rpx;
+					.icon{
+						width: 40rpx;
+						height: 40rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						border-radius: 40rpx;
+						font-size: 26rpx;
+						background-color: #efbe71;
+						color: #fff;
+					}
+					.txt{
+						width: 200rpx;
+						  overflow: hidden; /*超出长度的文字隐藏*/
+						           text-overflow:ellipsis;/*文字隐藏以后添加省略号*/
+					            white-space: nowrap; /*强制不换行*/
+					}
+				}
+				
+			}
+		}
+.title_box{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 20rpx;
+	.left{
+		font-size: 34rpx;
+		font-weight: bold;
+	}
+	.right{
+		color: #999;
+		.iconfont{
+			// margin-top: 4rpx;
+		}
+	
+	}
+}		
+	}
+	.nav_box{
+		display: flex;
+	    
+		justify-content: space-around;
+		.item{
+			width: 33%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			     white-space: nowrap;      /*超出的空白区域不换行*/
+			        overflow: hidden;         /*超出隐藏*/
+			        text-overflow: ellipsis;  /*文本超出显示省略号*/
+			.iconfont {
+				width: 80rpx;
+				background-color: #d9dc5d;
+				border-radius: 80rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 80rpx;
+				font-size: 56rpx;
+				color: #fff;
+				margin-bottom: 14rpx;
+			}
+			.txt{
+				width: 100%;
+				text-align: center;
+				white-space: nowrap;      /*超出的空白区域不换行*/
+				   overflow: hidden;         /*超出隐藏*/
+				   text-overflow: ellipsis;  /*文本超出显示省略号*/
+			}
+		}
+	}
+	.swiper_box{
+		width: 100%;
+		height: 280rpx;
+		margin-bottom: 20rpx;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.input_box{
+		display: flex;
+	
+		.iconfont{
+			font-size: 50rpx;
+		}
+		input{
+			flex: 1;
+		}
+	
+	}
+	.container{
+		background-color: #fff;
+		min-height: 100vh;
+	}
+	
+	@keyframes tsinfo {
+		0% {transform:  translateX(8rpx);}
+		50% {transform:  translateX(-8rpx);}
+		100% {transform: translateX(8rpx);}
+	}
+</style>
diff --git a/diary/info/info.vue b/diary/info/info.vue
new file mode 100644
index 0000000..d00de30
--- /dev/null
+++ b/diary/info/info.vue
@@ -0,0 +1,624 @@
+<template>
+	<view class="container">
+		<view class="head_box" :style="{'background-image': 'url('+ event_rul +'/static/images/userinfo-bg.png)'}">		
+			<view class="info_box">
+				<text @click="goback" class="top_left iconfont icon-icon_arrow_left"></text>
+				<view class="left">
+					<view class="l_left">
+						<image style="width: 100%;height: 100%;" :src="info.headimg" mode=""></image>
+					</view>
+					<view class="l_right">
+						<view class="p1">
+							{{info.nickname||''}}
+						</view>
+						<view class="p2">
+							ID: {{info.id||''}}
+						</view>
+						<view class="p3">
+							简介: {{info.autograph||''}}
+						</view>
+					</view>
+				</view>
+				<view :style="{'background':info.is_member_follow?'#FFFFFF':'','color':info.is_member_follow?'#0a5d3b':'#FFF'}" class="right" @click="Follow" v-if="!myShow">
+					{{info.is_member_follow?'已关注':'关注'}}
+				</view>
+				<view class="right1" @click="goto" data-url='/newOtherPages/editProfile/editProfile' v-if="myShow">
+					<!-- {{info.is_member_follow?'已关注':'关注'}}b -->
+					编辑资料
+				</view>
+			</view>
+			<view class="count_box">
+				<view class="item"  @click="goto" :data-url='!myShow?"":"/newOtherPages/myInterest/index"'>
+					<view class="top">
+						{{info.followCount||'0'}}
+					</view>
+					<view class="bottom">
+						关注
+					</view>
+				</view>
+				<view class="item" @click="goto" :data-url='!myShow?"":"/newOtherPages/myFans/myFans"'>
+					<view class="top">
+						{{info.fans_count||'0'}}
+					</view>
+					<view class="bottom">
+						粉丝
+					</view>
+				</view>
+				<view v-if="myShow" class="item" @tap="goto" data-url="/diary/comment/comment">
+					<view class="top">
+						{{info.comment_count||'0'}}
+					</view>
+					<view class="bottom">
+						评论
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						{{info.zan_count||'0'}}
+					</view>
+					<view class="bottom">
+						获赞
+					</view>
+				</view>
+			</view>
+
+			<view class="nav_max">
+				<view class="item" @click="recTypeFn(1)">
+					<view class="txt" :class="{'actived': recType == 1}">笔记</view>
+				</view>
+				<view class="item" @click="recTypeFn(2)">
+					<view class="txt"  :class="{'actived': recType == 2}">视频</view>
+				</view>
+				<view v-if="myShow" class="item" @click="recTypeFn(3)">
+					<view class="txt"  :class="{'actived': recType == 3}">收藏</view>
+				</view>
+				<view v-if="myShow" class="item" @click="recTypeFn(4)">
+					<view class="txt"  :class="{'actived': recType == 4}">赞过</view>
+				</view>
+			</view>
+		</view>
+		<view class="content" style="padding: 20rpx;"  v-if="recType == 1 || recType == 2">
+			<view class="min_nav" v-if="myShow">
+				<view class="item" @click="navNoteTab('1')" :class="{'itemz':navNoteType == '1'}">
+					已发布
+				</view>
+				<view class="item" @click="navNoteTab('0')" :class="{'itemz':navNoteType == '0'}">
+					待审核
+				</view>
+				<view class="item" @click="navNoteTab('2')" :class="{'itemz':navNoteType == '2'}">
+					被驳回
+				</view>
+				<view class="item" @click="navNoteTab('3')" :class="{'itemz':navNoteType == '3'}">
+					草稿箱
+				</view>
+			</view>
+			
+			<diary-falls-list @listZanFn='listZanFn' :datalist='datalist' @delDrafts="delDrafts" :navNoteType="navNoteType" v-if="datalist && datalist.length>0" :navType="recType == 2 ? 'video' : 'note'">
+			</diary-falls-list>
+			<nomore text="没有更多内容了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关内容" v-if="nodata && !myShow"></nodata>
+			<nodata text="一键秀出你的品味健康生活" v-if="nodata && myShow"></nodata>
+			<view class="btn" v-if="nodata && myShow && recType == 1" @click="goto" :data-url="'/diary/issue/issue?type=note'" >
+				去发布
+			</view>
+			<view class="btn" v-if="nodata && myShow && recType == 2" @click="goto" :data-url="'/diary/issue/issue?type=video'" >
+				去发布
+			</view>
+		</view>
+		<view class="content" v-if="recType == 3" style="padding: 20rpx;">
+			<view class="min_nav">
+				<view class="item" @click="navTab('shop')" :class="{'itemz':navType == 'shop'}">
+					商品
+				</view>
+				<view class="item" @click="navTab('note')" :class="{'itemz':navType == 'note'}">
+					笔记
+				</view>
+				<view class="item" @click="navTab('video')" :class="{'itemz':navType == 'video'}">
+					视频
+				</view>
+
+			</view>
+			<diary-falls-list @listZanFn='listZanFn' :datalist='datalist' v-if="datalist && datalist.length>0&&navType != 'shop'" @shopdel="delShop" :navType="navType" :recType="recType">
+			</diary-falls-list>
+			<dp-product-item  v-if="navType == 'shop'" @shopdel="delShop" :data="datalist" types='cart' navType="shop" :menuindex="-1"></dp-product-item>
+	
+			<nomore text="没有更多内容了" v-if="nomore"></nomore>
+			<nodata :text="navType == 'shop'?'还未收藏商品':navType=='video'?'还未收藏视频':'还未收藏笔记'" v-if="nodata"></nodata>
+			<view class="btn" v-if="nodata && myShow &&navType == 'shop'" @click="goto" data-url='/pages/shop/classify' >
+				去挑选
+			</view>
+			<view class="btn" v-if="nodata && myShow&&navType != 'shop'" @click="goto" data-url='/diary/index/index' >
+				去看看
+			</view>
+		</view>
+		<view class="content" v-if="recType == 4" style="padding: 24rpx;">
+			<view class="min_nav">
+				<view class="item" @click="navTab('note')" :class="{'itemz':navType == 'note'}">
+					笔记
+				</view>
+				<view class="item" @click="navTab('video')" :class="{'itemz':navType == 'video'}">
+					视频
+				</view>
+			<!-- 	<view class="item" @click="navTab('shop')" :class="{'itemz':navType == 'shop'}">
+					商品·15
+				</view> -->
+			</view>
+			
+			<diary-falls-list @listZanFn='listZanFn' :datalist='datalist' v-if="datalist && datalist.length>0" :navType="navType" :recType="recType">
+			</diary-falls-list>
+			
+			
+			
+			
+			<nomore text="没有更多内容了" v-if="nomore"></nomore>
+			<!-- <nodata text="没有查找到相关内容" v-if="nodata"></nodata> -->
+			<nodata :text="navType == 'shop'?'还未赞过商品':navType=='video'?'还未赞过视频':'还未赞过笔记'" v-if="nodata"></nodata>
+			<view class="btn" v-if="nodata && myShow " @click="goto" data-url='/diary/index/index' >
+				去看看
+			</view>
+	
+			
+		</view>
+		<view class="del-mdl" v-show="delModle" @touchmove.stop.prevent="() => {return true}">
+			<view class="del-msk"></view>
+			<view class="del-cont-bx bg-color-white flex flex-colum">
+				<view class="del-tx flex flex1 al-item-center j-center">{{delModleTex}}</view>
+				<view class="del-btn flex j-between">
+					<button class="btn-l" @tap.stop="canlDel">取消</button>
+					<button class="btn-r" @tap.stop="confirmDel">确定</button>
+				</view>
+			</view>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				
+				id: '',
+				myShow: false,
+				
+				navNoteType: '1',
+				info: {},
+				navType:'note',
+				recType: 1,
+				pagenum: 1,
+				loading: false,
+				isload: false,
+				nomore: false,
+				nodata: false,
+				datalist: [],
+				
+				event_rul: app.globalData.event_url,
+				
+				delModle: false,
+				delModleTex: '',
+				delModleId: null,
+				delModleType: '',
+			}
+		},
+		onLoad(opt) {
+			this.id = opt.id ||app.globalData.mid;
+			this.recType = opt.type ||1;
+			if(this.recType == 3) {
+				this.navType = 'shop'
+			}
+			this.getRecList()
+			this.getInfo()
+		},
+		onShow() {
+			if (app.globalData.mid == this.id) {
+				this.myShow = true;
+			}
+			this.pagenum = 1
+			this.datalist = []
+			this.getRecList()
+		},
+		methods: {
+			delDrafts(e) {
+				this.datalist.splice(e,1)
+				if(this.datalist.length == 0) {
+					this.myShow = true
+					this.nodata =  true
+				}
+			},
+			navTab(e){
+				this.datalist= []
+				this.navType = e;
+				this.pagenum =1;
+				this.getRecList();
+			},
+			navNoteTab(e){
+				this.datalist= []
+				this.navNoteType = e;
+				this.pagenum =1;
+				this.getRecList()
+			},
+			listZanFn(e) {
+				this.datalist[e.index].iszan = e.show;
+				if (this.datalist[e.index].binfo) {
+					this.datalist[e.index].zan_num = e.num;
+				} else {
+					this.datalist[e.index].zan = e.num;
+				}
+			},
+			goback() {
+				uni.navigateBack(1)
+			},
+			Follow() {
+				app.post('ApiMy/addFollow', {
+					follow_id: this.info.id,
+					type: 'user'
+				}, (res) => {
+					// this.info = res.data
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					if (res.msg == '已关注') {
+						this.info.is_member_follow = 1
+						this.info.fans_count++
+
+					} else {
+						this.info.is_member_follow = 0
+						this.info.fans_count--
+					}
+				})
+			},
+			recTypeFn(e) {
+				this.recType = e;
+				this.pagenum = 1;
+				this.datalist = [];
+				if(e == 3) {
+					this.navType='shop';
+				}else {
+					this.navType='note';
+				}
+				
+				this.getRecList();
+			},
+			getInfo() {
+				
+				
+				app.post('ApiZhiwei/otherUserinfo', {
+					a_uid: app.globalData.mid,
+					b_uid: this.id
+				}, (res) => {
+					this.info = res.data
+				})
+			},
+			getRecList() {
+				let that = this;
+				
+				var page = that.pagenum;
+				that.loading = true;
+				that.nomore = false;
+				that.nodata = false;
+				let url = 'ApiZhiwei/appNotVideoListOther';
+				let datas = {
+					page: page,
+					type: this.recType,
+					mid: this.id,
+					status:this.navNoteType,
+				}
+				if(this.recType == 3){
+					url  = 'ApiZhiwei/appNotVideoListFavorite'
+					datas.type = this.navType
+				} else if(this.recType == 4){
+					url='ApiZhiwei/appNotVideoListZan'
+					datas.type = this.navType
+				}
+				app.get(url,datas, function(res) {
+					that.loading = false;
+					var data = res.data;
+					if (page == 1) {
+						that.datalist = data;
+						// that.datalist.push({'title':1})
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+					} else {
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var datalist = that.datalist;
+							var newdata = datalist.concat(data);
+							that.datalist = newdata;
+						}
+					}
+					that.loaded();
+				});
+			},
+			
+			// 移除商品信息
+			delShop(e) {
+				this.delModle = e.show
+				// this.delModleTex = '是否从收藏列表中移除该商品？' 
+				this.delModleId = e.id
+				this.delModleType = e.deltype
+				this.delModleTex =  e.deltype == 'shop' ? '是否从收藏列表中移除该商品？': e.deltype == 'note' ? '是否从收藏列表中移除该笔记？':'是否从收藏列表中移除该视频？'
+	
+			},
+			
+			//收藏操作
+			addfavorite: function() {
+				var that = this;
+				app.post('ApiShop/addfavorite', {
+					proid: that.delModleId,
+					type: that.delModleType
+				}, function(data) {
+				
+				});
+			},
+			canlDel() {
+				this.delModle = false
+			},
+			confirmDel() {
+				if(this.recType == 4) {
+					if(this.delModleType == 'note' ) {
+						app.post("ApiLuntan/zan", {
+							id: this.delModleId
+						}, res => {
+							
+						});
+					}else {
+						app.post('ApiShortvideo/zan', {
+							id: this.delModleId,
+						}, res => {
+							
+						})
+					}
+				}else {
+					this.addfavorite()
+				}
+				
+				this.pagenum = 1;
+				this.datalist = [];
+				this.getRecList();
+				this.delModle = false
+			}
+			
+
+		},
+		onReachBottom: function() {
+			if (!this.nodata && !this.nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getRecList()
+			}
+		},
+
+	}
+</script>
+
+<style lang="scss">
+.container {
+	background: #F5F5F5;
+	min-height: 100vh;
+}
+	.btn{
+		height: 60rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 60rpx;
+	    margin: 0 auto;
+		margin-top: -50rpx;
+		width: 158rpx;
+		color: #FFFFFF;
+		font-size: 28rpx;
+		line-height: 60rpx;
+		background: linear-gradient(to right,#00AE68 0%,#096742 100%);
+	}
+	.min_nav{
+		display: flex;
+		margin-bottom: 24rpx;
+		font-size: 24rpx;
+		line-height: 34rpx;
+		.item{
+			margin-right: 40rpx;
+			color: #999;
+		}
+		.itemz{
+			color: #0A5D3B;
+			font-weight: bold;
+		}
+	}
+
+	.nav_max {
+		display: flex;
+		align-items: flex-start;
+		background-color: #fff;
+		padding: 0 100rpx;
+		border-radius: 12rpx 12rpx 0 0;
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+
+		.item {
+			flex: 1;
+			text-align: center;
+			font-size: 30rpx;
+			padding: 0 20rpx;
+			color: #999999;
+
+			.txt {
+				padding: 24rpx 0;
+				&.actived {
+					color: #333333;
+					font-weight: bold;
+					position: relative;
+					&::after {
+						content: "";
+						position: absolute;
+						left: 50%;
+						bottom: 12rpx;
+						width: 44rpx;
+						height: 6rpx;
+						border-radius: 6rpx;
+						transform: translateX(-50%);
+						background: #0A5D3B;
+					}
+				}
+			}
+		}
+	}
+
+	.head_box {
+
+
+		.count_box {
+			margin-top: 44rpx;
+			display: flex;
+			justify-content: space-around;
+			color: #FFFFFF;
+
+			.item {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				.top {
+					font-weight: bold;
+					margin-bottom: 4rpx;
+					font-size: 32rpx;
+					line-height: 44rpx;
+				}
+
+				.bottom {
+					font-size: 24rpx;
+					line-height: 34rpx;
+				}
+			}
+		}
+
+		width: 750rpx;
+		background-size: 100%;
+		position: relative;
+		padding: 32rpx 0 114rpx;
+
+		.info_box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 40rpx 0 12rpx;
+			.top_left {
+				font-size: 40rpx;
+				color: #FFFFFF;
+				flex-shrink: 0;
+				margin-right: 10rpx;
+			}
+
+			.left {
+				display: flex;
+				flex: 1;
+				align-items: center;
+				overflow: hidden;
+				
+				.l_left {
+					width: 128rpx;
+					height: 128rpx;
+					border-radius: 150rpx;
+					overflow: hidden;
+					margin-right: 20rpx;
+				}
+
+				.l_right {
+					flex: 1;
+					overflow: hidden;
+					font-size: 22rrpx;
+					color: #FFFFFF;
+					line-height: 32rpx;
+					
+					.p1 {
+						font-size: 40rpx;
+						line-height: 56rpx;
+						font-weight: bold;
+						margin-bottom: 10rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.p2 {
+						margin-bottom: 8rpx;
+					}
+					.p3 {
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+				}
+			}
+
+			.right,.right1 {
+				width: 132rpx;
+				height: 54rpx;
+				border: 1rpx solid #FFFFFF;
+				color: #FFFFFF;
+				border-radius: 54rpx;
+				text-align: center;
+				font-size: 28rpx;
+				line-height: 52rpx;
+				padding: 0 10rpx;
+				box-sizing: border-box;
+			}
+
+			.right1 {
+				min-width: 154rpx;
+			}
+		}
+	}
+	
+	.del-mdl {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 555;
+		.del-msk {
+			width: 100%;
+			height: 100%;
+			background-color: rgba(0, 0, 0, .6);
+		}
+		.del-cont-bx {
+			width: 600rpx;
+			height: 296rpx;
+			
+			border-radius: 12rpx;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			z-index: 556;
+			.del-tx {
+				padding: 20rpx 40rpx;
+			}
+			
+			.del-btn {
+				margin: 0 50rpx 44rpx;
+				
+				button {margin: 0;border-radius: 100rpx;}
+				.btn-l,.btn-r {
+					width: 236rpx;
+					height: 80rpx;
+					line-height: 80rpx;
+				}
+				.btn-l {
+					border: 2rpx solid #E8E8E8;
+					color: #666;
+				}
+				.btn-r {
+					color: #fff;
+					background-image: linear-gradient(to right, #00AE68 , #096742 );
+				}
+			}
+		}
+	}
+</style>
diff --git a/diary/issue/issue.vue b/diary/issue/issue.vue
new file mode 100644
index 0000000..0af61dd
--- /dev/null
+++ b/diary/issue/issue.vue
@@ -0,0 +1,770 @@
+<template>
+	<view class="container">
+		<!-- <invinbg-image-cropper :show-rotate-btn='false' :crop-fixed='true' crop-width='375' crop-height='375' -->
+			<!-- :src="tempFilePath" @confirm="confirm"></invinbg-image-cropper> -->
+		<view class="attention-h">
+			<view class="nav-bar" :style="{'height': navHeight}">
+				<view class="nav-bar-c">
+					<text class="iconfont icon-icon_arrow_left right-t" @tap="goBacck(true)"></text>
+					<text class="">{{nav_title}}</text>
+				</view>
+			</view>
+
+		</view>
+		<view class="" :style="{'height': hearHeight + 'px'}"></view>
+		<view class="image_box pd20" style="margin-top: 20rpx;" v-if="opt.type == 'video'">
+			
+			<view :style="{'margin-right':(index+1)%3 == 0?'0':'34rpx'}" class="item bor-noe" v-for="(item,index) in pics"
+				:key='index'>
+				<view class="close" @tap="removeimg" :data-index="index" data-field="pics">
+					<!-- <image :src="event_rul + '/static/img/static/img/ico-del.png'"></image> -->
+					<view class="del-con">
+					  <view class="del-wrap">
+						<image
+						  class="del-image"
+						  style="width: 20rpx;height: 20rpx;"
+						  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC"
+						></image>
+					  </view>
+					</view>
+				</view>
+				<image class="bor-rads" :src="item" @tap="previewImage" :data-url="item" mode="aspectFill"></image>
+			</view>
+
+			<view class="item"  @tap="uploadimg" data-field="pics" v-if="pics.length<( opt.type == 'video'?1:8)">
+				<!-- <text style="font-size: 60rpx; color: #ccc;">+</text> -->
+				<image
+				  style="width: 54rpx;height: 54rpx;"
+				  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA2CAYAAACMRWrdAAABIUlEQVRoQ+2a2w2DMAxFeQzWrsMUbadAsEw3S1CqVgppKwLX8BEOP4iHTXx8uUgWdVXoVhdaV0VhSmf7vr/H8V3XzY6V3P9iD+nYOI5P7/01LMI596AwoZV0TIBXIUWFXhKLFBWYSFGhhxQN6SFFQ5i4ogITKSr0cEVDekjRECauqMBEigq9U7piOk2yAti27SUe5ljlTfPEQ6KZecTvwl4P3ytvOv06R2HDMNzes7+6aRrvnHvtf50L13Lp50rx88zcvNlS3JpwKQ67XyK04nq2nFbk/LqVjin0TvmBNgQ2S4UUDcliHgpMpKjQwxUN6SFFQ5i4ogITKSr0cEVDekjRECauqMAsVoph+hVPtYr5+03p9tbYQ96xrYtT4ootbAJGVxxVTapVswAAAABJRU5ErkJggg=="
+				></image>
+				<text style="padding-top: 30rpx;">{{opt.type == 'video'?'添加封面':'添加照片'}}</text>
+			</view>
+			
+			
+			<view class="item bor-noe" style="margin-left: 20rpx;overflow: hidden;" v-if="opt.type == 'video' &&video" @tap="uploadvideo">
+				<image class="bor-rads" :src="videoImg" mode=""></image>
+				<text style="color: #fff; text-align: center;" class="videoImg">已上传视频</text>
+			</view>
+			<view class="item" style="margin-left: 20rpx;overflow: hidden;" v-if="opt.type == 'video' && !video" @tap="uploadvideo"
+				data-field="pics">
+				<!-- <text style="font-size: 60rpx; color: #ccc;">+</text> -->
+				<image
+				  style="width: 54rpx;height: 54rpx;"
+				  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA2CAYAAACMRWrdAAABIUlEQVRoQ+2a2w2DMAxFeQzWrsMUbadAsEw3S1CqVgppKwLX8BEOP4iHTXx8uUgWdVXoVhdaV0VhSmf7vr/H8V3XzY6V3P9iD+nYOI5P7/01LMI596AwoZV0TIBXIUWFXhKLFBWYSFGhhxQN6SFFQ5i4ogITKSr0cEVDekjRECauqMBEigq9U7piOk2yAti27SUe5ljlTfPEQ6KZecTvwl4P3ytvOv06R2HDMNzes7+6aRrvnHvtf50L13Lp50rx88zcvNlS3JpwKQ67XyK04nq2nFbk/LqVjin0TvmBNgQ2S4UUDcliHgpMpKjQwxUN6SFFQ5i4ogITKSr0cEVDekjRECauqMAsVoph+hVPtYr5+03p9tbYQ96xrYtT4ootbAJGVxxVTapVswAAAABJRU5ErkJggg=="
+				></image>
+				<text style="padding-top: 30rpx;">{{video?'重新上传':'添加视频'}}</text>
+				<text v-if="video">已上传视频</text>
+			</view>
+		</view>
+		<shmily-drag-image v-else ref="dragImage" :imageWidth="220" :list.sync="list" @changeImg="changeImg" :number="9"></shmily-drag-image>
+		<view class="title_info pd20"
+			style="margin: 20rpx 0; display: flex; border-bottom:1px solid #ddd; padding: 10rpx 40rpx;">
+			<input type="text" style="flex:1;" v-model="title"
+				placeholder-style="color:#666; font-size:30rpx; font-weight:bold; font-style:italic; "
+				placeholder="请填写标题" maxlength="25" />
+
+			<text>{{25-title.length}}</text>
+		</view>
+
+
+		<view class="title_info pd20" v-if="opt.type == 'video'" style="margin-bottom: 20rpx;">
+			<textarea type="text" v-model="content" placeholder="请填写正文" />
+		</view>
+		<view v-else class="title_box">
+			<jin-edit ref='edit' :html='nodes' fileKeyName='file' placeholder="请输入内容" :formData='formData'
+				@editOk="editOk" :uploadFileUrl="upUrl"></jin-edit>
+		</view>
+
+		<view class="flex_box">
+			<view class="icon_row">
+				<text @click="toShop('goods')" class="iconfont icon-shangpin"></text>
+				<text @click="toShop('goods')" class="txt">{{'已选'+goodsArr.length+'商品'}}</text>
+				<text @click="toShop('topic')" class="iconfont icon-jinghao"></text>
+				<text @click="toShop('topic')" class="txt">{{'已选'+topicArr.length+'话题'}}</text>
+			</view>
+			<view class="bottom-btn">
+				<view class="cao-g" @click="goBacck(false)">
+					<text class="iconfont icon-caogaoxiang" style="font-size: 60rpx;"></text>
+					<text class="" >存草稿</text>
+				</view>
+				<button type="default" :style="{'background-color': t('color1')}" @click="submit(0)">确认发布</button>
+			</view>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+
+	export default {
+		onLoad(opt) {
+			this.opt = opt
+			if (this.opt.type != 'video') {
+				this.nav_title = '知味'
+			}
+			if(this.opt.recordlist) {
+				this.records = JSON.parse(this.opt.recordlist)
+			}
+			if(this.opt.detail) {
+				let dataDetail = null
+				dataDetail = JSON.parse(this.opt.detail)
+				if( this.opt.type == 'note') {
+					this.title = dataDetail.title
+					this.content = dataDetail.content
+					this.nodes = dataDetail.content
+					this.list = dataDetail.pics
+					this.video = dataDetail.video
+					this.topicArr = dataDetail.topic_ids.length >= 1 ? dataDetail.topic_ids.indexOf(',') ? dataDetail.topic_ids.split(',') : dataDetail.topic_ids.split('') : []
+					this.goodsArr = dataDetail.goods_ids.length >= 1 ? dataDetail.goods_ids.indexOf(',') ? dataDetail.goods_ids.split(',') : dataDetail.goods_ids.split('') : []
+
+				}
+				else {
+					this.title = dataDetail.name
+					this.content = dataDetail.description
+					this.pics.push(dataDetail.coverimg)
+					this.video = dataDetail.url
+					this.duration = dataDetail.video_duration
+					this.videoImg = dataDetail.url +'?x-oss-process=video/snapshot,t_0,f_jpg'
+					this.topicArr = dataDetail.topic_ids.length >= 1 ? dataDetail.topic_ids.indexOf(',') ? dataDetail.topic_ids.split(",") : dataDetail.topic_ids.split(" ") : []
+					this.goodsArr = dataDetail.productids.length >= 1 ? dataDetail.productids.indexOf(',') ? dataDetail.productids.split(",") : dataDetail.productids.split(" ") : []
+				}
+			}
+			
+			let elemetn
+			// #ifdef MP-WEIXIN
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			uni.getSystemInfo({
+				success: res => {
+					elemetn = res.statusBarHeight
+				}
+			})
+			 // #endif
+			// #ifdef MP-WEIXIN
+			this.navHeight = ((menuButtonInfo.bottom + menuButtonInfo.top) - elemetn) + 'px'
+			// #endif
+			 // #ifndef MP 
+			this.navHeight = 45 + 'px'
+			 // #endif 
+		},
+		onUnload() {
+			uni.removeStorageSync('is_more_record_goods')
+			uni.removeStorageSync('is_more_record_topic')
+		},
+		onReady() {
+			let query = uni.createSelectorQuery().in(this)
+			query.select('.attention-h').boundingClientRect()
+			query.exec(res => {
+				this.hearHeight = res[0].height
+			})
+		},
+		onShow() {
+			if (uni.getStorageSync('is_more_show_goods')) {
+				this.goodsArr = uni.getStorageSync('goods_type_id') || []
+				uni.removeStorageSync('goods_type_id')
+				uni.removeStorageSync('is_more_show_goods')
+			}
+
+
+			if (uni.getStorageSync('is_more_show_topic')) {
+				this.topicArr = uni.getStorageSync('topic_type_id') || []
+				uni.removeStorageSync('is_more_show_topic')
+				uni.removeStorageSync('topic_type_id')
+			}
+
+		},
+		data() {
+			return {
+				navHeight: 0,
+				hearHeight: 0,
+				nav_title: '知味',
+				list: [],
+				formData: {},
+				goodsArr: [],
+				topicArr: [],
+				opt: {
+					type: 'diary', //笔记  video 视频
+				},
+				upUrl: app.globalData.baseurl + 'ApiImageupload/uploadImg/aid/' + app
+					.globalData.aid + '/platform/' + app.globalData.platform +
+					'/session_id/' + app.globalData.session_id,
+				loading: false,
+				isload: false,
+				menuindex: -1,
+				tempFilePath: '',
+				pre_url: app.globalData.pre_url,
+				datalist: [],
+				content_pic: [],
+				videoImg:'',
+				content: '',
+				title: '',
+				pagenum: 1,
+				cateArr: [],
+				duration:0,
+				cindex: -1,
+				pics: [],
+				video: '',
+				nodes: '',
+				
+				records: [],
+				
+				event_rul: app.globalData.event_url,
+			};
+		},
+		watch: {
+			list: {
+				handler(val, oldVal){ 
+					if(this.opt.type !='video') {
+						this.pics = val
+						// console.log(this.pics, val, '改变后的图片数组-----')
+					}
+				},
+				// deep: true,
+				// immediate: true
+			}
+		},
+		methods: {
+			goBacck(isg) {
+				let txt = ''
+				if(isg) {
+					if(this.opt.type == 'video') {
+						txt = '视频未发布，是否保存草稿箱?'
+					}else {
+						txt = '笔记未发布，是否保存草稿箱?'
+					}
+				}else {
+					if(this.opt.type == 'video') {
+						txt = '确认保存视频至草稿箱吗?'
+					}else {
+						txt = '确认保存笔记至草稿箱吗?'
+					}
+				}
+				uni.showModal({
+					title: '提示',
+					content: txt,
+					confirmColor: this.t('color1'),
+					cancelColor: '#ccc',
+					success:  (res) => {
+						if (res.confirm) {
+							this.submit(1)
+						} else if (res.cancel) {
+							if (isg) {
+								uni.navigateBack()
+							}
+							
+						}
+					}
+				});
+			},
+			changeImg(e) {
+				// console.log(e,'=====', this.list, 'fanhuuid返回的是啥------')
+			},
+			confirm(e) {
+				
+				
+				// console.log(e)
+				this.tempFilePath = ''
+				// cropFilePath = e.detail.tempFilePath
+				const tempFilePaths = e.detail.tempFilePath;
+				uni.showLoading({
+					title: '上传中'
+				});
+				uni.uploadFile({
+					url: this.upUrl, //仅为示例，非真实的接口地址
+					filePath: tempFilePaths,
+					name: 'file',
+					fileType: 'image',
+
+					formData: {
+						// access_token:info.this_.$store.state.loginInfo.token,
+					},
+					success: (uploadFileRes) => {
+						console.log(JSON.parse(uploadFileRes.data))
+						// info.headImg = JSON.parse(uploadFileRes.data).url;
+						this.pics.push(JSON.parse(uploadFileRes.data).url);
+					},
+					complete: () => {
+						// uni.showLoading({
+						// 	title: '加载中'
+						// });
+						uni.hideLoading()
+					},
+				})
+			},
+			editOk(e) {
+				console.log('zhessha', e.html)
+				this.content = e.html
+				
+				if(this.content.length){
+					  	let regex = new RegExp('<img','gi');
+					  		this.content =this.content.replace(regex,'<img style="max-width:100%;"')
+				}
+			},
+			toShop(e) {
+				uni.navigateTo({
+					url: '/newOtherPages/moreSearch/moreSearch?type=' + e + (e == 'goods' ? '&goodsArr=' +  JSON.stringify(this.goodsArr)  +'&topicArr='+ JSON.stringify(this.topicArr): '&goodsArr=' +  JSON.stringify(this.goodsArr.map(Number))  +'&topicArr='+ JSON.stringify(this.topicArr.map(Number)))  + '&records=' + JSON.stringify(this.records)	
+				})
+			},
+			showT(e) {
+				uni.showToast({
+					title: e,
+					icon: 'none'
+				})
+			},
+			editSubmit(num){
+				if (this.opt.type == 'video') {
+				
+					if (!this.video) {
+						this.showT('请先上传视频')
+						return
+					} else if (!this.pics.length) {
+						this.showT('请先上传图片')
+						return
+					} else if (!this.title) {
+						this.showT('请先填写标题')
+						return
+					}
+					//视频
+					app.post('ApiShortvideo/drafts', {
+						id: this.opt.editId,
+						isdraft: num,
+						topic_ids: String(this.topicArr),
+						goods_ids: String(this.goodsArr),
+						pics: String(this.pics),
+						title: this.title,
+						content: this.content,
+						video_duration:this.duration,
+						video: this.video
+					}, function(res) {
+						app.showLoading(false);
+						if (res.status == 1) {
+							app.success(res.msg);
+							setTimeout(function() {
+								app.goback(true);
+							}, 1000);
+						} else {
+							app.error(res.msg);
+						}
+					});
+				} else {
+					this.$refs.edit.release(true)
+					if (!this.pics.length) {
+						this.showT('请先上传图片')
+						return
+					} else if (!this.title) {
+						this.showT('请先填写标题')
+						return
+					}
+					//笔记
+				
+				 
+					setTimeout(() => {
+						app.post('ApiLuntan/drafts', {
+							id: this.opt.editId,
+							isdraft: num,
+							topic_ids: String(this.topicArr),
+							goods_ids: String(this.goodsArr),
+							pics: String(this.pics),
+							title: this.title,
+							content: this.content,
+							video: this.video,
+							is_edit: 1
+						}, function(res) {
+							app.showLoading(false);
+							if (res.status == 1) {
+								app.success(res.msg);
+								setTimeout(function() {
+									app.goback(true);
+								}, 1000);
+							} else {
+								app.error(res.msg);
+							}
+						});
+					}, 11)
+				
+				}
+				
+			},
+			submit(num) {
+				if(this.opt.detail) {
+					this.editSubmit(num)
+					return
+				}
+
+				if (this.opt.type == 'video') {
+
+					if (!this.video) {
+						this.showT('请先上传视频')
+						return
+					} else if (!this.pics.length) {
+						this.showT('请先上传图片')
+						return
+					} else if (!this.title) {
+						this.showT('请先填写标题')
+						return
+					}
+					//视频
+					app.post('ApiShortvideo/uploadvideo', {
+						isdraft: num,
+						topic_ids: String(this.topicArr),
+						goods_ids: String(this.goodsArr),
+						pics: String(this.pics),
+						title: this.title,
+						content: this.content,
+						video_duration:this.duration,
+						video: this.video
+					}, function(res) {
+						app.showLoading(false);
+						if (res.status == 1) {
+							app.success(res.msg);
+							setTimeout(function() {
+								app.goback(true);
+							}, 1000);
+						} else {
+							app.error(res.msg);
+						}
+					});
+				} else {
+					this.$refs.edit.release(true)
+					if (!this.pics.length) {
+						this.showT('请先上传图片')
+						return
+					} else if (!this.title) {
+						this.showT('请先填写标题')
+						return
+					}
+					//笔记
+
+ 
+					setTimeout(() => {
+						app.post('ApiLuntan/fatie', {
+							isdraft: num,
+							topic_ids: String(this.topicArr),
+							goods_ids: String(this.goodsArr),
+							pics: String(this.pics),
+							title: this.title,
+							content: this.content,
+							video: this.video,
+							is_edit: 0
+						}, function(res) {
+							app.showLoading(false);
+							if (res.status == 1) {
+								app.success(res.msg);
+								setTimeout(function() {
+									app.goback(true);
+								}, 1000);
+							} else {
+								app.error(res.msg);
+							}
+						});
+					}, 11)
+
+				}
+
+			},
+			getdata: function() {
+				var that = this;
+				that.loading = true;
+				app.get('ApiLuntan/fatie', {}, function(res) {
+					that.loading = false;
+					if (res.status == 0) {
+						app.alert(res.msg);
+						return;
+					}
+					that.clist = res.clist;
+					var clist = res.clist;
+					if (clist.length > 0) {
+						var cateArr = [];
+						for (var i in clist) {
+							if (that.opt && that.opt.cid == clist[i].id) {
+								that.cindex = i;
+							}
+							cateArr.push(clist[i].name);
+						}
+					} else {
+						cateArr = false;
+					}
+					that.cateArr = cateArr
+					that.loaded();
+				});
+			},
+			cateChange: function(e) {
+				this.cindex = e.detail.value;
+			},
+			formsubmit: function(e) {
+				var that = this;
+				console.log(e);
+				var clist = that.clist;
+				if (clist.length > 0) {
+					if (that.cindex == -1) {
+						app.error('请选择分类');
+						return false;
+					}
+					var cid = clist[that.cindex].id;
+				} else {
+					var cid = 0;
+				}
+				var formdata = e.detail.value;
+				var content = formdata.content;
+				var pics = formdata.pics;
+				var video = formdata.video;
+				if (content == '' && pics == '') {
+					app.error('请输入内容');
+					return false;
+				}
+				app.post('ApiLuntan/fatie', {
+					cid: cid,
+					pics: pics,
+					content: content,
+					video: video
+				}, function(res) {
+					app.showLoading(false);
+					if (res.status == 1) {
+						app.success(res.msg);
+						setTimeout(function() {
+							app.goback(true);
+						}, 1000);
+					} else {
+						app.error(res.msg);
+					}
+				});
+			},
+			uploadimg: function(e) {
+
+				// uni.chooseImage({
+				// 	count: 1, //默认9
+				// 	sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				// 	success: (res) => {
+				// 		this.tempFilePath = res.tempFilePaths.shift()
+				// 		// console.log(tempFilePath,'cao',res.tempFilePaths.shift())
+				// 	}
+				// });
+				// return
+				var that = this;
+				var field = e.currentTarget.dataset.field
+				var pics = that[field]
+				if (!pics) pics = [];
+				app.chooseImage(function(urls) {
+					for (var i = 0; i < urls.length; i++) {
+						pics.push(urls[i]);
+					}
+					if (field == 'pic') that.pic = pics;
+					if (field == 'pics') that.pics = pics;
+					if (field == 'zhengming') that.zhengming = pics;
+				},this.opt.type =='video'?1: (9-this.pics.length))
+			},
+			uploadvideo: function() {
+				var that = this;
+				uni.chooseVideo({
+					// maxDuration: 60,
+					success: function(res) {
+						// console.log(res, '上传视频-------')
+						that.duration = res.duration
+						var tempFilePath = res.tempFilePath;
+						// that.videoImg = res.thumbTempFilePath;
+						app.showLoading('上传中');
+						uni.uploadFile({
+							url: app.globalData.baseurl + 'ApiImageupload/uploadImg/aid/' + app
+								.globalData.aid + '/platform/' + app.globalData.platform +
+								'/session_id/' + app.globalData.session_id,
+							filePath: tempFilePath,
+							name: 'file',
+							formData: {
+								video_duration: that.duration,
+							},
+							success: function(res) {
+								app.showLoading(false);
+								var data = JSON.parse(res.data);
+
+								if (data.status == 1) {
+									that.video = data.url;
+									that.videoImg = data.url +'?x-oss-process=video/snapshot,t_0,f_jpg'
+								} else {
+									app.alert(data.msg);
+								}
+							},
+							fail: function(res) {
+								app.showLoading(false);
+								app.alert(res.errMsg);
+							}
+						});
+					},
+					fail: function(res) {
+						console.log(res); //alert(res.errMsg);
+					}
+				});
+			},
+			removeimg: function(e) {
+				var that = this;
+				var index = e.currentTarget.dataset.index
+				var field = e.currentTarget.dataset.field
+				var pics = that[field]
+				pics.splice(index, 1)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.videoImg{
+		position: absolute;
+		left: 0;
+		right: 0;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		color: #fff;
+		z-index: 2;
+		bottom: 0;
+	}
+	.pd20 {
+		padding: 0 40rpx;
+	}
+	.del-con {
+	  position: absolute;
+	  top: -10rpx;
+	  right: -10rpx;
+	  padding: 0 0 20rpx 20rpx;
+	  .del-wrap {
+		width: 36rpx;
+		height: 36rpx;
+		background-color: #ccc;
+		border-radius: 50%;
+		// background-color: rgba(0, 0, 0, 0.4);
+		// border-radius: 0 0 0 10rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		.del-image {
+		  width: 20rpx;
+		  height: 20rpx;
+		}
+	  }
+	}
+	.flex_box {
+		position: fixed;
+		right: 0rpx;
+		bottom: 0rpx;
+		left: 0rpx;
+		padding: 20rpx;
+		padding-bottom: 60rpx;
+		background-color: #f6f6f6;
+
+		.icon_row {
+			color: #666;
+
+			.iconfont {
+				font-size: 40rpx;
+			}
+
+			.txt {
+				margin-right: 20rpx;
+			}
+		}
+
+		button {
+			height: 80rpx;
+			line-height: 80rpx;
+			flex: 1;
+			margin-top: 0;
+			// background-color: #d6a662;
+			font-weight: bold;
+			padding: 5rpx 0;
+			color: #fff;
+			// margin-right: 20rpx;
+			border-radius: 40rpx;
+		}
+		
+		.bottom-btn {
+			margin-top: 30rpx;
+			display: flex;
+			align-items: center;
+			
+			.cao-g {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				padding: 0 30rpx;
+				color: #666;
+			}
+		}
+	}
+	.attention-h {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 2;
+	}
+	.nav-bar {
+		display: flex;
+		align-items: flex-end;
+		justify-self: center;
+	}
+	.nav-bar-c {
+		width: 100%;
+		height: 60rpx;
+		position: relative;
+		margin-bottom: 8rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.right-t {
+			position: absolute;
+			left: 20rpx;
+			font-size: 50rpx;
+		}
+		text {font-size: 30rpx;}
+	}
+	
+	.container {
+		// padding: 20rpx;
+		padding-bottom: 100rpx;
+
+		.image_box {
+			display: flex;
+			flex-wrap: wrap;
+
+			.item {
+				margin-bottom: 20rpx;
+				position: relative;
+				// margin-right: 20rpx;
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 12rpx;
+				border: 1px solid #ccc;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+
+				text {
+					font-size: 24rpx;
+					color: #999;
+				}
+
+				.close {
+					width: 30rpx;
+					height: 30rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+
+				}
+				
+				.bor-rads {
+					border-radius: 12rpx;
+				}
+				
+			}
+			.bor-noe {
+				border: none;
+			}
+		}
+	}
+</style>
diff --git a/diary/live/live.vue b/diary/live/live.vue
new file mode 100644
index 0000000..f247be3
--- /dev/null
+++ b/diary/live/live.vue
@@ -0,0 +1,379 @@
+<template>
+	<view class="attention">
+		<view class="attention-h">
+			<view class="nav-bar" :style="{'height': navHeight}">
+				<view style="" class="nav_max"  :style="{'width': titleWidth}">
+					<view class="attention-scarch flex al-item-center" @click="search">
+						<view class="input_box flex">
+						  <text  class="iconfont icon-search" style="font-size: 58rpx;"></text>	
+						  <!-- <input disabled="true" placeholder="大家都在搜..." type="text"  v-model="searchVlaue"  /> -->
+						</view>
+					</view>
+					<view class="flex flex1 j-between" style="padding: 0 66rpx 0 60rpx;">
+						<view class="item position-r" @tap="goto" data-url='/diary/attention/attention' data-opentype="redirectTo">
+							<text class="txt n-tv">关注</text>
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/evernote/evernote' data-opentype="redirectTo">
+							<text class="txt n-tv">笔记</text>
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/video/video' data-opentype="redirectTo">
+							<text class="txt n-tv">视频</text>
+						</view>
+						<view class="item position-r"  @tap="goto" data-url='/diary/live/live' data-opentype="redirectTo">
+							<text class="txt font-w">直播</text>
+							<text class="heng position-a"></text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="" :style="{'height': hearHeight + 'px'}"></view>
+
+
+		<view class="add" :style="{'background-color': t('color1')}" @click="addShow= true"></view>
+		<view class="add_box" @click="addShow = false" v-if="addShow">
+			<view class="content" @click.stop="">
+				<view class="item" @click="toAdd('diary')">
+				发布笔记
+				</view>
+				<view class="item" @click="toAdd('video')">
+				发布视频 
+				</view>
+				<view class="item" @click="addShow= false">
+				取消
+				</view>
+			</view>
+		</view>
+	<!-- {{JSON.stringify(datalist)}} -->
+	<view style="padding: 20rpx;">
+		<dp-liveroom :data='datalist'></dp-liveroom>
+	</view>
+		<loading v-if="loading"></loading>
+		<nomore v-if="!isData"></nomore>
+		<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+		<view class="tsinfo" v-if="!isNote">
+			<!-- :style="{'background-image': 'url('+ event_rul +'/static/img/static/icon/9d3ab5fa33dedcde23ba05c8e9cdf999.png)'}" -->
+			<text>发布笔记,让大家开始认识你吧</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {	
+			return{
+				navHeight: 0,
+				titleWidth: 0,
+				opt:{},
+				hearHeight: 0,
+				pagenum:1,
+				isNote:1,
+				loading:false,
+				isload: false,
+				nomore:false,
+				nodata:false,
+				datalist:[],
+
+				addShow:false,
+				animation:'',
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad(opt) {
+			this.opt = app.getopts(opt);
+		   let elemetn
+			// #ifdef MP-WEIXIN
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			uni.getSystemInfo({
+				success: res => {
+					elemetn = res.statusBarHeight
+				}
+			})
+			this.titleWidth = menuButtonInfo.left + 'px'
+			 // #endif
+			// #ifdef MP-WEIXIN
+			this.navHeight = ((menuButtonInfo.bottom + menuButtonInfo.top) - elemetn) + 'px'
+			// console.log(menuButtonInfo,elemetn, 'navheight')
+			// #endif
+			 // #ifndef MP 
+			this.navHeight = 45 + 'px'
+			this.titleWidth = '100vw'
+			 // #endif 
+			 
+			
+			 
+		  this.getList()
+			
+
+		},
+		onShow() {
+			this.animation = uni.createAnimation({
+			  transformOrigin: "50% 0 50%",
+			  duration: 600,
+			  timingFunction: "linear",
+			  delay: 0
+			})
+			setTimeout(()=>{
+				this.anima()
+			},1000)
+		},
+		onReady() {
+			let query = uni.createSelectorQuery().in(this)
+			query.select('.attention-h').boundingClientRect()
+			query.exec(res => {
+				this.hearHeight = res[0].height
+			})
+		},
+		onReachBottom(e) {
+		if (!this.nodata && !this.nomore) {
+		  this.pagenum = this.pagenum + 1;
+					 this.getList()
+		}
+
+		},
+	
+		onPageScroll(e) {
+			this.pageScroll = e.scrollTop
+		},
+		methods:{
+			getList(){
+				
+			let that = this;
+			var page = that.pagenum;
+			that.loading = true;
+			that.nomore = false;
+			that.nodata = false;
+			app.post('ApiZhiwei/liveList', {pagenum: page}, function (res) {
+							  				that.loading = false;
+			  var data = res.list;
+			  that.isNote = res.isNote;
+			  if (page == 1) {
+				  
+			    that.datalist =data;
+			    if (data.length == 0) {
+			      that.nodata = true;
+			    }
+			  }else{
+			    if (data.length == 0) {
+			      that.nomore = true;
+			    } else {
+			      var datalist = data;
+			      var newdata = datalist.concat(data);
+			      that.datalist = newdata;
+			    }
+			  }
+							  				that.loaded();
+			});
+			
+		
+			},
+			anima(){
+				this.animation.translateX(4).step()
+				this.animation.translateX(-4).step()
+				setTimeout(()=>{
+					this.anima()
+				},1000)
+			},
+			search() {
+				uni.navigateTo({
+					url:'/diary/search/search?keyword='+this.searchVlaue
+				})
+			},
+			
+			toAdd(e){
+				this.addShow = false;
+				
+				uni.navigateTo({
+					url:'/diary/issue/issue?type='+e
+				})
+			},
+			addZero(num) {
+			    return num < 10 ? '0' + num : num;
+			},
+			getTimes(time) {
+				let times = new Date(time*1000)
+				let year = times.getFullYear()
+				let month = this.addZero(times.getMonth() + 1)
+				let date = this.addZero(times.getDate())
+				let hoursys = this.addZero(times.getHours())
+				let minutesys = this.addZero(times.getMinutes())
+				let secondsys = this.addZero(times.getSeconds())
+				
+				let dateNow = new Date().getTime();  // 获取当前时间
+				let timeDiff = dateNow - (time * 1000);  //时间差的毫秒数
+				let days = Math.floor(timeDiff / (24 * 3600 * 1000)); // 计算出天数
+				let leavel1 = timeDiff % (24 * 3600 * 1000); // 计算天数后剩余的时间
+				let hours = Math.floor(leavel1 / (3600 * 1000)); // 计算天数后剩余的小时数
+				let leavel2 = timeDiff % (3600 * 1000); // 计算剩余小时后剩余的毫秒数
+				let minutes = Math.floor(leavel2 / (60 * 1000));
+				// console.log(days, hours,minutes, 'mmmmmmmmmmm999999999999',times)
+				return  days > 0 ? year +'.'+ month +'.'+ date + ' ' +hoursys +':' + minutesys : (24 > hours  &&  hours > 0) ?  hours + '小时前' : minutes > 0 ? minutes + '分钟前'  : '刚刚'
+				
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tsinfo{
+		    position: fixed;
+		    right: 140rpx;
+		    top: 66%;
+			z-index: 10;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			height: 76rpx;
+			border-radius: 8rpx;
+			background-size: 100%;
+			background-color: rgba(255,255,255, .8);
+			border: 2rpx solid #0A5D3B;
+			animation: tsinfo 1.2s infinite;
+		text{
+			position: relative;
+			padding:0 16rpx;
+			color: #0A5D3B;
+			font-size: 26rpx;
+			letter-spacing:2rpx;
+		}	
+
+	}
+	.tsinfo::after {
+		content: '';
+		width: 10rpx;
+		height: 10rpx;
+		border-top: 2rpx solid #0A5D3B;
+		border-right: 2rpx solid #0A5D3B;
+		background-color: rgba(255,255,255, .8);
+		position: absolute;
+		top: 50%;
+		right: -8rpx;
+		transform: translateY(-50%) rotate(45deg);
+	}
+	.add {
+	z-index: 10;
+	width: 100rpx;
+	height: 100rpx;
+	line-height: 100rpx;
+	text-align: center;
+	border-radius: 28rpx;
+	border:6rpx solid #fff;
+	background-image: linear-gradient(to bottom right, #00AE68, #096742);
+	position: fixed;
+	right: 20rpx;
+	top: 65%;
+	}
+	.add:after {
+		content: '';
+		width: 50%;
+		height: 4rpx;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add:before {
+		content: '';
+		width: 4rpx;
+		height: 50%;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add_box{
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		z-index: 9999999;
+	
+		.content{
+			background-color: #fff;
+			padding-bottom: 20rpx;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			.item{
+				padding: 30rpx;
+				// border-bottom: 1px solid red;
+			}
+		}
+	}
+	.attention {
+	
+		.color-gray {
+			color: #999;
+		}
+		.attention-h {
+			width: 100%;
+			background-color: #fff;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 15;
+		}
+		.nav-bar {
+			display: flex;
+			align-items: flex-end;
+			
+			.nav_max{
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 4px;
+				height: 32px;
+				
+			   .item{
+				   display: flex;
+				   align-items: center;
+				   justify-content: center;
+				   flex-direction: column;
+				   font-size: 30rpx;
+				   // font-weight: bold;
+				   // padding: 0 20rpx;
+				   .txt{
+					   font-size: 32rpx;
+					   color: #333333;
+					   z-index: 2;
+				   }
+				   .n-tv {
+					   color: #999;
+				   }
+				   .heng{
+					   // z-index: 1;
+					   // margin-top: 4rpx;
+					   bottom: 0;
+					   width: 44rpx;
+					   border-radius: 4rpx;
+					   height: 6rpx;
+					   background-color: #0A5D3B;
+				   }
+			   }
+			}
+		}
+	
+		.attention-scarch {
+			
+			padding-left: 4rpx;
+		}
+	
+		
+	
+	}
+	@keyframes tsinfo {
+		0% {transform:  translateX(8rpx);}
+		50% {transform:  translateX(-8rpx);}
+		100% {transform: translateX(8rpx);}
+	}
+</style>
diff --git a/diary/note/note.vue b/diary/note/note.vue
new file mode 100644
index 0000000..2ac274a
--- /dev/null
+++ b/diary/note/note.vue
@@ -0,0 +1,277 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+<!-- 	<view class="datalist">
+		<view class="item">
+			<view class="top">
+				<image :src="detail.headimg" class="f1"></image>
+				<view class="f2">
+					<view class="covermy" :class="menuindex>-1?'tabbarbot':'notabbarbot'" @tap="goto" data-url="fatie"><image :src="pre_url+'/static/img/lt_fatie.png'"></image></view>
+					<view class="t1">{{detail.nickname}}</view>
+					<view class="t2">{{detail.showtime}}</view>
+				</view>
+			</view>
+			<view class="con previewImgContent">
+				<view class="f1"><text style="white-space:pre-wrap;">{{detail.content}}</text></view>
+				<view class="f2" v-if="detail.pics">
+					<image v-for="(pic, idx) in detail.pics" :key="idx" :src="pic" mode="widthFix" style="height:auto" @tap="previewImage" :data-url="pic" :data-urls="detail.pics"></image>
+				</view>
+				<video class="video" id="video" :src="detail.video" v-if="detail.video"></video>
+			</view>
+		</view>
+		<view class="flex">
+			<view v-if="detail.mid == mid" style="color:#507DAF;font-size:28rpx;height:60rpx;line-height:60rpx;margin-right:20rpx" @tap="deltie" :data-id="detail.id">删除</view>
+			<view style="color:#aaa;font-size:28rpx;height:60rpx;line-height:60rpx;margin-right:20rpx">阅读 {{detail.readcount}}</view>
+		</view>
+	</view> -->
+
+	<!--评论-->
+	<view class="plbox">
+		<view class="plbox_title"><text class="t1">评论</text><text>{{plcount}}</text></view>
+		<view class="plbox_content" id="datalist">
+			<block v-for="(item, idx) in datalist" :key="idx">
+			<view class="item1 flex">
+				<view class="f1 flex0"><image :src="item.headimg"></image></view>
+				<view class="f2 flex-col">
+					<text class="t1">{{item.nickname}}</text>
+					<text class="t11">{{item.createtime}}</text>
+					<view class="t2 plcontent"><rich-text :nodes="item.content"></rich-text></view>
+					<block v-if="item.replylist.length>0">
+					<view class="relist">
+						<block v-for="(hfitem, index) in item.replylist" :key="index">
+						<view class="item2">
+							<view class="f1">{{hfitem.nickname}}<text class="t1">{{hfitem.createtime}}</text>
+								<text v-if="hfitem.mid==mid" class="phuifu" style="font-size:20rpx;margin-left:20rpx;font-weight:normal" @tap="delplreply" :data-id="hfitem.id">删除</text>
+							</view>
+							<view class="f2 plcontent"> <rich-text :nodes="hfitem.content"></rich-text></view>
+						</view>
+						 </block>
+					</view>
+          </block>
+					<view class="t3 flex">
+						<view class="flex1">
+							<text class="phuifu" style="cursor:pointer" @tap="goto" :data-url="'pinglun?type=1&id=' + detail.id + '&hfid=' + item.id">回复</text>
+							<text v-if="item.mid==mid" class="phuifu" style="cursor:pointer;margin-left:20rpx" @tap="delpinglun" :data-id="item.id">删除</text>
+						</view>
+						<view class="flex-y-center pzan" @tap="pzan" :data-id="item.id" :data-index="idx"><image :src="event_rul +'/static/img/static/img/lt_like' + (item.iszan==1?'2':'') + '.png'"></image>{{item.zan}}</view>
+					</view>
+				</view>
+			</view>
+      </block>
+		</view>
+	</view>
+	<view style="height:100rpx"></view>
+	<view class="pinglun">
+		<view class="pinput" @tap="goto" :data-url="'pinglun?type=0&id=' + detail.id">发表评论</view>
+		<view class="zan flex-y-center" @tap="zan" :data-id="detail.id">
+			<image :src="event_rul +'/static/img/static/img/lt_like' + (iszan?'2':'') + '.png'"></image><text style="padding-left:2px">{{detail.zan}}</text>
+		</view>
+	</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		pre_url:app.globalData.pre_url,
+		isload: false,
+		menuindex:-1,
+
+		detail:{},
+		datalist: [],
+		pagenum: 1,
+		id: 0,
+		nomore: false,
+		iszan: "",
+		title: "",
+		sharepic: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.id = this.opt.id || 0;
+		this.getdata();
+  },
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.detail.content,pic:this.detail.pics[0]});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.detail.content,pic:this.detail.pics[0]});
+		var query = (sharewxdata.path).split('?')[1];
+		console.log(sharewxdata)
+		console.log(query)
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiLuntan/detail', {pagenum: pagenum,id: that.id}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.mid = res.mid;
+					that.datalist = res.datalist;
+					that.plcount = res.plcount;
+					that.iszan = res.iszan;
+					that.detail = res.detail;
+          that.myscore = res.myscore;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded({title:res.detail.content,pic:res.detail.pics[0]});
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    zan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.post("ApiLuntan/zan", {id: id}, function (res) {
+        if (res.type == 0) {
+          //取消点赞
+          var iszan = 0;
+        } else {
+          var iszan = 1;
+        }
+        that.iszan = iszan;
+				that.detail.zan = res.zancount;
+      });
+    },
+    pzan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var index = e.currentTarget.dataset.index;
+      var datalist = that.datalist;
+      app.post("ApiLuntan/pzan", {id: id}, function (res) {
+        if (res.type == 0) {
+          //取消点赞
+          var iszan = 0;
+        } else {
+          var iszan = 1;
+        }
+        datalist[index].iszan = iszan;
+        datalist[index].zan = res.zancount;
+        that.datalist = datalist;
+      });
+    },
+    showpinglun: function () {},
+    deltie: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除吗?', function () {
+        app.post("ApiLuntan/deltie", {id: id}, function (res) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    delpinglun: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除吗?', function () {
+        app.post("ApiLuntan/delpinglun", {id: id}, function (res) {
+          app.success(res.msg);
+          setTimeout(function () {
+            that.onLoad();
+          }, 1000);
+        });
+      });
+    },
+    delplreply: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要删除吗?', function () {
+        app.post("ApiLuntan/delplreply", {id: id}, function (res) {
+          app.success(res.msg);
+          setTimeout(function () {
+            that.onLoad();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.datalist{width:100%;padding:0 24rpx;background:#fff}
+.datalist .item{width:100%;display:flex;flex-direction:column;padding:24rpx 0;}
+.datalist .item .top{width:100%;display:flex;align-items:center}
+.datalist .item .top .f1{width:80rpx;height:80rpx;border-radius:50%;margin-right:16rpx}
+.datalist .item .top .f2 .t1{color:#222;font-weight:bold;font-size:28rpx}
+.datalist .item .top .f2 .t2{color:#bbb;font-size:24rpx}
+.datalist .item .con{width:100%;padding:24rpx 0;display:flex;flex-direction:column;color:#000}
+.datalist .item .con .f2{margin-top:10rpx;display:flex;flex-wrap:wrap}
+.datalist .item .con .f2 image{width:31%;margin-right:2%;margin-bottom:10rpx;border-radius:8rpx}
+.datalist .item .con .video{width:80%;height:300rpx;margin-top:20rpx}
+
+.pinglun{width:100%;max-width:750px;margin:0 auto;position:fixed;display:flex;align-items:center;bottom:0;left:0;right:0;height:100rpx;background:#fff;z-index:995;border-top:1px solid #f5f5f5;padding:0 20rpx;}
+.pinglun .pinput{flex:1;color:#a5adb5;font-size:32rpx;padding:0;line-height:100rpx}
+.pinglun .zan{padding:0 12rpx;line-height:100rpx;font-size:32rpx}
+.pinglun .zan image{width:48rpx;height:48rpx;margin-right:16rpx}
+.pinglun .buybtn{margin-left:16rpx;background:#31C88E;height:72rpx;line-height:72rpx;padding:0 20rpx;color:#fff;border-radius:6rpx}
+
+.plbox{width:100%;padding:20rpx 20rpx;background:#fff;margin-top:10px}
+.plbox_title{font-size:28rpx;height:60rpx;line-height:60rpx;margin-bottom:20rpx;color:#222;font-weight:bold}
+.plbox_title .t1{margin-right:16rpx}
+.plbox_content .plcontent{vertical-align: middle;color:#111}
+.plbox_content .plcontent image{ width:44rpx;height:44rpx;vertical-align: inherit;}
+.plbox_content .item1{width:100%;margin-bottom:20rpx}
+.plbox_content .item1 .f1{width:80rpx;}
+.plbox_content .item1 .f1 image{width:60rpx;height:60rpx;border-radius:50%}
+.plbox_content .item1 .f2{flex:1}
+.plbox_content .item1 .f2 .t1{color:#222;font-weight:bold}
+.plbox_content .item1 .f2 .t11{color:#999999;font-size:20rpx}
+.plbox_content .item1 .f2 .t2{color:#000;margin:10rpx 0;line-height:60rpx;}
+.plbox_content .item1 .f2 .t3{color:#999;font-size:20rpx}
+.plbox_content .item1 .f2 .pzan image{width:32rpx;height:32rpx;margin-right:16rpx}
+.plbox_content .item1 .f2 .phuifu{color:#507DAF;font-size:24rpx}
+.plbox_content .relist{width:100%;background:#F6F5F8;padding:4rpx 20rpx;margin-bottom:20rpx}
+.plbox_content .relist .item2{font-size:24rpx;margin-bottom:10rpx}
+.plbox_content .relist .item2 .f1{font-weight:bold;color:#222;width:100%}
+.plbox_content .relist .item2 .f1 .t1{font-weight:normal;color:#999999;font-size:20rpx;padding-left:20rpx}
+
+.covermy{position:fixed;z-index:99999;bottom:50px;right:15px;width:130rpx;height:130rpx;box-sizing:content-box}
+.covermy image{width:100%;height:100%}
+
+</style>
\ No newline at end of file
diff --git a/diary/search/search.vue b/diary/search/search.vue
new file mode 100644
index 0000000..c42e179
--- /dev/null
+++ b/diary/search/search.vue
@@ -0,0 +1,776 @@
+<template>
+<view class="container" style="min-height: 100vh;">
+	<block v-if="isload">
+		<view class="search-container" :style="history_show?'height:100%;':''">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<!-- <image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image> -->
+					<text class="iconfont icon-search" style="color: #999; font-size: 50rpx; margin-left: 20rpx;"></text>
+					<input :value="keyword" placeholder="内容搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange" @focus="searchFocus"></input>
+				</view>
+				<view class="search-btn" v-if="false" @tap="searchbtn">
+					<image :src="event_rul +'/static/img/static/img/show-cascades.png'" style="height:36rpx;width:36rpx" v-if="!history_show && productlisttype=='itemlist'"/>
+					<image :src="event_rul +'/static/img/static/img/show-list.png'" style="height:36rpx;width:36rpx" v-if="!history_show && productlisttype=='item2'"/>
+					<text v-if="history_show">搜索</text>
+				</view>
+			</view>
+			<scroll-view v-show="history_show" style="flex: 1;" scroll-y="true" >
+				<view>
+					<view class="search-history" >
+						<view>
+							<text class="search-history-title" style="font-size: 32rpx; font-weight: bold; color: #333;">历史搜索</text>
+							<view class="delete-search-history" @tap="deleteSearchHistory">
+								<image :src="event_rul +'/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+							</view>
+						</view>
+						
+						<view class="search-history-list">
+							<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+							</view>
+							<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul +'/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+						</view>
+					</view>
+					
+					<view class="rsbox" >
+					   <view class="title">
+					   		话题热搜榜
+					   </view>
+					   
+					   <view class="item_box">
+					   	 <view class="item" v-for="(item,index) in topList"  @click="goto" :data-url="'/diary/topic/topic?id='+item.id" :key='index'>
+							 <view class="num">
+							 	<!-- {{index+1}} -->
+							 </view>
+					   	 	<view class="left">
+					   	 		<image :src="item.topic_pic" mode=""></image>
+								<!-- # -->
+					   	 	</view>
+							<view class="right" style="display: flex; justify-content: space-between; align-items: center;">
+							 <text>{{item.topic_name}}</text>
+							 <text class="iconfont icon-arrow-right" style="font-size:40rpx;"></text>
+							</view>
+					   	 </view>
+					   </view>
+					</view>
+					
+				</view>
+			</scroll-view>
+			<view class="shop_head" v-show="!history_show">
+				<view class="item" :class="{'itemz':homeType === 1}" @click="homeTypeFn(1)">
+					<text class="txt">笔记</text>
+					<text class="heng" :style="{'background-color': t('color1')}" v-if="homeType==1"></text>
+				</view>
+				<view class="item" :class="{'itemz':homeType === 2}"  @click="homeTypeFn(2)">
+					
+					<text class="txt">视频</text>
+					<text class="heng" :style="{'background-color': t('color1')}" v-if="homeType==2"></text>
+				</view>
+				<view class="item" :class="{'itemz':homeType === 3}"  @click="homeTypeFn(3)">
+					
+					<text class="txt">用户</text>
+					<text class="heng" :style="{'background-color': t('color1')}" v-if="homeType==3"></text>
+				</view>
+				<view class="item" :class="{'itemz':homeType === 4}"  @click="homeTypeFn(4)">
+					
+					<text class="txt">话题</text>
+					<text class="heng" :style="{'background-color': t('color1')}" v-if="homeType==4"></text>
+				</view>
+			</view>
+			
+		<view  v-if="homeType < 3 && !history_show">
+			<view class="search-navbar" style="padding:0 20rpx;" v-show="!history_show">
+					<view @tap.stop="sortClick" :class="{'itemz':(!field||field==1)}" class="search-navbar-item"  :data-field="1" data-order="desc">
+						
+						<text class="txt">综合</text>
+						</view>
+					<view @tap.stop="sortClick" :class="{'itemz':(field==2)}" class="search-navbar-item"  :data-field="2" data-order="desc">
+						<text class="txt">最热</text>
+						<!-- <text class="heng" v-if="field==2"></text> -->
+						</view>
+					<view @tap.stop="sortClick" :class="{'itemz':(field==3)}" class="search-navbar-item"  :data-field="3" data-order="desc">
+						<text class="txt">最新</text>
+						<!-- <text class="heng" v-if="field==3"></text> -->
+					</view>
+					<!-- <view @tap.stop="sortClick" :class="{'itemz':(field=='sell_price')}"   class="search-navbar-item" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+						<text  class="txt">价格</text>
+						    <text style="font-size: 26rpx;" class="iconfont icon-jiantou_shangxiaqiehuan_o"></text>
+						<text class="iconfont icon-danbianjiantou1" :class="{'itemzz':(field=='sell_price')}" :style="field=='sell_price'&&order=='asc'?'color:'+'#efbd6f':''"></text>
+						<text style="margin-left: -16rpx;" class="iconfont icon-danbianjiantou" :class="{'itemzz':(field=='sell_price')}" :style="field=='sell_price'&&order=='desc'?'color:'+'#efbd6f':''"></text>
+					</view> -->
+					<!-- <view  class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view> -->
+				</view>
+			
+			<view class="product-container">
+				
+				<block v-if="datalist && datalist.length>0">
+			
+			      <diary-falls-list @listZanFn='listZanFn' :datalist='datalist' v-if="datalist && datalist.length>0"> </diary-falls-list>
+					<!-- <dp-product-itemlist v-if="productlisttype=='itemlist'" :data="datalist" :menuindex="menuindex"></dp-product-itemlist> -->
+					<!-- <dp-product-item types='search' v-if="productlisttype=='item2'" :data="datalist" :menuindex="menuindex"></dp-product-item> -->
+				</block>
+				<nomore text="没有更多内容了" v-if="nomore"></nomore>
+				<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+				<loading v-if="loading"></loading>
+			</view>
+		</view>
+		<view v-else-if="homeType == 3 &&!history_show" style="padding: 20rpx;">
+			<!-- <shopList v-if="datalist.length" :list='datalist'></shopList> -->
+		   <view class="list_box">
+		  <view class="item" @click="goto" :data-url='"/diary/info/info?id="+item.id' v-for="(item,index) in datalist" :key='index'>
+		  	<view class="left">
+		  		<view class="l_left" style="border: 1px solid #ccc;">
+		  			<image :src="item.headimg" mode=""></image>
+		  		</view>
+		  		<view class="l_right">
+		  			<view class="p1">
+		  				{{item.nickname}}
+		  			</view>
+		  			<view class="p2">
+		  				ID:{{item.id}}
+		  			</view>
+		  			<view class="p3">
+		  				笔记·{{item.not_count}} | 粉丝·{{item.fans_count}}
+		  			</view>
+		  		</view>
+		  	</view>
+		  
+			<view @click.stop> 
+			<view class="right" :style="{'background-color':!item.is_follow?t('color1'):'','color':!item.is_follow?'#fff':t('color1'),'border': '1px solid ' +t('color1') }" @click="Follow(item,'user')">
+				{{item.is_follow?'已关注':'关注'}}
+			</view>
+			
+			</view>
+		  </view>
+		   </view>
+			<nomore text="没有更多内容了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+		<view v-else-if="homeType == 4 &&!history_show" style="padding: 20rpx;">
+			<!-- <shopList v-if="datalist.length" :list='datalist'></shopList> -->
+			
+			<view class="list_box">
+			<view class="item" v-for="(item,index) in datalist"    @click="goto" :data-url="'/diary/topic/topic?id='+item.id" :key='index'>
+				<view class="left">
+					<view class="l_left" :style="{'background-color':t('color1'),'width':'40rpx','height':'40rpx','color':'#fff','text-align':'center','line-height':'40rpx'}">
+						#
+					</view>
+					<view class="l_right">
+						<view class="p1">
+							{{item.topic_name}}
+						</view>
+						<view class="p2">
+							话题·{{item.member_count}}人参与讨论
+						</view>
+					</view>
+				</view>
+				<view @click.stop="">
+					
+					
+					<view class="right" :style="{'background-color':!item.is_follow?t('color1'):'','color':!item.is_follow?'#fff':t('color1'),'border': '1px solid ' +t('color1')}" @click="Follow(item,'topic')">
+						{{item.is_follow?'已关注':'关注'}}
+					</view>
+				</view>
+			</view>
+			</view>
+			<nomore text="没有更多内容了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+			<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+				<view class="filter-scroll-view">
+					<scroll-view class="filter-scroll-view-box" scroll-y="true">
+						<view class="search-filter">
+							<view class="filter-title">筛选</view>
+							<view class="filter-content-title">内容分组</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchegid==''?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="groupClick" data-gid="">全部</view>
+								<block v-for="(item, index) in glist" :key="index">
+									<view class="filter-item" :style="catchegid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="groupClick" :data-gid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<block v-if="!bid || bid <=0">
+							<view class="filter-content-title">话题分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+								<block v-for="(item, index) in clist" :key="index">
+									<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							</block>
+							<block v-else>
+							<view class="filter-content-title">内容分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid2==oldcid2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cate2Click" :data-cid2="oldcid2">全部</view>
+								<block v-for="(item, index) in clist2" :key="index">
+									<view class="filter-item" :style="catchecid2==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cate2Click" :data-cid2="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							</block>
+
+							<view class="search-filter-btn">
+								<view class="btn" @tap="filterReset">重置</view>
+								<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</uni-drawer>
+
+			
+		</view>
+	
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+	// import shopList from './shop_list'
+var app = getApp();
+export default {
+	// components:{
+	// 	shopList
+	// },
+  data() {
+    return {
+		homeType:1,
+		opt:{},
+		loading:false,
+		isload: true,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: true,
+		order: '',
+		field:1,
+		oldcid: "",
+		catchecid: "",
+		catchegid: "",
+		cid: "",
+		gid: '',
+		cid2:'',
+		oldcid2: "",
+		catchecid2: "",
+		clist: [],
+		clist2: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		bid:0,
+		topList:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getTopSerach();
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.cid2 = this.opt.cid2 || '';
+		this.oldcid2 = this.opt.cid2 || '';
+		this.catchecid2 = this.opt.cid2;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		this.bid = this.opt.bid ? this.opt.bid : 0;
+		if(this.opt.keyword) {
+			this.keyword = this.opt.keyword;
+		}
+		//console.log(this.bid);
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用内容列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_diary_list');
+		// this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+   
+	
+		if (!this.nodata && !this.nomore &&!this.history_show) {
+		  this.pagenum = this.pagenum + 1;
+		  this.getprolist();
+		}
+	
+  },
+  methods: {
+	  	listZanFn(e){
+				this.datalist[e.index].iszan = e.show;
+				if(this.datalist[e.index].binfo){
+this.datalist[e.index].zan_num = e.num;
+}else{
+this.datalist[e.index].zan = e.num;
+}
+			},
+	  Follow(item,type){
+	  	app.post('ApiMy/addFollow',{follow_id:item.id,type:type},(res)=>{
+	  		// this.info = res.data
+	  		uni.showToast({
+	  			title:res.msg,
+	  			icon:'none'
+	  		})
+		if(res.msg == '已关注'){
+		item.is_follow = 1
+		if(type == 'user'){
+			item.fans_count++
+		}
+		}else{
+			item.is_follow = 0
+			item.fans_count-- 
+		}
+	  	})
+	  },
+	  getDataList: function (loadmore) {
+	  		if(!loadmore){
+	  			this.pagenum = 1;
+	  			this.datalist = [];
+	  		}
+	    var that = this;
+	    var pagenum = that.pagenum;
+		that.history_show = false;
+	    var keyword = that.keyword;
+	  		that.loading = true;
+	  		that.nodata = false;
+	  		that.nomore = false;
+	    app.post('ApiBusiness/blist', {pagenum: pagenum,keyword: keyword}, function (res) {
+	      that.loading = false;
+	  			// uni.stopPullDownRefresh();
+	      var data = res.data;
+	      if (pagenum == 1) {
+	        that.datalist = data;
+	        if (data.length == 0) {
+	          that.nodata = true;
+	        }
+	      }else{
+	        if (data.length == 0) {
+	          that.nomore = true;
+	        } else {
+	          var datalist = that.datalist;
+	          var newdata = datalist.concat(data);
+	          that.datalist = newdata;
+	        }
+	      }
+	    });
+	  },
+	  homeTypeFn(e){
+		  this.homeType = e;
+		  this.pagenum = 1;
+		  this.field = 1;
+		  this.datalist = [];
+		    this.getprolist()
+		 
+	  },
+	  getTopSerach:function(){
+		  var that = this;
+		app.get('ApiZhiwei/topicSortList', {}, function (res) {
+			
+		  that.topList = res.data
+		});
+	  },
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var cid2 = that.cid2;
+			that.loading = true;
+			app.get('ApiShop/prolist', {cid: cid,gid: gid,bid:bid,cid2:cid2}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.clist2 = res.clist2;
+			  that.glist = res.glist;
+				that.loaded();
+				that.getprolist();
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+			var cid2 = that.cid2;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			// ,order: order,gid: gid,cid: cid,cid2:cid2,cpid:cpid,bid:bid
+      app.post('ApiZhiwei/appNotVideoListSearch',{page: pagenum,name_field: keyword,type_field:field,type : that.homeType}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+		searchFocus: function (e) {
+      this.history_show = true;
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+	  that.searchproduct();
+	 
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+	  that.getprolist();
+	
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+    cate2Click: function (e) {
+      var that = this;
+      var cid2 = e.currentTarget.dataset.cid2;
+			if(cid2 === true) cid2 = '';
+      that.catchecid2 = cid2
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.cid2 = this.catchecid2;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchecid2 = this.oldcid2;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_diary_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_diary_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_diary_list");
+    }
+  }
+};
+</script>
+<style lang="scss">
+	
+	.list_box{
+		.item{
+			margin-bottom: 20rpx;
+			align-items: center;
+			display: flex;
+			justify-content: space-between;
+			.left{
+				display: flex;
+				align-items: center;
+				
+				.l_left{
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 100rpx;
+					overflow: hidden;
+					margin-right: 20rpx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.l_right{
+					.p1{
+						font-size: 30rpx;
+						font-weight: bold;
+						width: 100%;
+						   overflow: hidden; /*超出长度的文字隐藏*/
+						       text-overflow:ellipsis;/*文字隐藏以后添加省略号*/
+						           white-space: nowrap; /*强制不换行*/
+					}
+					.p2{
+						color: #999;
+						margin: 5rpx 0;
+					}
+					.p3{
+						color: #999;
+					}
+				}
+			}
+			.right{
+				border: 1px solid #f4d19c;
+				color: #f4d19c;
+				width: 120rpx;
+				height: 50rpx;
+				border-radius: 6rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+	
+	.shop_head{
+	display: flex;
+	justify-content: space-around;
+	padding: 10rpx 150rpx;
+	font-weight: bold;
+	color: #111;
+	
+	
+	
+	.item{
+		position: relative;
+		.txt{
+			z-index: 1;
+			position: relative;
+		}
+	}
+	.heng{
+			   display: flex;
+			   height: 6rpx;
+			   background-color: #efbd6f;
+			   border-radius: 6rpx;
+			   width: 110%;
+			   margin-left: -2rpx;
+			   margin-top: -28rpx;
+			   position: absolute;
+			   bottom: 4rpx;
+			   
+	}
+	}
+	.rsbox{
+		padding: 30rpx;
+		.title{
+			font-size: 32rpx; font-weight: bold; color: #333;
+		}
+		.item_box{
+			.item{
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+			  .left{
+				  width: 100rpx;
+				  height: 100rpx;
+				  // border-radius: 40rpx;
+				  // background-color: #f0bd71;
+				  // display: flex;
+				  // align-items: center;
+				  // justify-content: center;
+				  // color: #fff;
+				  // font-weight: bold;
+				  image{
+					  border-radius: 10rpx;
+					  width: 100%;
+					  height: 100%;
+				  }
+			  }
+			  .right{
+				  height: 100rpx;
+				  flex: 1;
+				  display: flex;
+				  align-items: center;
+				  margin-left: 20rpx;
+				  justify-content: space-between;
+				  // border-bottom: 1px solid #EBEBEB;
+				  overflow: hidden;
+				  color: #333;
+				  .right_left{
+					 // width: 80%;
+					 flex: 1;
+					  overflow: hidden;
+					  text-overflow:ellipsis;
+					  white-space: nowrap;
+				  }
+				  .right_right{
+					  // width: 20%;
+					  .iconfont{
+						  font-size: 50rpx;
+						  color: #666;
+					  }
+				  }
+			  }
+			}
+		}
+	}
+	.container{
+		background-color: #fff;
+	}
+.search-container {width: 100%;background: #fff;z-index:9;top:var(--window-top);display: flex;
+flex-direction: column; 
+}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7; border: 1rpx solid rgba(255, 255, 255, 0.6);flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+.topsearch .search-btn{display:flex;align-items:center;color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.search-navbar {
+	.itemz{
+	   // color:#efbd
+	   // font-size: 36rpx;
+	   color: #111;
+	   font-weight: bold;
+	   .txt{
+		   // border-bottom: 4rpx solid #efbd6f;
+		z-index: 1;
+	   }
+	   
+	   .heng{
+	   		   display: flex;
+	   		   width: 100%;
+	   		   height: 8rpx;
+	   		   background-color: #efbd6f;
+	   		   border-radius: 6rpx;
+	   		   width: 60rpx;
+	   		   margin-top: -28rpx;
+	   		   position: absolute;
+	   		   bottom: 18rpx;
+	   		   
+	   }
+	   
+	}
+	display: flex;
+	text-align: center;
+	align-items:center;
+	padding:5rpx 0;
+
+
+}
+.search-navbar-item {
+	margin-right: 88rpx;
+	
+	display: flex;
+	justify-content: center;
+height: 70rpx; line-height: 70rpx;position: relative;font-size:28rpx;
+}
+
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {
+	display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #eee;  border-radius: 50rpx;font-size: 26rpx;}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 30rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%; padding-top: 20rpx; font-size:26rpx;padding:0 24rpx}
+</style>
\ No newline at end of file
diff --git a/diary/topic/plaza.vue b/diary/topic/plaza.vue
new file mode 100644
index 0000000..70f5987
--- /dev/null
+++ b/diary/topic/plaza.vue
@@ -0,0 +1,213 @@
+<template>
+	<view class="container">
+		<view class="swiper_box">
+			<swiper style="width: 100%; height: 100%;" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
+				<swiper-item @click="goto" :data-url='item.page_url'  v-for="(item,index) in info" :key='index'> 
+					<image :src="item.pic_url" mode=""></image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="title">
+			人气话题
+		</view>
+		<view class="content">
+			<view class="item" @click="goto" :data-url="'/diary/topic/topic?id='+item.id" v-for="(item,index) in datalist" :key='index'>
+				<view class="p1">
+					<view class="icon-box flex j-center al-item-center">
+						<view class="icon">#</view>
+					</view>
+					<view class="topic_name">{{item.topic_name}}</view>
+				</view>
+				<view class="p2">
+					<view class="left">
+						<text class="icon" :style="{'background-color': colorFn(index,'b'),'color':colorFn(index,'c')}" >NO.{{index+1}}</text>
+						话题{{item.member_count}}人参与
+					</view>
+					<view class="right">
+						进入话题 <text class="iconfont icon-arrow-right"></text>
+					</view>
+				</view>
+				<view class="p3">
+				<image v-for="(items,indexs) in item.pics" :key='indexs' :src="items" mode=""></image>
+				
+				<image  v-if="!item.pics.length" :src="item.topic_pic" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<nomore text="没有更多内容了" v-if="nomore"></nomore>
+		<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default{
+		
+		data(){
+			return{
+				info:{},
+				pagenum:1,
+				loading:false,
+				isload: false,
+					nomore:false,
+					nodata:false,
+					datalist:[],
+			}
+		},
+		onReachBottom () {
+		  if (!this.nodata && !this.nomore) {
+		    this.pagenum = this.pagenum + 1;
+			 this.getRecList()
+		  }
+		},
+		onLoad(opt) {
+			this.id = opt.id;
+			this.getRecList();
+		},
+		methods:{
+			colorFn(i,c){
+				let color
+				if(c === 'b'){
+				   color = ''
+					if(i === 0){
+						color = '#FB6C6B'
+					}else if(i === 1){
+						color = '#FDC10F'
+					}else if(i === 2){
+						color = '#4F9DFB'
+					}
+				}else{
+					if(i < 3){
+						color = '#fff'
+					}else{
+						color = '#333'
+					}
+				}
+				return color
+			},
+			getRecList(){
+			let that = this;
+			var page = that.pagenum;
+				that.loading = true;
+							  			that.nomore = false;
+							  			that.nodata = false;
+			app.post('ApiZhiwei/topic', {pagenum: page}, function (res) {
+							  				that.loading = false;
+			  var data = res.topicList;
+			  if (page == 1) {
+				  that.info = res.banner;
+			    that.datalist = data;
+			    if (data.length == 0) {
+			      that.nodata = true;
+			    }
+			  }else{
+			    if (data.length == 0) {
+			      that.nomore = true;
+			    } else {
+			      var datalist = that.datalist;
+			      var newdata = datalist.concat(data);
+			      that.datalist = newdata;
+			    }
+			  }
+							  				that.loaded();
+			});
+			
+		
+		},
+	},
+	}
+</script>
+
+<style lang="scss">
+	.container {
+		background: #FFF;
+	}
+	.content{
+		padding: 0 20rpx;
+		.item{
+			margin-bottom: 28rpx;
+			.p3{
+				image{
+					width: 218rpx;
+					height: 218rpx;
+					border-radius: 8rpx;
+					margin-right: 20rpx;
+				}
+				image:nth-child(3){
+					margin: 0;
+				}
+			}
+			.p2{
+				margin-bottom: 26rpx;
+				color: #999;
+				font-size: 24rpx;
+				display: flex;
+                 justify-content: space-between;
+				 align-items: center;
+				 .left{
+					 .icon{
+						 // font-weight: bold;.
+						 // background-color: #97000c;
+						 // color: #fff;
+						 font-size: 20rpx;
+						 line-height: 26rpx;
+						 padding: 0 6rpx;
+						 // font-size: 26;
+						 border-radius: 4rpx;
+						 margin-right: 10rpx;
+					 }
+				 }
+				 .right{
+					 display: flex;
+					 align-items: center;
+				 }
+			}
+			.p1{
+				margin-bottom: 10rpx;
+				display: flex;
+				
+				.icon-box {
+					flex-shrink: 0;
+					background: radial-gradient(#dcf5eb,#e9fdf6);
+					border-radius: 50%;
+					width: 36rpx;
+					height: 36rpx;
+					margin-right: 12rpx;
+				}
+				.icon{
+					font-size: 26rpx;
+					color: #0A5D3B;
+				}
+				.topic_name {
+					flex: 1;
+					align-items: center;
+					white-space: nowrap;      /*超出的空白区域不换行*/
+					overflow: hidden;         /*超出隐藏*/
+					text-overflow: ellipsis;  /*文本超出显示省略号*/
+					font-size: 28rpx;
+					font-weight: bold;
+					color: #333;
+					line-height: 40rpx;
+				}
+			}
+		}
+	}
+	.title{
+		text-align: center;
+		font-size: 32rpx;
+		line-height: 44rpx;
+		font-weight: bold;
+		margin: 28rpx 0;
+		color: #333;
+	}
+	.swiper_box{
+		width: 100%;
+		height: 280rpx;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+</style>
diff --git a/diary/topic/topic.vue b/diary/topic/topic.vue
new file mode 100644
index 0000000..fda249e
--- /dev/null
+++ b/diary/topic/topic.vue
@@ -0,0 +1,316 @@
+<template>
+<view class="container">
+	<view class="image_box">
+		<image @click="preImg(info.topic_pic)" :src="info.topic_pic" mode="aspectFill"></image>
+	</view>
+	<view class="info_box">
+		<view class="title_box">
+			<view class="icon-box flex j-center al-item-center">
+				<view class="icon">#</view>
+			</view>
+			{{info.topic_name||''}}
+		</view>
+		<view class="head_box">
+			<view class="left">
+				
+				<view class="item_image" v-for="(item,index) in userList" :key='index'>
+					<image :src="item" mode=""></image>
+				</view>
+				<text class="txt">{{info.not_count+info.video_count}}篇动态 {{info.member_count}}人讨论</text>
+			</view>
+			
+			<view class="right" :class="info.is_follow?'followed':'isFollow'" @tap="Follow">
+				{{info.is_follow?'已关注':'关注'}}
+			</view>
+		</view>
+		<view class="content_info">
+			{{info.topic_content||''}}
+		</view>
+	<view  class="nav_max">
+	
+		<view class="item" @click="typeFn(1)" >
+			<text class="txt" :class="{checked: type == 1}">笔记</text>
+		</view>
+		<view class="item"  @click="typeFn(2)">
+			<text class="txt" :class="{checked: type == 2}">视频</text>
+		</view>
+	</view>
+	</view>
+     <view class="content_box">
+     	<view class="nav_min_box">
+     		<!-- <view class="item" @click="typeFieldFn(1)" :style="{'font-weight':type_field == 1?'bold':'400'}">
+     			综合
+     		</view> -->
+			<view class="item" @click="typeFieldFn(2)" :style="type_field == 2?'font-weight: bold;color:'+t('color1'):''">
+				最热
+			</view>
+			<view class="item" @click="typeFieldFn(3)" :style="type_field == 3?'font-weight: bold;color:'+t('color1'):''">
+				最新
+			</view>
+     	</view>
+		<diary-falls-list @listZanFn='listZanFn' :datalist='datalist' v-if="datalist && datalist.length>0"> </diary-falls-list>
+		
+		<nomore text="没有更多内容了" v-if="nomore"></nomore>
+		<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+     </view>
+</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default{
+		onReachBottom () {
+		  if (!this.nodata && !this.nomore) {
+		    this.pagenum = this.pagenum + 1;
+			 this.getRecList()
+		  }
+		},
+		onLoad(opt) {
+			this.id = opt.id;
+			// this.getInfo();
+		},
+		onShow(){
+		this.pagenum= 1
+			this.getRecList();
+		},
+		data(){
+			return{
+				userList:[],
+				id:'',
+				pagenum:1,
+				loading:false,
+				isload: false,
+					nomore:false,
+					nodata:false,
+					datalist:[],
+					info:{},
+					type:1,
+					type_field:2,
+			}
+		},
+		methods:{
+			preImg(url){
+				uni.previewImage({urls:[url],current:1})
+			},
+				listZanFn(e){
+				this.datalist[e.index].iszan = e.show;
+				if(this.datalist[e.index].binfo){
+this.datalist[e.index].zan_num = e.num;
+}else{
+this.datalist[e.index].zan = e.num;
+}
+			},
+			typeFieldFn(e){
+				this.type_field = e;
+				this.resetList();
+			},
+			typeFn(e){
+				console.log(e)
+				this.type = e;
+				this.resetList();
+			},
+			Follow(){
+				app.post('ApiMy/addFollow',{follow_id:this.id,type:'topic'},(res)=>{
+					// this.info = res.data
+					uni.showToast({
+						title:res.msg,
+						icon:'none'
+					})
+					if(res.msg == '已关注'){
+						this.info.is_follow = 1
+					}else{
+						this.info.is_follow = 0
+					}
+					// this.getInfo()
+				})
+			},
+			resetList(){
+				this.pagenum = 1;
+				this.getRecList();
+			},
+			getRecList(){
+				
+			let that = this;
+			var page = that.pagenum;
+							  			that.loading = true;
+							  			that.nomore = false;
+							  			that.nodata = false;
+			app.get('ApiZhiwei/topicDetail', {topic_id:this.id,pagenum: page,order:this.type_field,type:this.type}, function (res) {
+							  				that.loading = false;
+			  var data = res.dataList;
+			  if (page == 1) {
+				  that.info = res.data;
+				  that.userList = res.userList;
+			    that.datalist = res.dataList;
+			    if (data.length == 0) {
+			      that.nodata = true;
+			    }
+			  }else{
+			    if (data.length == 0) {
+			      that.nomore = true;
+			    } else {
+			      var datalist = that.datalist;
+			      var newdata = datalist.concat(data);
+			      that.datalist = newdata;
+			    }
+			  }
+							  				that.loaded();
+			});
+			
+			return
+				app.post('ApiZhiwei/topicDetail',{topic_id:this.id},(res)=>{
+					this.info = res.data
+				})
+			},
+		
+		},
+	}
+</script>
+
+<style lang="scss">
+	.content_box{
+		padding: 0 24rpx;
+		.nav_min_box{
+			padding: 24rpx 8rpx;
+			display: flex;
+			.item{
+				font-size: 24rpx;
+				line-height: 34rpx;
+				margin-right: 32rpx;
+				color: #999;
+			}
+		}
+	}
+	.info_box{
+		border-radius: 20rpx;
+		padding: 28rpx 32rpx 0;
+		background-color: #fff;
+		
+		.content_info{
+			margin-bottom: 44rpx;
+			font-size: 28rpx;
+			line-height: 50rpx;
+			color: #333;
+		}
+		.head_box{
+			margin: 26rpx 0 14rpx;
+			display: flex;
+			justify-content: space-between;
+			.left{
+				display: flex;
+				align-items: center;
+				margin-left: 20rpx;
+				
+				.item_image{
+					width: 50rpx;
+					height: 50rpx;
+					border-radius: 50rpx;
+					overflow: hidden;
+					margin-left: -20rpx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.txt{
+					color: #999;
+					font-size: 24rpx;
+					margin-left: 16rpx;
+					line-height: 34rpx;
+				}
+			}
+			.right {
+				width: 120rpx;
+				height: 52rpx;
+				line-height: 52rpx;
+				border-radius: 26rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #FFFFFF;
+				&.isFollow {
+					background: linear-gradient(to right,#00AE68 0%,#096742 100%);
+				}
+				&.followed {
+					color: #0A5D3B;
+					position: relative;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 0;
+						right: 0;
+						top: 0;
+						bottom: 0;
+						border: 1px solid #0A5D3B;
+						border-radius: 26rpx;
+					}
+				}
+			}
+		}
+		.title_box{
+			display: flex;
+			align-items: center;
+			font-size: 32rpx;
+			font-weight: bold;
+			line-height: 44rpx;
+			.icon-box {
+				flex-shrink: 0;
+				background: radial-gradient(#dcf5eb,#e9fdf6);
+				border-radius: 50%;
+				width: 36rpx;
+				height: 36rpx;
+				margin-right: 8rpx;
+			}
+			.icon{
+				font-size: 26rpx;
+				color: #0A5D3B;
+			}
+		}
+	}
+	.nav_max{
+		padding: 0 120rpx 24rpx;
+		display: flex;
+		justify-content: space-around;
+	   .item{
+		   display: flex;
+		   align-items: center;
+		   justify-content: center;
+		   flex-direction: column;
+		   padding: 0 20rpx;
+		   .txt{
+				z-index: 2;
+				font-size: 32rpx;
+				color: #999999;
+				line-height: 44rpx;
+			   	&.checked {
+					color: #333333;
+					position: relative;
+					font-weight: bold;
+					&::after {
+						content: "";
+						position: absolute;
+						left: 50%;
+						bottom: -12rpx;
+						width: 44rpx;
+						height: 6rpx;
+						border-radius: 6rpx;
+						transform: translateX(-50%);
+						background: #0A5D3B;
+					}
+			   }
+		   }
+	   }
+	}
+	.image_box{
+		width: 100%;
+		height: 400rpx;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	
+</style>
diff --git a/diary/video/video.vue b/diary/video/video.vue
new file mode 100644
index 0000000..26a3901
--- /dev/null
+++ b/diary/video/video.vue
@@ -0,0 +1,402 @@
+<template>
+	<view class="container">
+	
+		<view class="attention-h">
+			<view class="nav-bar">
+				<view :style="{'width': titleWidth}" class="nav_max">
+					<view class="attention-scarch flex al-item-center">
+						<view class="input_box"  @click="goto" data-url='/diary/search/search'>
+						  <text  class="iconfont icon-search"></text>	
+						 <!-- <input disabled=""  placeholder="大家都在搜..." type="text" /> -->
+						</view>
+					</view>
+					<view class="flex flex1 j-center">
+						<view class="item position-r" @tap="goto" data-url='/diary/attention/attention' data-opentype="redirectTo">
+							<text class="txt n-tv">关注</text>
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/evernote/evernote' data-opentype="redirectTo">
+							<text class="txt n-tv">笔记</text>				
+						</view>
+						<view class="item position-r" @tap="goto" data-url='/diary/video/video' data-opentype="redirectTo">
+							<text class="txt font-w">视频</text>
+							<text class="heng position-a"></text>
+						</view>
+						<!-- #ifdef MP -->
+						<view class="item position-r" @tap="goto" data-url='/diary/live/live' data-opentype="redirectTo">
+							<text class="txt n-tv">直播</text>
+						</view>
+						<!-- #endif -->
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="" :style="{'height': hearHeight + 'px'}"></view>
+		<view class="info_box">
+			<view class="list_box">
+				<view class="content">				
+					<diary-falls-list @listZanFn='listZanFn' :datalist='datalist' v-if="datalist && datalist.length > 0" navType="video"> </diary-falls-list>
+					<nomore text="没有更多内容了" v-if="nomore"></nomore>
+					<nodata text="没有查找到相关内容" v-if="nodata"></nodata>
+					
+				</view>
+			</view>
+		</view>
+		<view :style="{'background-color': t('color1')}" class="add" @click=" addFn">
+		</view>
+		<view class="add_box" @click="addShow = false" v-if="addShow">
+			<view class="content" @click.stop="">
+				<view class="item" @click="toAdd('diary')">
+				发布笔记
+				</view>
+				<view class="item" @click="toAdd('video')">
+				发布视频 
+				</view>
+				<view class="item" @click="addShow= false">
+				取消
+				</view>
+			</view>
+		</view>
+		<dp-tabbar></dp-tabbar>
+		<view class="tsinfo"  v-show='!info.isNote' >
+			<!-- :style="{'background-image': 'url('+ event_rul +'/static/img/static/icon/9d3ab5fa33dedcde23ba05c8e9cdf999.png)'}" -->
+			<text>发布笔记,让大家开始认识你吧</text>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default{
+		onLoad() {
+			let elemetn
+			// #ifdef MP-WEIXIN
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			uni.getSystemInfo({
+				success: res => {
+					elemetn = res.statusBarHeight
+				}
+			})
+			this.titleWidth = menuButtonInfo.left + 'px'
+			 // #endif
+			// #ifdef MP-WEIXIN
+			this.navHeight = ((menuButtonInfo.bottom + menuButtonInfo.top) - elemetn) + 'px'
+			// console.log(menuButtonInfo,elemetn, 'navheight')
+			// #endif
+			 // #ifndef MP 
+			this.navHeight = 45 + 'px'
+			this.titleWidth = '100vw'
+			 // #endif 
+			this.getRecList	()
+		
+		},
+		onReady() {
+			let query = uni.createSelectorQuery().in(this)
+			query.select('.attention-h').boundingClientRect()
+			query.exec(res => {
+				this.hearHeight = res[0].height
+			})
+		},
+		onShow(){
+			this.getInfo()
+		},
+		data(){
+			return{
+				hearHeight:0,
+				navHeight: 0,
+				titleWidth: 0,
+				addShow:false,
+				info:{
+					isNote:1,
+				},
+				pagenum:1,
+				keyword:'',
+				loading:false,
+				isload: false,
+				nomore:false,
+				nodata:false,
+				datalist:[],
+				
+				event_rul: app.globalData.event_url,
+			}
+		},
+		 onReachBottom: function () {
+		   if (!this.nodata && !this.nomore) {
+		     this.pagenum = this.pagenum + 1;
+		 	 this.getRecList()
+		   }
+		 },
+		methods:{
+
+			listZanFn(e){
+				this.datalist[e.index].iszan = e.show;
+				if(this.datalist[e.index].binfo){
+					this.datalist[e.index].zan_num = e.num;
+				}else{
+					this.datalist[e.index].zan = e.num;
+				}
+			
+			},
+			addFn(){
+				if(app.globalData.mid == 0){
+					uni.showModal({
+						title: '提示',
+						content: '发布需要先登录',
+						success: function (res) {
+							if (res.confirm) {
+								app.goto('/pages/index/login')
+							} else if (res.cancel) {
+								
+							}
+						}
+					});
+				}else{
+					this.addShow= true
+				
+				}
+			},
+			searchFn(){
+				uni.navigateTo({
+					url:'/diary/search/search?keyword='+this.keyword
+				})
+			},
+			toAdd(e){
+				this.addShow = false;
+				
+				uni.navigateTo({
+					url:'/diary/issue/issue?type='+e
+				})
+			},
+	
+			resetList(){
+				this.pagenum = 1;
+				this.getRecList()
+				
+			},
+
+			getRecList() {
+				let that = this;
+			    var page = that.pagenum;
+				that.loading = true;
+				that.nomore = false;
+				that.nodata = false;
+			   app.get('ApiZhiwei/appNotVideoListIndex', {page: page,type_field:1,type:2}, function (res) {
+				 that.loading = false;
+			     var data = res.data;
+			     if (page == 1) {
+			       that.datalist = data;
+			       if (data.length == 0) {
+			         that.nodata = true;
+			       }
+			     }else{
+			       if (data.length == 0) {
+			         that.nomore = true;
+			       } else {
+			         var datalist = that.datalist;
+			         var newdata = datalist.concat(data);
+			         that.datalist = newdata;
+			       }
+			     }
+				  	that.loaded();
+			   });
+			 },
+			getInfo(){
+				app.post('ApiZhiwei/appIndex',{},(res)=>{
+					this.info = res.data
+				})
+			},
+			
+		},
+	}
+</script>
+
+<style lang="scss">
+	.tsinfo{
+		    position: fixed;
+		    right: 140rpx;
+		    top: 66%;
+			z-index: 10;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			height: 76rpx;
+			border-radius: 8rpx;
+			background-size: 100%;
+			background-color: rgba(255,255,255, .8);
+			border: 2rpx solid #0A5D3B;
+			animation: tsinfo 1.2s infinite;
+		text{
+			position: relative;
+			padding:0 16rpx;
+			color: #0A5D3B;
+			font-size: 26rpx;
+			letter-spacing:2rpx;
+		}
+	}
+	
+	.tsinfo::after {
+		content: '';
+		width: 10rpx;
+		height: 10rpx;
+		border-top: 2rpx solid #0A5D3B;
+		border-right: 2rpx solid #0A5D3B;
+		background-color: rgba(255,255,255, .8);
+		position: absolute;
+		top: 50%;
+		right: -8rpx;
+		transform: translateY(-50%) rotate(45deg);
+	}
+	
+	.nav-bar{
+		display: flex;
+		align-items: center;
+		z-index:9;
+		padding: 20rpx 72rpx 20rpx 24rpx;
+		box-sizing: border-box;
+	}
+	.attention-h {
+		width: 100%;
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 3;
+	}
+
+	.add {
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		border-radius: 28rpx;
+		border:6rpx solid #fff;
+		background-image: linear-gradient(to bottom right, #00AE68, #096742);
+		position: fixed;
+		right: 20rpx;
+		top: 65%;
+	}
+	.add:after {
+		content: '';
+		width: 50%;
+		height: 4rpx;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add:before {
+		content: '';
+		width: 4rpx;
+		height: 50%;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.add_box{
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		z-index: 9999999;
+	
+		.content{
+			background-color: #fff;
+			padding-bottom: 20rpx;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			.item{
+				padding: 30rpx;
+				// border-bottom: 1px solid red;
+			}
+		}
+	}
+	.list_box{
+	.content{
+		padding: 20rpx;
+		// margin-top: 20rpx;
+		background-color: #f8f9fa;
+		.nav_min{
+			display: flex;
+			margin-bottom: 20rpx;
+			// padding: 2;
+			.item{
+				margin-right: 20rpx;
+			}
+			.itemz{
+				font-weight: bold;
+			}
+		}
+	}
+	}
+	.nav_max{
+		display: flex;
+		justify-content: space-around;
+       .item{
+		   display: flex;
+		   align-items: center;
+		   justify-content: center;
+		   flex-direction: column;
+		   font-size: 30rpx;
+			 margin: 0 18rpx;
+		   .txt{
+			   font-size: 32rpx;
+			   color: #333333;
+			   z-index: 2;
+		   }
+		   .n-tv {
+			   color: #999;
+		   }
+		   .heng{
+			   bottom: -6rpx;
+			   width: 44rpx;
+			   border-radius: 4rpx;
+			   height: 6rpx;
+			   background-color: #0A5D3B;
+			   
+		   }
+	   }
+	}
+	
+	.info_box{
+
+		.content {
+			
+		}
+	}
+	.attention-scarch {
+		padding-left: 4rpx;
+	}
+	.input_box{
+		display: flex;
+	
+		.iconfont{
+			font-size: 50rpx;
+		}
+		input{
+			flex: 1;
+		}
+	
+	}
+	.container{
+		background-color: #fff;
+		min-height: 100vh;
+	}
+	
+	@keyframes tsinfo {
+		0% {transform:  translateX(8rpx);}
+		50% {transform:  translateX(-8rpx);}
+		100% {transform: translateX(8rpx);}
+	}
+</style>
diff --git a/iconfont.css b/iconfont.css
new file mode 100644
index 0000000..31938ab
--- /dev/null
+++ b/iconfont.css
@@ -0,0 +1,79 @@
+@font-face {font-family: "iconfont";
+  src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAiMAAsAAAAAD9QAAAg/AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCEYgqPVIwvATYCJANECyQABCAFhG0HgXAbQw0jkjBWE9lfFthubhBRyiSrUzRXp8wKpVxqlGjo1tposcEe7Mc4TiDSsuledI/vG/kAbu3fNnIjL3ZcptHFkVbE0AZtjrL4JnBmXplFGJ0fiLEZh4DoH5JhOY3naef71XUJBJhAEEU8o4HAZAFwqdMUcZg0TIZMvaylHdfeR36QQW9RqM0Bmc/HwNXS2YRSVWmyHkVHOKxKaXe3l8lSS1PEohnPIFRquYfugmsKYcEZjPUYrE3PWhRYgFHxYw8DQUB7lpyP9joMhjACKx43qA9GpJEV5BHSFhlR20+Wgy/LInIAlrHfJ35UzSWE5BUkqHpgi/7Yz0kPqcJ1d5th6q4dgOlKQBGUBzxTvJn2xeC8C6r+Gp4fIJGUfVIqYruH4XDHeyMWMk2YPvpPPJDomlQFt5lC4RiWC9EBLtHSr04peE7aCMkbKCBoAA8IMYAPhAggAEIIExiSIAJDNRADIQPQQPAADBAUQAIECZACQQBUQMgBg8HQBLaDQYOH2AQFAJRulDSQCnkXqAIipjNOXIJ2GNoLd4UmKOZ30XnHSzxIJGMgphOjBLRYnBnDi5eKWYlAmauoKBarpFOmuorMx1SKLb44oamQUTqPW4rjp232QsB5pvkfG4K3jQz3UUwoAzenyIJ3jKEneoHDMw0FBdEwW6NY/Uy69fymVmlmkeS4geoB/fP7GYJBYyikDwT0fn/9qK7Om/gD+XrjjVAw2Pl0MG1jqNWpQKrbb9h3lbtmuWG6Po1wFdGyMX4sxlAy0nmckVuOxu8I6uDYxBpsphijfXM0LIFpNCQEbfaoeE5vpnxrYTzf5etvaKQ3NhjIbN4emzNv9c5Rm479N5fBjUV99/EJU9EoA922ShIYJOdlGNPOo5bD28FqWwoJwtRX56ogSmelaVuMkTY7aGcSE3qC0Q+b63yDzmZjCVo0kGvH9oLiZMpkow0yq4fzRsvthcRq1zin11Jo8ilUP3PK9IdZsq2h5Jasl28tjiem+f26rUhGKGQMBrv0Nxj1gyZ17mrb4nFEDyjYHDPI7vJtGmH2sZQpPlBkYxVWa/QAJzpbPWYf0W2gbd3O9ZWxeLevierfxeoxdutScHA9O9Bm/t3X6vRu7VWwObrL2ks1pAevJHdbH6xpYyWjmie1eGO5qBY2Rkm2+Niu6y7XTGvswW3JsPlYHyen00YVI+DX6QucDuumLazB7989q1nYuBHf695ozvER0oX1F0rnqY/yXdH3oudFdBlB1BdYF3sBVZWtFvZuDNv5vAG9q1RbL05y1HMkpfPX96k2ZE/5wxW2tG0zZvZYrsHYQlUC/wIa9r2ULL7vbs/cp/VspkNuEp0tTs5u79ZlOWqu9ub0qoa5j+JZTRtd4FP0HS7gA/34UYdOCddr9Knd62T+sLhhiSYPMQqNK0+4h4cfNJhjbOBIXu08cuTwEWfK6oaOqLP8ZdfUaqkkX11ayuyJCfZk/edqZTtNCrXI+m1kR5NbJx+VtXkwsdbDiUlbQsFjh86/MrneYJEOF84vmj2Rnegk+/xFuTpnfXlUnu3r2GlsJ7Xqg6Cc8P1oxej3wnKCD8YTY8a0aN++qKhFdKa/9w2mMQnL3EDZy4+Fcl8Tl/xCKSBe62t8ofbCIccHG4XKmL0qpeqqBJLEhHV/av7ZkXArYQdrX5dQN6lovdx9t37fSmQEMWI1QRIppGRAzVBWW+eXdiUjT9+bY2w1G8fqfRQ6Rzet2Kxib6/w47hd/zPLiPdp3dPeE8sk4ds5pQ8rZCe6y9zSqLR3WLaM8uXQR8T0bismzO3FIYuI4MwcIXqkOT+I5C+Nj1N///KKeMddetzQopQ6ThW9T6u6LRqfO9mo2aJFPB4+Vfwb8S/C59YyLraic5dHVdnFaHdh4Sx5utTPXqsy1ziLq7F8lpFLX2PRUZaWmCZHh1brizLIJ5HTI7+Q1YtCC3Fdmo7vV1t5h3uDN11mK7qSXTEVzYzWDfOjkqRyupMTlvbmGk+f2yjeUr6lb7e7rASxKCmLXETyeUm3jcZ+5DCuke5kn9yU1HmB07GKqqCTigiVCEIWSNSWG42D4yr3rzQgJtiis8MxSa8PW9ZJXHpAx2/iYS0Ht8l/mT4te8qplZw2f0FH9eK1cLKggxozSY+HnEnDebaiVzgA4VmboTiWY+gDyBJsAgCqKpWBgtHk1YLG5McijixNL5njBcIliNYEAKhKZL3w/+F4ZFcuqWpkPSD8wEUlqdM3PVQ56ccbvq/VLe8lr/9NxPwjjdzlDpnVlvCnZZBDAJWNkg3K6ALV/5aPmVDldyNkNEBPCD84Adsh/H/U0GGlEhrwx0kANL0ESDy9Ebg/rIiubJTjRHRASAiRSCiIkKHmpZcnfDCoTgQQoRGhUQ6tYjOIxFhQIHhiAHmYpxACCuwkJGQoJhQUuKSFFun3CB8s3hEBFARFaBiISEkGWWFx168RIWNn1nvjrHqyWvI1X/mFXEaIYTMr+8OY3IhpqyY+84keYxch0oaXOZOhqJP5UB6H46hmjtqjzZXkPK/qmrJCVlanxTVeI0J263bGeq/prHq6Ol8nfv4LuYwQCw58a/5hTO72RqvSVFB/cl/pwKmsTxteymo7GXs86iTEh9aOI51UY8721KPNFWkwPq/U6kVUlVfDi+ncXwOgQf6CMscUDCeoJI3OYLLYHG6e8uxuihYpLhTwOwcPkRsOop6vb8ouegc+a7nonOctuvtc3JClf7rswF/v3Ra8FayhRYdLUgv10kcCnnLFSlV+VUy55bVnHeiuXCYB27Wu4648j3D1z1q2pUy424QQrSQtqehiAQ==') format('woff2'),
+  url('iconfont.woff?t=1616549770830') format('woff'),
+  url('iconfont.ttf?t=1616549770830') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.iconyouhuiquanxia:before {
+  content: "\e60d";
+}
+
+.iconyouhuiquanzhong:before {
+  content: "\e60c";
+}
+
+.iconyouhuiquan:before {
+  content: "\e60b";
+}
+
+
+.iconjiantou:before {
+  content: "\e60a";
+}
+
+.icondingwei:before {
+  content: "\e608";
+}
+
+.icontuikuandingdan:before {
+  content: "\e607";
+}
+
+.iconyiwancheng:before {
+  content: "\e606";
+}
+
+.icondaishouhuo:before {
+  content: "\e605";
+}
+
+.icondaifahuo:before {
+  content: "\e604";
+}
+
+.icondaifukuan:before {
+  content: "\e603";
+}
+
+.iconchenggong:before {
+  content: "\e668";
+}
+
+.icondaoxu:before {
+  content: "\e602";
+}
+
+.iconshaixuan:before {
+  content: "\e6ad";
+}
+
+.iconshangla:before {
+  content: "\e609";
+}
+
+.icon_gouwuche:before {
+  content: "\e618";
+}
+
+.iconsearchsousuo:before {
+  content: "\e6e0";
+}
+
diff --git a/iconfont.ttf b/iconfont.ttf
new file mode 100644
index 0000000..87281eb
Binary files /dev/null and b/iconfont.ttf differ
diff --git a/iconfont.woff b/iconfont.woff
new file mode 100644
index 0000000..b4669b9
Binary files /dev/null and b/iconfont.woff differ
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..b326e77
--- /dev/null
+++ b/main.js
@@ -0,0 +1,294 @@
+import Vue from 'vue';
+import App from './App';
+import store from './store';
+
+//Vue.prototype.goto = function(e){
+//	$.goto(e.currentTarget.dataset.url)
+//};
+Vue.config.productionTip = false;
+Vue.mixin({
+	onShareAppMessage:function(){
+		return this._sharewx();
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx();
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+	methods: {
+		goto:function(e){
+			getApp().goto(e.currentTarget.dataset.url,e.currentTarget.dataset.opentype)
+		},
+		goback:function(){
+			getApp().goback();
+		},
+		getmenuindex:function(menuindex){
+			this.menuindex = menuindex
+		},
+		loaded:function(obj){
+			if(obj && obj.title && !obj.desc) obj.desc = obj.title
+			var that = this;
+			uni.stopPullDownRefresh();
+			var app = getApp();
+			if(app.globalData.isinit == false){
+				app.get('ApiIndex/linked',{},function(){
+					that.isload = true;
+					that._sharemp(obj);
+				});
+			}else{
+				this.isload = true;
+				this._sharemp(obj);
+			}
+		},
+		getdata:function(){
+			var that = this;
+			getApp().get('ApiIndex/linked',{},function(){
+				that.loaded();
+			});
+		},
+		getplatform:function(){
+			return getApp().globalData.platform;
+		},
+		_sharemp:function(obj){
+			//#ifdef H5
+			var app = getApp();
+			if(app.globalData.platform != 'mp') return;
+			if(!obj) obj = {};
+			if(!obj.link) obj.link = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ this.sharepath();
+			var currenturl = '/' + (this.route ? this.route : this.__route__); //当前页面url
+			if(this.opt && this.opt.id){
+				currenturl+='?id='+this.opt.id
+			}else if(this.opt && this.opt.cid){
+				currenturl+='?cid='+this.opt.cid
+			}else if(this.opt && this.opt.gid){
+				currenturl+='?gid='+this.opt.gid
+			}else if(this.opt && this.opt.bid){
+				currenturl+='?bid='+this.opt.bid
+			}
+			var sharelist = app.globalData.initdata.sharelist;
+			if(sharelist){
+				for(var i=0;i<sharelist.length;i++){
+					if(sharelist[i]['indexurl'] == currenturl){
+						obj.title = sharelist[i].title;
+						obj.desc = sharelist[i].desc;
+						obj.pic = sharelist[i].pic;
+						if(sharelist[i].url){
+							var sharelink = sharelist[i].url;
+							if(sharelink.indexOf('/') === 0){
+								sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+							}
+							if(app.globalData.mid>0){
+								 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+							}
+							obj.link = sharelink;
+						}
+					}
+				}
+			}
+			//app.alert('分享信息' + JSON.stringify(obj));
+			var jweixin = require('jweixin-module');
+			jweixin.ready(function () {   //需在用户可能点击分享按钮前就先调用
+				jweixin.onMenuShareAppMessage({ 
+					title: obj.title || app.globalData.initdata.name,
+					desc: obj.desc || app.globalData.initdata.desc,
+					link: obj.link || '',
+					imgUrl: obj.pic || app.globalData.initdata.logo,
+					success: function () {
+						obj.callback && obj.callback();
+					},
+				})
+				jweixin.onMenuShareTimeline({ 
+					title: obj.title || app.globalData.initdata.name,
+					desc: obj.desc || app.globalData.initdata.desc,
+					link: obj.link || '',
+					imgUrl: obj.pic || app.globalData.initdata.logo,
+					success: function () {
+						obj.callback && obj.callback();
+					},
+				})
+			});
+			//#endif
+		},
+		_sharewx:function(obj){
+			if(!obj) obj = {};
+			var app = getApp();
+			var pages = getCurrentPages(); //获取加载的页面
+			var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+			var currenturl = '/' + (currentPage.route ? currentPage.route : currentPage.__route__); //当前页面url 
+
+			var opt = this.opt;
+			if(this.opt && this.opt.id){
+				currenturl+='?id='+this.opt.id
+			}else if(this.opt && this.opt.cid){
+				currenturl+='?cid='+this.opt.cid
+			}else if(this.opt && this.opt.gid){
+				currenturl+='?gid='+this.opt.gid
+			}else if(this.opt && this.opt.bid){
+				currenturl+='?bid='+this.opt.bid
+			}
+			var sharelist = app.globalData.initdata.sharelist;
+			if(sharelist){
+				for(var i=0;i<sharelist.length;i++){
+					if(sharelist[i]['indexurl'] == currenturl){
+						obj.title = sharelist[i].title;
+						obj.desc = sharelist[i].desc;
+						obj.pic = sharelist[i].pic;
+						obj.link = sharelist[i].url;
+					}
+				}
+			}
+			var sharepath = this.sharepath();
+			if(obj.title){
+				var title = obj.title
+			}else{
+				var title = app.globalData.initdata.name;
+			}
+			if(obj.pic){
+				var imgUrl = obj.pic
+			}else{
+				var imgUrl = '';
+			}
+			console.log(sharepath);
+			typeof obj.callback == 'function' && obj.callback();
+			return {
+				title: title,
+				path: sharepath, 
+				imageUrl: imgUrl
+			}
+		},
+		sharepath:function(){
+			var app = getApp();
+			var opt = this.opt;
+			var currentpath = '/' + (this.route ? this.route : this.__route__); //当前页面url
+			var scene = [];
+			for(var i in opt){
+				if(i != 'pid'){
+					scene.push(i+'_'+opt[i]);
+				}
+			}
+			console.log(app.globalData.mid);
+			if(app.globalData.mid){
+				scene.push('pid_'+app.globalData.mid);
+			}
+			var scenes = scene.join('-');
+			if(scenes){
+				currentpath = currentpath + "?scene="+scenes + '&t='+parseInt((new Date().getTime())/1000);
+			}
+			return currentpath;
+		},
+		t:function(text){
+			if(text=='color1'){
+				return getApp().globalData.initdata.color1;
+			}else if(text=='color2'){
+				return getApp().globalData.initdata.color2;
+			}else if(text=='color1rgb'){
+				var color1rgb = getApp().globalData.initdata.color1rgb;
+				return color1rgb['red']+','+color1rgb['green']+','+color1rgb['blue'];
+			}else if(text=='color2rgb'){
+				var color2rgb = getApp().globalData.initdata.color2rgb;
+				return color2rgb['red']+','+color2rgb['green']+','+color2rgb['blue'];
+			}else{
+				return getApp().globalData.initdata.textset[text] || text;
+			}
+		},
+		inArray: function (search, array) {
+			for (var i in array) {
+				if (array[i] == search) {
+					return true;
+				}
+			}
+			return false;
+		},
+		isNull:function(num){
+			return (num == undefined || num == "undefined" || num == null || num == "");
+		},
+		isEmpty:function(list){
+			return (!list || list.length === 0 || (list.length === 1 && (!list[(0)] || list[(0)].length === 0)))
+		},
+		date:function(time,format){
+			if(format == undefined || format == "undefined" || format == null || format == "") format = 'Y-m-d H:i:s';
+			var date = new Date();
+			if(time != '' || time > 0) {
+				date = new Date(time * 1000);
+			}
+			
+			var Y = date.getFullYear();
+			var m = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) ;
+			var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+			var H = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+			var i = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+			var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+			format = format.replace('Y',Y);
+			format = format.replace('m',m);
+			format = format.replace('d',d);
+			format = format.replace('H',H);
+			format = format.replace('i',i);
+			format = format.replace('s',s);
+			return format;
+		},
+		getDistance: function (lat1, lng1, lat2, lng2) {
+			if(!lat1 || !lng1 || !lat2 || !lng2) return '';
+			var rad1 = lat1 * Math.PI / 180.0;
+			var rad2 = lat2 * Math.PI / 180.0;
+			var a = rad1 - rad2;
+			var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+			var r = 6378137;
+			var juli = r * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(rad1) * Math.cos(rad2) * Math.pow(Math.sin(b / 2), 2)));
+			juli = juli/1000
+			juli = juli.toFixed(2);
+			return juli;
+		},
+		previewImage: function (e) {
+			var imgurl = e.currentTarget.dataset.url
+			var imgurls = e.currentTarget.dataset.urls
+			if (!imgurls) imgurls = imgurl;
+			if (typeof (imgurls) == 'string') imgurls = imgurls.split(',');
+			uni.previewImage({
+				current: imgurl, 
+				urls: imgurls 
+			})
+		},
+		subscribeMessage:function(callback){
+			var app = getApp();
+			// #ifdef MP-WEIXIN
+			var that = this;
+			var tmplids = that.tmplids;
+			if(tmplids && tmplids.length > 0){
+				uni.requestSubscribeMessage({
+					tmplIds: tmplids,
+					success:function(res) {
+						for(var i in tmplids){
+							if(res[tmplids[i]] == 'accept'){
+								app.post('ApiIndex/subscribemessage',{tmplid:tmplids[i]},function(){})
+							}
+						}
+						console.log(res)
+						typeof callback == "function" && callback();
+					},
+					fail:function(res){
+						console.log(res)
+						typeof callback == "function" && callback();
+					}
+				})
+			}else{
+				typeof callback == "function" && callback();
+			}
+			// #endif
+			// #ifndef MP-WEIXIN
+			typeof callback == "function" && callback();
+			// #endif
+		},
+	}
+});
+
+App.mpType = 'app';
+
+const app = new Vue({
+    ...App,
+	store,
+});
+app.$mount();
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..8114dd6
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,187 @@
+{
+    "name" : "点大商城",
+    "appid" : "__UNI__64CFC7C",
+    "description" : "",
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
+    "transformPx" : false,
+    "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "OAuth" : {},
+            "Share" : {},
+            "Payment" : {},
+            "VideoPlayer" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [
+                            "applinks:v2ulink.diandashop.com",
+                            "applinks:static-7c82a81f-93f5-4c76-aa1d-9f56479b257e.bspapp.com",
+                            "applinks:ulink.diandashop.com"
+                        ]
+                    }
+                },
+                "idfa" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "从相册中选择图片作为用户头像及商品评价等",
+                    "NSLocationWhenInUseUsageDescription" : "用于展示店铺距离",
+                    "NSCameraUsageDescription" : "拍摄图片作为用户头像及商品评价等",
+                    "NSPhotoLibraryAddUsageDescription" : "保存商品海报等图片到手机",
+                    "NSMicrophoneUsageDescription" : "录音上传到用户点评",
+                    "NSLocationAlwaysUsageDescription" : "实时获取位置进行定位",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "获取当前位置用于展示距离"
+                }
+            },
+            "sdkConfigs" : {
+                "ad" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxd441dec22ba4fdff",
+                        "appsecret" : "",
+                        "UniversalLinks" : "https://ulink.diandashop.com/uni-universallinks/__UNI__9080613"
+                    },
+                    "apple" : {}
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxd441dec22ba4fdff",
+                        "UniversalLinks" : "https://ulink.diandashop.com/uni-universallinks/__UNI__9080613"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxd441dec22ba4fdff",
+                        "UniversalLinks" : "https://ulink.diandashop.com/uni-universallinks/__UNI__9080613"
+                    },
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wx3c09cbc4619152de",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        },
+        "requiredPrivateInfos" : [ "chooseAddress", "chooseLocation", "getLocation" ],
+        "plugins" : {}
+    },
+    "mp-alipay" : {
+        "usingComponents" : true,
+        "appid" : "2021002142648644"
+    },
+    "mp-baidu" : {
+        "usingComponents" : true,
+        "appid" : "23935205"
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true,
+        "appid" : "ttdf53a9ee406be5c001"
+    },
+    "h5" : {
+        "router" : {
+            "base" : "./"
+        },
+        "title" : "点大商城",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "ABLBZ-4BIKU-GFTVB-BK7IK-OLQ35-QCBFF"
+                }
+            }
+        }
+    },
+    "mp-qq" : {
+        "appid" : "1111614727",
+        "setting" : {
+            "es6" : true,
+            "minified" : true
+        }
+    },
+    "_spaceID" : "de1419c6-c6c9-4817-a01a-f508977ee3df"
+}
diff --git a/newOtherPages/activityIntroduce/activityIntroduce.vue b/newOtherPages/activityIntroduce/activityIntroduce.vue
new file mode 100644
index 0000000..579ee7f
--- /dev/null
+++ b/newOtherPages/activityIntroduce/activityIntroduce.vue
@@ -0,0 +1,32 @@
+<template>
+	<view class="activity-introduce">
+		<image class="img" src="" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			
+		},
+		methods: {
+			getDetail() {
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.activity-introduce {
+		
+		.img {
+			width: 100%;
+		}
+	}
+</style>
diff --git a/newOtherPages/editProfile/editProfile.vue b/newOtherPages/editProfile/editProfile.vue
new file mode 100644
index 0000000..ee9125d
--- /dev/null
+++ b/newOtherPages/editProfile/editProfile.vue
@@ -0,0 +1,217 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="pages-hd" :style="'padding-top:' + menuButtonTop + 'px;height:' + (menuButtonHeight+95) + 'px'">
+			<image class="pages-hd__bg" :src="event_rul +'/static/images/userinfo-bg.png'" mode="widthFix"></image>
+			<view class="pages-hd__navigation flex al-item-center" :style="'height:' + menuButtonHeight + 'px'">
+				<text class="iconfont icon-icon_arrow_left"></text>
+				<view class="pages-hd__title">编辑资料</view>
+			</view>
+		</view>
+		<view class="content">
+			<view class="user-hd flex j-center">
+				<image class="user-hd__img" :src="userinfo.headimg" style="width:156rpx;height:156rpx;" />
+			</view>
+			<view class="info-item flex" >
+				<view class="info-item__hd flex al-item-center">
+					<text class="iconfont icon-wode"></text>
+					<text class="info-item__hd-title">昵称</text>
+				</view>
+				<view class="info-item__bd light">{{userinfo.nickname}}</view>
+			</view>
+			<view class="info-item flex" >
+				<view class="info-item__hd flex al-item-center">
+					<text class="iconfont icon-wode1"></text>
+					<text class="info-item__hd-title">ID</text>
+				</view>
+				<view class="info-item__bd light">{{userinfo.id}}</view>
+			</view>
+			<view class="info-item flex" @tap="goto" data-url="/pages/my/setvita">
+				<view class="info-item__hd flex al-item-center">
+					<text class="iconfont icon-jianjie-03"></text>
+					<text class="info-item__hd-title">个人简介</text>
+				</view>
+				<view class="info-item__bd flex" :class="{'light':userinfo.autograph}">
+					<view class="info-item__bd-txt">{{userinfo.autograph ? userinfo.autograph : '有趣的简介可以吸引粉丝'}}</view>
+					<text class="iconfont icon-arrow-right"></text>
+				</view>
+			</view>
+<!-- 			<view class="info-item" @tap="goto" data-url="setrealname">
+				<view class="t1">姓名</view>
+				<view class="t2">{{userinfo.realname}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="settel">
+				<view class="t1">手机号</view>
+				<view class="t2">{{userinfo.tel}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view> -->
+			<view class="info-item flex" @tap="goto" data-url="/pages/my/setsex">
+				<view class="info-item__hd flex al-item-center">
+					<text class="iconfont icon-nvsheng"></text>
+					<text class="info-item__hd-title">性别</text>
+				</view>
+				<view class="info-item__bd flex" :class="{'light' : userinfo.sex == 1 || userinfo.sex == 2}">
+					<view class="info-item__bd-txt">{{userinfo.sex != 1 ? (userinfo.sex == 2 ? '女': '未知') : '男'}}</view>
+					<text class="iconfont icon-arrow-right"></text>
+				</view>
+			</view>
+			<view class="info-item flex" @tap="goto" data-url="/pages/my/setbirthday">
+				<view class="info-item__hd flex al-item-center">
+					<text class="iconfont icon-dangao"></text>
+					<text class="info-item__hd-title">生日</text>
+				</view>
+				<view class="info-item__bd flex" :class="{'light':userinfo.birthday}">
+					<view class="info-item__bd-txt">{{userinfo.birthday ? userinfo.birthday : '未知'}}</view>
+					<text class="iconfont icon-arrow-right"></text>
+				</view>
+			</view>
+		</view>
+		
+		<!-- <view class="content">
+			<view class="info-item" @tap="goto" data-url="setweixin">
+				<view class="t1">微信号</view>
+				<view class="t2">{{userinfo.weixin}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="setaliaccount">
+				<view class="t1">支付宝账号</view>
+				<view class="t2">{{userinfo.aliaccount}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="setbankinfo">
+				<text class="t1">银行卡</text>
+				<text class="t2">{{userinfo.bankname ? '已设置' : ''}}</text>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view> -->
+		
+	<!-- 	<view class="content">
+			<view class="info-item" @tap="goto" data-url="/pages/address/address">
+				<view class="t1">收货地址</view>
+				<view class="t2"></view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+		<view class="content" v-if="userinfo.haspwd==1">
+			<view class="info-item" @tap="goto" data-url="/pages/my/setpwd">
+				<view class="t1">修改密码</view>
+				<view class="t2"></view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+		<view class="content">
+			<view class="info-item" @tap="goto" data-url="/pages/index/login">
+				<view class="t1">切换账号</view>
+				<view class="t2"></view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view> -->
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		menuButtonTop: 0,
+		menuButtonHeight: 0,
+
+		userinfo:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+
+		// #ifdef MP
+		// 获取右上角胶囊坐标信息
+		let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+		this.menuButtonTop = menuButtonInfo.top;  // 胶囊到顶部的距离
+		this.menuButtonHeight = menuButtonInfo.height;  // 胶囊的高度
+		// #endif
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/set', {}, function (data) {
+				that.loading = false;
+				that.userinfo = data.userinfo;
+				that.loaded();
+			});
+		},
+		uploadHeadimg:function(){
+			var that = this;
+			app.chooseImage(function(urls){
+				var headimg = urls[0];
+				that.userinfo.headimg = headimg;
+				app.post('ApiMy/setfield',{headimg:headimg});
+			},1)
+		}
+  }
+};
+</script>
+<style lang="scss">
+.container {background:#FFFFFF;min-height: 100vh;}
+.text-overflow-tx {text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
+.pages-hd {
+	padding: 0 30rpx;box-sizing: content-box;
+	&__bg {position: absolute;top: 0;left: 0;width: 100%;z-index: 0;}
+	.icon-icon_arrow_left {font-size: 46rpx; color: #FFFFFF;flex-shrink: 0;}
+	&__title {font-size: 32rpx;color: #FFFFFF; flex: 1;text-align: center;padding-right: 46rpx;}
+}
+.content {background:#FFFFFF;padding: 100rpx 40rpx 0; position: relative;border-radius: 12rpx 12rpx 0 0;}
+.user-hd {
+	margin-top: -83rpx;position: absolute;left: 0;right: 0;top: 0;
+	&__img {width: 166rpx;height: 166rpx;border-radius: 50%;}
+}
+.info-item {
+	align-items: flex-start;padding: 24rpx 0;font-size: 28rpx;line-height: 40rpx;
+	&:not(:last-child) {border-bottom: 1px #f3f3f3 solid;}
+	&__hd {
+		width: 30%;
+		.iconfont {
+			font-size: 32rpx;margin-right: 22rpx;font-weight: bold;
+			&.dangao {font-weight: normal;}
+		}
+		&-title {font-weight: bold;color: #333333;}
+	}
+	&__bd {
+		flex: 1;justify-content: flex-start;text-align: right;color: #333333;
+		&.light {
+			font-weight: bold;
+			.info-item__bd-txt {color: #333333;}
+		}
+		&-txt {
+			color: #999999;flex: 1;
+		}
+		.iconfont {font-size: 38rpx;flex-shrink: 0;}
+	}
+
+}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx;color: #8B8B8B;font-weight:bold;height:92rpx;line-height:92rpx}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+.img-ac {border-radius: 400rpx;}
+
+</style>
\ No newline at end of file
diff --git a/newOtherPages/knowBean/knowBean.vue b/newOtherPages/knowBean/knowBean.vue
new file mode 100644
index 0000000..e6bc554
--- /dev/null
+++ b/newOtherPages/knowBean/knowBean.vue
@@ -0,0 +1,32 @@
+<template>
+	<view class="know-bean">
+		<image class="img" src="" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			
+		},
+		methods: {
+			getDetail() {
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.know-bean {
+		
+		.img {
+			width: 100%;
+		}
+	}
+</style>
diff --git a/newOtherPages/moreSearch/moreSearch.vue b/newOtherPages/moreSearch/moreSearch.vue
new file mode 100644
index 0000000..c9de507
--- /dev/null
+++ b/newOtherPages/moreSearch/moreSearch.vue
@@ -0,0 +1,641 @@
+<template>
+	<view class="more-search">
+		<view class="more-search-input">
+			<view class="flex al-item-center j-between">
+				<input type="text" @confirm="search" v-model="searchValue" :placeholder="placeholderTex" class="input" />
+				<view class="input-tex-btn text-center" :style="{'background-color': t('color1')}" @click="search">搜索</view>
+			</view>
+			<view class="shop-stor flex al-item-center j-evenly" v-show="opsType === 'goods'">
+				<text class="shop-tex" :class="shopSort == 1 ? 'shop-atv': ''" @tap="sortNav(1)">品牌店</text>
+				<text class="shop-tex" :class="shopSort == 2 ? 'shop-atv': ''" @tap="sortNav(2)">专营店</text>
+			</view>
+		</view>
+		<view :style="{'height': searchHeight  + 'px'}"></view>
+		<view class="more-search-record" :style="{'top': searchHeight  + 'px'}">
+			<!-- {{recordList}} -->
+			<view class="record-title font-w">
+				已添加的{{opsType == 'topic'? '话题':'商品'}}（{{recordList.length}}/5）
+			</view>
+			<view class="record-content">
+				<block v-for="(item, ixd) in recordList" :key="item.id">
+					<view class="more-search-record-t" >
+						<text class="txt">{{item.name}}</text>
+						<text class="record-icon iconfont icon-shanchu1" @click="delRecord(ixd, item.id)"></text>
+					</view>
+				</block>
+			</view>
+		</view>
+		<view :style="{'height': recordHeight  + 'px'}"></view>
+	<view v-if="opsType == 'goods'" style="padding-top: 10rpx;">
+		<block v-for="(item,idx) in searchTopicList" :key="idx">
+			<view class="more-search-list" :class="item.checked == true ? 'more-search-list-show':''" @click="handleDetail(item.name, item.id, idx)" >
+				<view class="more-search-list-c">
+					<view class="more-search-list-c-t" v-if="item.business">
+						<image class="batle-img" :src="item.business.logo" mode=""></image>
+						<text>{{item.business.name}}</text>
+					</view>
+					<view class="more-search-list-c-c">
+						<image class="list-img" v-if="item.pic" :src="item.pic" mode=""></image>
+						<image class="list-img" v-else :src="item.cover_pic" mode=""></image>
+						<view class="more-search-list-c-c-r">
+							<text class="list-c-c-r-til">{{item.name}}</text>
+							<text class="list-c-c-r-price" v-if="item.sell_price">¥{{item.sell_price}}</text>
+							<text class="list-c-c-r-price" v-else>¥{{item.price}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+	</view>
+	<view  v-else style="padding-top: 10rpx;">
+		<block v-for="(item,idx) in searchTopicList" :key="idx">
+			<view class="more-search-list" :class="item.checked == true ? 'more-search-list-show':''" @click="handleDetail(item.topic_name, item.id, idx)">
+				<view class="more-search-list-c">
+				<!-- 	<view class="more-search-list-c-t">
+						<image class="batle-img" :src="item.business.logo" mode=""></image>
+						<text>{{item.topic_name}}</text>
+					</view> -->
+					<view class="more-search-list-c-c">
+						<!-- <image class="list-img" :src="item.pic" mode=""></image> -->
+						<view class="jin">
+							#
+						</view>
+						<view class="more-search-list-c-c-r">
+							<text class="list-c-c-r-til">{{item.topic_name}}</text>
+							<!-- <text class="list-c-c-r-price">¥{{item.sell_price}}</text> -->
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+	</view>
+	<view class="show-t" v-show="showText_box">
+		<view class="">{{showText_t}}</view>
+		<view class="">{{showText_b}}</view>
+	</view>
+
+		<loading v-if="loading"></loading>
+		<nomore v-if="!isData"></nomore>
+		<nodata v-if="!nodata"></nodata>
+		<view style="height: 204rpx;"></view>
+		<view class="flex_box">
+			<button type="default" :style="{'background-color': t('color1')}" @click="submit">确认</button>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				loading: false,
+				searchValue: '',
+				// uni.getStorageSync('goods_type_arr')||
+				recordList:[],
+				searchBoxList: [],
+				searchTopicList: [],
+				placeholderTex: '请输入搜索内容',
+				opsType: '',
+				pages: 1,
+				isData: true,
+				searchHeight: 0, // 搜索高度
+				recordHeight: 0, // 记录高度
+				nodata: true,
+				showText_box: false,
+				showText_t: '',
+				showText_b: '',
+				shopSort: 1,
+				
+				timeou: null,
+				timeouTow: null,
+				arrRecordList: [],
+				isSearch: false
+				
+			}
+		},
+		onLoad(options) {
+	
+			this.opsType = options.type
+			if(options.records && this.opsType == 'goods') {
+				this.recordList = JSON.parse(options.records)
+			}
+			if(uni.getStorageSync('is_more_record_goods') && this.opsType == 'goods') {
+				this.recordList = uni.getStorageSync('is_more_record_goods')
+			}else if(uni.getStorageSync('is_more_record_topic') && this.opsType == 'topic') {
+				this.recordList = uni.getStorageSync('is_more_record_topic')
+			}
+			if(this.opsType == 'topic') {
+
+				this.arrRecordList = JSON.parse(options.topicArr)
+				
+			}else {
+				this.arrRecordList = JSON.parse(options.goodsArr)
+			}
+			this.getSearchTopicList()
+	
+
+		},
+
+		onUnload() {
+			clearTimeout(this.timeou)
+			clearTimeout(this.timeouTow)
+		},
+		onReady() {
+			let quert = uni.createSelectorQuery()
+			quert.select('.more-search-input').boundingClientRect()
+			quert.select('.more-search-record').boundingClientRect()
+			quert.exec(res =>{
+				let boheight = null
+				res.forEach((item,idx) => {
+					if(idx == 0) {
+						this.searchHeight = item.height
+					}else if(idx == 1) {
+						this.recordHeight = item.height
+					}
+					boheight += item.height
+				})
+			})
+		},
+		// 到底触发
+		onReachBottom(e) {
+			// console.log(e, '----')
+			if (this.isData) {
+				this.pages++	
+				this.getSearchTopicList()
+			}
+		},
+		methods: {
+			// 商品时选择的---店铺
+			sortNav(num) {
+
+				this.shopSort = num
+				this.isSearch = false
+				this.isData = true
+				this.nodata = true
+				this.pages = 1
+				this.searchBoxList = []
+				// this.recordList = []
+				this.searchTopicList = []
+				this.getSearchTopicList()
+			},
+			recordStyle() {
+				if(this.timeou) {
+					clearTimeout(this.timeou)
+				}
+				let quert = uni.createSelectorQuery()
+				this.timeou = setTimeout(() => {
+						quert.select('.more-search-record').boundingClientRect()
+						quert.exec(res =>{
+							this.recordHeight = res[0].height
+						})
+				}, 100)
+
+			},
+			submit(){
+				uni.setStorageSync('is_more_show_'+this.opsType,true)
+				if(this.opsType == 'goods') {
+					uni.setStorageSync('is_more_record_goods',this.recordList)
+				}else {
+					uni.setStorageSync('is_more_record_topic',this.recordList)
+				}
+				
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			// 搜索
+			search() {
+				if(this.recordList.length > 0) {
+					this.arrRecordList = this.recordList
+				}
+				this.isSearch = true
+				this.nodata = true
+				this.isData = true
+				this.pages = 1
+				this.searchBoxList = []
+				this.searchTopicList = []
+				this.getSearchTopicList()
+
+			},
+			delRecord(idx, ndx) {
+
+				this.searchTopicList.forEach((item, idx) => {
+					if(ndx == item.id) {
+						item.checked = false
+					}
+				})
+				this.recordList.splice(idx, 1)
+				let idarr = []
+				this.recordList.forEach(item => {
+					idarr.push(item.id)
+				})
+				if(this.opsType == 'topic') {
+					uni.setStorageSync('topic_type_id', idarr)
+				}else {
+					uni.setStorageSync('goods_type_id', idarr)
+					
+				}
+				this.recordStyle()
+			},
+			handleDetail(name, id, idx) {
+
+				if(this.showText_box == true) {
+					return
+				}
+				this.searchTopicList[idx].checked = !this.searchTopicList[idx].checked
+				let indarr = []
+				this.recordList.forEach(item => {
+					indarr.push(item.id)
+				})
+				let timeout
+				if (timeout) {
+					clearTimeout(timeout)
+				}
+				if(this.recordList.length == 5 && this.searchTopicList[idx].checked) {
+						this.showText_box = true
+						if (this.opsType == 'topic') {
+							// app.error('最多添加5个话题标签,可删除已选标签，再次添加')
+							this.showText_t = '最多添加5个话题标签' 
+							this.showText_b = '可删除已选标签，再次添加'
+							timeout = setTimeout(() => {
+								this.showText_box = false
+							}, 1500)
+						}else {
+							this.showText_t = '最多添加5个商品'
+							this.showText_b = '可删除已选商品，再次添加'
+							timeout = setTimeout(() => {
+								this.showText_box = false
+							}, 1500)
+							// app.error('最多添加5个商品,可删除已选商品，再次添加')
+						}
+						if(indarr.includes(id)) {
+
+						}else {
+							this.searchTopicList[idx].checked = false
+
+						}
+
+				}
+				
+				if (this.searchTopicList[idx].checked) {
+					if(this.recordList.length >= 0 && this.recordList.length<= 4) {
+						if(this.recordList.every((item,index)=>{return item.id !== id})){
+							this.recordList.unshift({name: name, id: id, sign: this.shopSort == 1 ? 0 : 1})
+						}
+					}
+				}else {
+					if (this.recordList.length > 0 ) {
+						this.recordList.forEach((data, nx) => {
+							if(id == data.id) {
+								this.recordList.splice(nx, 1)
+							}
+						})
+					}
+				}
+				
+				let idarr = []
+				this.recordList.forEach(item => {
+					if(this.opsType == 'topic') {
+						idarr.push(item.id)
+					}else {
+						idarr.push(item.sign + '_' + item.id)
+					}
+					
+				})
+				
+				idarr = [...  new Set(idarr)]
+				
+				if(this.opsType == 'topic') {
+					uni.setStorageSync('topic_type_id', idarr)
+				}else {
+					uni.setStorageSync('goods_type_id', idarr)
+				}
+
+				this.recordStyle()
+			},
+			
+			// 话题-带货- 搜索
+			getSearchTopicList() {
+				if(this.recordList.length) {
+					this.arrRecordList = this.recordList
+				}
+				this.loading = true
+				let url = this.shopSort == 1 ? 'ApiShop/getGoodsList' : 'ApiShop/getSaasGoodsList'
+				if(this.opsType == 'topic'){
+					url = 'ApiZhiwei/topicReleaseList'
+				}
+
+				app.post(url, {pagenum: this.pages,keyword:this.searchValue,topic_name:this.searchValue}, (res) => {
+					this.loading = false
+					if(res.data.length > 0) {
+						this.searchTopicList = [...this.searchTopicList,...res.data]
+					}else if(res.data.length == 0 && this.searchTopicList.length > 0) {
+						this.isData =false
+					}else if(res.data.length == 0 && this.searchTopicList.length == 0) {
+						this.nodata = false
+					}
+					this.searchTopicList.forEach((item,idx) => {
+						item.checked = false
+					})
+					if(this.recordList.length > 0 && this.arrRecordList.length == 0 ) {
+						for(let i =0; i < this.recordList.length; i++) {
+							const index = this.searchTopicList.findIndex((item) => {return  item.id === this.recordList[i].id})
+							this.searchTopicList.forEach((data,idx) => {
+								if(idx == index) {
+									data.checked = true
+								}
+							})
+						}
+					}
+					if(this.arrRecordList.length > 0) {
+						if(this.recordList.length == 0) {
+							for(let i =0; i < this.arrRecordList.length; i++) {
+								const index = this.searchTopicList.findIndex((item) => {return this.opsType == 'topic' ? item.id === this.arrRecordList[i] : (this.shopSort == 1 ? '0_'+item.id : '1_'+item.id) === this.arrRecordList[i]})
+								this.searchTopicList.forEach((data,idx) => {
+									if(idx == index) {
+										data.checked = true
+										if(!this.isSearch && this.opsType == 'topic') {
+											this.recordList.unshift({name: this.opsType == 'topic'? data.topic_name : data.name, id: data.id})
+										}
+									}
+								})
+							}
+						}else {
+							if(this.opsType == 'topic') {
+								for(let i =0; i < this.arrRecordList.length; i++) {
+									const index = this.searchTopicList.findIndex((item) => {return  item.id === this.arrRecordList[i].id })
+									this.searchTopicList.forEach((data,idx) => {
+										if(idx == index) {
+											data.checked = true
+										}
+									})
+								}
+							}else {
+								for(let i =0; i < this.arrRecordList.length; i++) {
+									const index = this.searchTopicList.findIndex((item) => {return  (this.shopSort == 1 ? '0_'+item.id : '1_'+item.id) === ( this.recordList.length > 0 ? this.arrRecordList[i].sign + '_' + this.arrRecordList[i].id : this.arrRecordList[i] ) })
+									this.searchTopicList.forEach((data,idx) => {
+										if(idx == index) {
+											data.checked = true
+										}
+									})
+								}
+							}
+
+						}
+					}
+				})
+				if(this.timeouTow) {
+					clearTimeout(this.timeouTow)
+				}
+				// this.timeouTow = setTimeout(() =>{
+				// 	this.recordStyle()
+				// }, 200)
+				
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex_box{
+		width: 100%;
+		height: 204rpx;
+		padding: 0 20rpx;
+		position: fixed;
+		// right: 20rpx;
+		bottom: 0rpx;
+		left: 0rpx;
+		background-color: #FFF;
+		// border-radius: 40rpx 40rpx 0 0 ;
+	
+		button{
+			margin-top: 30rpx;
+			background-color: #d6a662;
+			font-weight: bold;
+			color: #fff;
+			// margin-right: 20rpx;
+			border-radius: 40rpx;
+		}
+	}
+	.jin{
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 40rpx;
+		background-color: #efbd6f;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #fff;
+	}
+	.more-search {
+		.more-search-input {
+			width: 100%;
+			padding: 20rpx 40rpx;
+			// display: flex;
+			// justify-content: space-between;
+			// align-items: center;
+			background-color: #FFF;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 12;
+			
+			.input {
+				font-size: 30rpx;
+			}
+			.input-tex-btn {
+				width: 120rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				// padding: 10rpx 30rpx;
+				border-radius: 10rpx;
+				color: #fff;
+				
+			}
+			.shop-stor{
+				margin-top: 10rpx;
+				border-top: 2rpx solid #cccc;
+				padding-top: 10rpx;
+			}
+			.shop-tex {
+				padding: 4rpx 10rpx;
+				border-radius: 10rpx;
+				position: relative;
+				background-color: #969696;
+				color: #fff;
+				
+			}
+			.shop-atv {
+				background-color: #CE0000;
+			}
+			// .shop-atv::after {
+			// 	content: '';
+			// 	width: 100%;
+			// 	height: 4rpx;
+			// 	position: absolute;
+			// 	left: 0;
+			// 	top: 48rpx;
+			// 	border-radius: 90rpx;
+			// 	background-color: #CE0000;
+			// }
+		}
+		.more-search-record {
+			width: 100%;
+			padding: 30rpx 0rpx;
+			color: #fff;
+			display: flex;
+			flex-direction:column;
+			background-color: #f6f6f6;
+			position: fixed;
+			left: 0;
+			z-index: 22;
+			
+			.record-title {
+				padding: 0 20rpx;
+				color: #333;
+				font-size: 28rpx;
+			}
+			.record-content {
+				
+				flex-wrap: nowrap;
+				display: flex;
+				overflow-x: scroll;
+				scrollbar-width: none; /* firefox */
+				-ms-overflow-style: none; /* IE 10+ */
+			}
+			.record-content::-webkit-scrollbar {
+			  display: none; /* Chrome Safari */
+			}
+			.more-search-record-t {
+				width: 220rpx;
+				height: 60rpx;
+				margin: 30rpx 0 0 20rpx;
+				padding: 6rpx 24rpx;
+				border-radius: 12rpx;
+				display: flex;
+				flex-shrink: 0;
+				align-items: center;
+				background-color: #f1c98b;
+				// width:;
+				.txt{
+					text-align: center;
+					flex: 1;
+					// max-width: 600rpx;
+					  overflow: hidden; /*超出长度的文字隐藏*/
+					           text-overflow:ellipsis;/*文字隐藏以后添加省略号*/
+					           white-space: nowrap; /*强制不换行*/
+				}
+				.record-icon {
+					padding-left: 12rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+		
+		.more-search-list-show {
+			box-shadow: 0 0 10px 0 #efbd6f4d;
+		}
+		.more-search-list {
+			margin: 0 20rpx 40rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			
+			.more-search-list-c {
+				padding: 0 20rpx;
+				
+				.more-search-list-c-t {
+					display: flex;
+					align-items: center;
+					padding-top: 20rpx;
+					.batle-img {
+						width: 34rpx;
+						height: 34rpx;
+						margin-right: 8rpx;
+					}
+				}
+				
+				.more-search-list-c-c {
+					padding: 30rpx 0;
+					display: flex;
+					align-items: center;
+					
+					.list-img {
+						width: 140rpx;
+						height: 140rpx;
+					}
+					
+					.more-search-list-c-c-r {
+						padding-left: 20rpx;
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						
+						.list-c-c-r-til {
+							line-height: 40rpx;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+						}
+						
+						.list-c-c-r-price {
+							padding-top: 10rpx;
+							font-weight: bold;
+						}
+						
+					}
+				}
+			}
+		}
+		.topic-search-list-b {
+			margin: 0 20rpx 40rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			
+			.topic-search-list {
+				padding:20rpx;
+				display: flex;
+				align-items: center;
+				.topic-img {
+					width: 80rpx;
+					height: 80rpx;
+				}
+				
+				.topic-search-list-c {
+					padding-left: 20rpx;
+					flex: 1;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+				}
+			}
+		}
+
+	}
+	
+	.show-t {
+		min-width: 400rpx;
+		padding: 30rpx;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		color: #fff;
+		// text-align: center;
+		line-height: 50rpx;
+		position: fixed;
+		left: 50%;
+		top: 40%;
+		z-index: 33;
+		transform:  translate(-50%, -50%);
+		background-color: #595959cc;
+	}
+</style>
diff --git a/newOtherPages/myBalance/myBalance.vue b/newOtherPages/myBalance/myBalance.vue
new file mode 100644
index 0000000..772f818
--- /dev/null
+++ b/newOtherPages/myBalance/myBalance.vue
@@ -0,0 +1,667 @@
+<template>
+	<view class="myBalance-contx">
+		 <!-- 知味豆 -->
+		<view class="myBalance-contx-h-title flex j-evenly bg-color-white" v-if="opt.type == 'zhiweidou'">
+			<block v-for="(item, idx) in heartitleList" :key="idx">
+				<view class="my-interest-h-title-tx "  @click="selectTitle(idx)">
+					<text>{{item}}</text>
+					<view v-if="sleIndex == idx"  class="actives" :style="{'background-color': t('color1')}"></view>
+				</view>
+			</block>
+		</view>
+		<scroll-view class="myBalance-contx-box overflow-hd" scroll-y @scrolltolower="scrollData" v-if="opt.type == 'zhiweidou'">
+			<view v-if="sleIndex == 0">
+				<view class="myBalance-contx-box-h flex flex-colum j-around">
+					<view class="flex ">
+						<block v-for="(item, tnx) in scrollHearList" :key="tnx">
+							<view class="box-h-t color-white border-rius-5" :style="boxHearIndex == tnx ? 'background-color:' + t('color1'):'background-color:#999'" @click="selectHrad(tnx)">{{item}}</view>
+						</block>
+					</view>
+					<view class="flex j-between al-item-center">
+						<view class="uni-title flex al-item-center" @click="pickShow">{{y}}年{{m}}月<text class="iconfont icon-xia" style="font-size: 30rpx; position: static;"></text></view>
+						<view  class="font-w">本月共收获 <text :style="{'color': t('color1')}">{{' ' + rechargeCount + ' '}}</text>使用<text :style="{'color': t('color1')}">{{' ' + consumeCount}}</text></view>
+					</view>
+				</view>
+				<view style="height:170rpx;width: 100%;"></view>
+				<view class="overflow-hd">
+					<block v-for="(item, inx) in zwDouList" :key="item.id" >
+						<view class="myBalance-contx-box-t flex j-between al-item-center bg-color-white border-rius-5">
+							<view class="myBalance-contx-box-tt flex flex-colum">
+								<view class="font-w " style="word-break: break-all;">{{item.remark}}</view>
+								<view class="fs12 color-gray" style="padding-top: 10rpx;">{{item.createtime}}</view>
+							</view>
+							<text class="flex1" :style="{'color': t('color1')}" style="text-align: right;">{{item.score > 0 ? '+' + item.score:item.score }}</text>
+						</view>
+					</block>
+				</view>
+			</view>
+			<view v-else>
+				<view class="myBalance-contx-box-h contx-h-2 flex j-between" style="height: auto;">
+					<view class="font-w"></view>
+					<view class="flex al-item-center" @click="showTimRum">
+						<text class="fs12" :style="{'color': t('color1')}">{{timeTex}}</text>
+						<text class="iconfont icon-xia" style="font-size: 30rpx; position: static;"></text>
+					</view>
+				</view>
+				<view style="height:50rpx;width: 100%;"></view>
+				<view class="">
+					<block v-for="(item, inx) in forRecordList" :key="item.id">
+						<view v-for="(data,idx) in item.prolist" :key="idx" class="myBalance-contx-tx flex al-item-center bg-color-white border-rius-5">
+							<view class="flex" style="width:120rpx;height: 120rpx;" @tap="goto" :data-url="'/activity/scoreshop/product?id=' + data.proid">
+								<image class="cosu-img" :src="data.pic" mode=""></image>
+							</view>
+							<view class="flex flex-colum" style="padding-left: 20rpx;">
+								<text class="font-w text-overflow-line">{{data.name}}</text>
+								<text class="pt-txt fs12 color-gray">价格：{{data.score_price}}积分</text>
+								<text class="pt-txt fs12 color-gray">兑换时间：{{data.createtime}}</text>
+							</view>
+						</view>
+					</block>
+				</view>
+			</view>
+		<nomore v-if="!isData"></nomore>
+		</scroll-view>
+		 <!-- 余额 -->
+		<scroll-view class="myBalance-contx-box " scroll-y @scrolltolower="scrollData" v-if="opt.type == 'balance'">
+			<view >
+				<view class="myBalance-contx-box-h flex flex-colum j-around">
+					<view class="flex ">
+						<block v-for="(item, tnx) in scrollHearList" :key="tnx">
+							<view class="box-h-t color-white border-rius-5" :style="boxHearIndex == tnx ? 'background-color:' + t('color1'):'background-color:#999'" @click="selectHrad(tnx)">{{item}}</view>
+						</block>
+					</view>
+					<view class="flex j-between al-item-center">
+						<view class="uni-title flex al-item-center" @click="pickShow">{{y}}年{{m}}月<text class="iconfont icon-xia" style="font-size: 30rpx; position: static;"></text></view>
+						<view class="font-w color-gray">本月共充值 <text>{{' ' + rechargeCount + ' '}}</text>消费<text >{{' ' + consumeCount}}</text></view>
+					</view>
+				</view>
+				<view style="height:170rpx;width: 100%;"></view>
+				<view class="overflow-hd">
+					<block v-for="(item, inx) in balanceList" :key="item.id">
+						<view class="myBalance-contx-box-t flex j-between al-item-center bg-color-white border-rius-5">
+							<view class="myBalance-contx-box-tt flex flex-colum">
+								<view class="font-w" style="word-break: break-all;">{{item.remark}}</view>
+								<view class="fs12 color-gray" style="padding-top: 10rpx;">{{item.createtime}}</view>
+							</view>
+							<text class="flex1" :style="{'color': t('color1')}" style="text-align: right;">{{item.money > 0 ? '+' + item.money:item.money }}</text>
+						</view>
+					</block>
+				</view>
+			</view>
+			<nomore v-if="!isData"></nomore>
+		</scroll-view>
+		
+		<!-- 知味豆记录弹框 -->
+		<view class="selTim-box bg-color-white border-rius-5" v-show="showTimSe">
+			<view class="conm-time-slt ">
+				<view class="flex flex-w j-between">
+					<block v-for="(item, ndx) in timeTexList" :key="ndx">
+						<view class="tet-l border-rius-5" :style="{'background':timeTexIndx == ndx ? t('color1'):'','color':timeTexIndx == ndx ? '#fff':''}" @click="selcTimTxe(item, ndx)">{{item.name}}</view>
+					</block>
+				</view>
+				<view class="cus-time  border-rius-5" :style="{'background-color':timeTexIndx == 5 ? t('color1') : '' , 'color':timeTexIndx == 5 ? '#fff' : ''}">自定义时间</view>
+				<view class="flex al-item-center j-between" style="color: #7b7b7b;" >
+					<!-- <text class="tet-l border-rius-5">{{timeTex ? timeTex.substr(0, 10) : '开始时间'}}</text> <text class="he-t"></text> <text class="tet-l border-rius-5">{{timeTex ? timeTex.substr(-10, 10) : '结束时间'}}</text> -->
+					<view class="example-body" style="margin-top: 30rpx;" @click="dateShow">
+							<uni-datetime-picker
+							@chang="submit"
+								v-model="range"
+								type="daterange"
+								rangeSeparator="-"
+							/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 年月弹框 -->
+		<view class="pick-box" v-if="showPick"  @touchmove.stop.prevent="moveHandle">
+			<view class="pick-t-btn bg-color-white flex j-between">
+				<text @click="pickCnl">取消</text>
+				<text@click="pickSub">确定</text>
+			</view>
+			<picker-view v-if="visible" :indicator-style="indicatorStyle"  :value="value" @change="bindChange" class="picker-view">
+			            <picker-view-column>
+			                <view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
+			            </picker-view-column>
+			            <picker-view-column>
+			                <view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
+			            </picker-view-column>
+			<!--            <picker-view-column>
+			                <view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
+			            </picker-view-column> -->
+			</picker-view>
+		</view>
+		<!-- 日历 -->
+<!-- 		<mr-calendar ref="calendar" :visible.sync="show" :disabledDate="disabledDate" v-model="dates" type="range"
+			:custom-date="customDate" :drawer="drawer" format="YYYY-MM-DD hh:mm:ss" @click="calclick" @change="daychange"
+			@submit="submit" title="请选择开始时间和结束时间">
+		</mr-calendar> -->
+		<loading v-if="loading"></loading>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	 // import mrCalendar from '@/components/mr-calendar/mr-calendar';
+	var app = getApp()
+	export default {
+		// components: {
+		// 	mrCalendar
+		// },
+		data() {
+			const date = new Date()
+			const years = []
+			const year = date.getFullYear()
+			const months = []
+			const month = date.getMonth() + 1
+			const days = []
+			const day = date.getDate()
+			for (let i = 1990; i <= date.getFullYear(); i++) {
+				years.push(i)
+			}
+			for (let i = 1; i <= 12; i++) {
+				months.push(i)
+			}
+			for (let i = 1; i <= 31; i++) {
+				days.push(i)
+			}
+			return {
+				opt: {},
+				loading:false,
+				isData: true,
+				sleIndex: 0, // 头部选中的项
+				boxHearIndex:0, // 内容选中的项
+				heartitleList: null,
+				scrollHearList: null,
+				balanceList:[], // 余额数据
+				zwDouList: [],  // 知味豆数据
+				timeTexList:['本月','上月','去年','今年'],
+				timeTex: '本月',
+				timeTexIndx: 0,
+				showTimSe: false,  // 选项弹框
+				pages: 1,
+				rechargeCount: '', // 充值
+				consumeCount: '', // 消费
+				
+				// 日历
+				show: false,
+				drawer: true,
+				dates: '',
+				customDate: [{
+					cellClass: 'custom-cell',
+					date: '2022-01-24 22:15:45',
+					top: [{
+							class: 'custom-cell-top-1',
+							text: '①'
+						},
+						// {
+						//  class: 'custom-cell-top-2',
+						//  text: '6'
+						// }
+					]
+				}],
+				
+				// 月份选择
+				title: 'picker-view',
+				years,
+				year,
+				months,
+				month,
+				days,
+				day,
+				value: [9999, month - 1, day - 1],
+				visible: true,
+				indicatorStyle: `height: 50px;`,
+				showPick: false,
+				y: year,
+				m: month,
+				isnum: false,
+				
+				
+				// 记录
+				range:'',
+				startTime: '',
+				endTime: '',
+				forRecordList: [],
+			}
+		},
+		onLoad(options) {
+			this.opt = options
+			// this.opt.type = 'zhiweidou'
+			// console.log(app, ';sdfosdi---')
+			if (this.opt.type == 'balance') {
+				this.heartitleList = ['收支明细','使用记录']
+				this.scrollHearList = ['全部', '充值', '消费']
+				this.getMoneylog()
+			}else {
+				this.heartitleList = ['收支明细','兑换记录']
+				this.scrollHearList = ['全部', '已收获', '已使用']
+				uni.setNavigationBarTitle({
+					title:'我的知味豆'
+				})
+				this.getScorelog()
+			}
+			this.setTime()
+			this.startTime = this.timeTexList[0].stime.substr(0,10)
+			this.endTime = this.timeTexList[0].etime.substr(0,10)
+			this.timeTex = this.startTime +" 至 "+ this.endTime
+			this.range = [this.startTime,this.endTime]
+		},
+		watch: {
+				datetimesingle(newval) {
+					console.log("单选:", this.datetimesingle);
+				},
+				range(newval) {
+					console.log("范围选1:", this.range);
+					this.submit(newval)
+				},
+				datetimerange(newval) {
+					console.log("范围选:2", this.datetimerange);
+				},
+		},
+		methods: {
+			moveHandle(){
+				return true
+			},
+			pickShow() {
+				this.showPick = true
+			},
+			pickCnl() {
+				this.isnum = false
+				this.showPick = false
+			},
+			pickSub() {
+				const date = new Date()
+				const year = date.getFullYear()
+				const month = date.getMonth() + 1
+				if(this.isnum) {
+					this.y = this.year
+					this.m = this.month
+				}else {
+					this.y = year
+					this.m = month
+				}
+				this.pages = 1
+				this.isData = true
+				this.balanceList = []
+				this.zwDouList = []
+				if( this.opt.type == 'balance') {
+					this.getMoneylog()
+				}else if(this.opt.type == 'zhiweidou')  {
+					this.getScorelog()
+				}
+				// console.log(this.y,this.m, 'dsjf9999999999999999')
+				this.isnum = false
+				this.showPick = false
+			},
+	            bindChange: function (e) {
+					this.isnum = true
+					// console.log(e, '--------')
+	                const val = e.detail.value
+	                this.year = this.years[val[0]]
+	                this.month = this.months[val[1]]
+	                this.day = this.days[val[2]]
+	            },
+			// 收支 记录切换
+			selectTitle(num) {
+				this.sleIndex = num
+				this.pages = 1
+				this.isData = true
+				this.forRecordList = []
+				// this.boxHearIndex = 0
+				this.showTimSe = false
+				if(this.opt.type == 'zhiweidou')  {
+					if(this.sleIndex == 0) {
+						// this.getScorelog()
+					}else if(this.sleIndex == 1) {
+						this.getForRecord()
+					}
+				}
+			},
+			// 内容切换
+			selectHrad(num) {
+				this.pages = 1
+				this.isData = true
+				this.balanceList = []
+				this.zwDouList = []
+				this.boxHearIndex = num
+				if( this.opt.type == 'balance') {
+					this.getMoneylog()
+				}else if(this.opt.type == 'zhiweidou')  {
+					this.getScorelog()
+				}
+				// console.log(this.boxHearIndex, this.opt.type, 'skjdhfkjsdhk')
+			},
+			// 下拉加载
+			scrollData(){
+				if(this.isData && this.opt.type == 'balance') {
+					this.getMoneylog()
+				}else if(this.isData && this.opt.type == 'zhiweidou')  {
+					if(this.sleIndex == 0) {
+						this.getScorelog()
+					}else if(this.sleIndex == 1) {
+						this.getForRecord()
+					}
+					
+				}
+			},
+			// 选中按时间的文本
+			selcTimTxe(data, num) {
+				this.timeTexIndx = num
+				this.forRecordList = []
+				this.pages = 1
+				this.isData = true
+				this.range = [data.stime.substr(0,10),data.etime.substr(0,10)]
+				this.timeTex = data.stime.substr(0,10) +" 至 "+ data.etime.substr(0,10);
+				// this.endTime = data.etime
+				// this.startTime = data.stime
+				this.showTimSe = false
+				// this.getForRecord()
+				// console.log(data,this.endTime,this.startTime, 'hshsh111111117')
+			},
+			
+			// 点击按时间
+			showTimRum() {
+				this.showTimSe = !this.showTimSe
+			},
+			
+			// 点击显示日历
+			dateShow() {
+				this.timeTexIndx = 5
+				// this.show  = true
+			},
+			disabledDate() {
+				return false
+			},
+			// 点击确定选中日期
+			submit(e) {
+				this.forRecordList = []
+				this.pages = 1
+				this.isData = true
+				this.timeTex = e[0] +' 至 '+ e[1]
+				this.startTime = e[0] +' 00:00:00'
+				this.endTime = e[1] + ' 23:59:59'
+				this.showTimSe = false
+				this.getForRecord()
+				this.showTimSe = false
+				// console.log(e, 'eeeequedddd-0-0-0--222222222220')
+			},
+			calclick(e) {
+				// console.log(e, 'calclick')
+			},
+			daychange(e) {
+				// console.log(e, 'daychange')
+			},
+			
+			// 知味豆明细
+			getScorelog() {
+				this.loading = true
+				app.post('ApiMy/scorelog',{pagenum: this.pages,type: this.boxHearIndex, y: this.y,m: this.m}, res => {
+					this.loading = false
+					this.rechargeCount = res.rechargeCount
+					this.consumeCount = res.consumeCount
+					// console.log(res, '000055555555')
+					if(res.data.length > 0) {
+						this.zwDouList = [...this.zwDouList, ...res.data]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+				})
+			},
+			// 余额明细
+			getMoneylog() {
+				this.loading = true
+				app.post('ApiMy/moneylog',{pagenum: this.pages,st: this.boxHearIndex, y: this.y,m: this.m}, res => {
+					this.loading = false
+					this.rechargeCount = res.rechargeCount
+					this.consumeCount = res.consumeCount
+					if(res.data.length > 0) {
+						this.balanceList = [...this.balanceList, ...res.data]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+					// console.log(res, '000056666666666666666665')
+				})
+			},
+			// 知味豆兑换记录
+			getForRecord() {
+				app.post('ApiScoreshop/orderlist',{pagenum: this.pages, startTime: this.startTime,endTime: this.endTime}, res => {
+					this.loading = false
+					if(res.datalist.length > 0) {
+						this.forRecordList = [...this.forRecordList, ...res.datalist]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+					// console.log(res, '000033333333333333332222')
+				})
+			},
+			setTime() {
+			        let arr = []
+			        let time  = this.numTotime(Number(new Date()))
+			        arr.push({name:'本月',stime:time.substr(0,8)+'01 00:00:00',etime:time.substr(0,8)+'30 23:59:59' })
+			        time  = this.numTotime(Number(new Date())-2592000000)
+			        arr.push({name:'上月',stime:time.substr(0,8)+'01 00:00:00',etime:time.substr(0,8)+'30 23:59:59' })
+					time  = this.numTotime(Number(new Date()))
+					arr.push({name:'今年',stime:time.substr(0,5)+'01-01 00:00:00',etime:time.substr(0,5)+'12-30 23:59:59' })
+					time  = this.numTotime(Number(new Date())-31104000000)
+					arr.push({name:'去年',stime:time.substr(0,5)+'01-01 00:00:00',etime:time.substr(0,5)+'12-30 23:59:59' })
+					// arr.push({name:'自定义',stime:'',etime:'' })
+					this.timeTexList = arr
+			},
+			numTotime(timestamp) {
+				var date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				var Y = date.getFullYear() + '-';
+				var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+				var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
+				var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+				var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+				var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+				return Y + M + D + h + m + s;
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex {display: flex;}
+	.flex1 {flex: 1;}
+	.j-center {justify-content: center;}
+	.j-between {justify-content: space-between;}
+	.j-around {justify-content: space-around;}
+	.j-evenly {justify-content: space-evenly;}
+	.flex-colum{flex-direction: column;}
+	.flex-w{flex-wrap: wrap;}
+	.al-item-center {align-items: center;}
+	.font-w {font-weight: bold;}
+	.fs12 {font-size: 24rpx;}
+	.color-gray {color: #999;}
+	.color-white{color: #fff;}
+	.bg-color-white {background-color: #fff;}
+	.border-rius-r {border-radius: 800rpx;}
+	.border-rius-5 {border-radius: 10rpx;}
+	.border-rius-10 {border-radius: 20rpx;}
+	.overflow-hd {overflow: hidden;}
+	.text-overflow-tx {text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
+	.text-overflow-line { display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;word-wrap: break-word;word-break: break-all;}
+	
+	.myBalance-contx {
+		
+		.myBalance-contx-h-title {
+				height: 80rpx;
+				padding: 20rpx 0;
+				.my-interest-h-title-tx {
+					padding: 0 10rpx;
+					position: relative;
+				}
+				.actives {
+					width: 100%;
+					height: 6rpx;
+					display: block;
+					position: absolute;
+					border-radius: 2rpx;
+					bottom: -10rpx;
+					left: 0;
+					// background-color: #EFBD6F;
+				}
+		}
+		
+		.myBalance-contx-box {
+			padding: 0 20rpx 20rpx;
+			width:100%;
+			height: calc(100vh - 80rpx);
+			position: relative;
+			
+			.myBalance-contx-box-h {
+				padding: 20rpx;
+				width: 100%;
+				height: 170rpx;
+				position: fixed;
+				left: 0;
+				background-color: #f6f6f6;
+				z-index: 22;
+				.box-h-t:first-child {
+					margin-left: 0;
+				}
+				.box-h-t {
+					width: 130rpx;
+					height: 60rpx;
+					line-height: 60rpx;
+					text-align: center;
+					margin-left: 26rpx;
+				}
+			}
+			
+			.contx-h-2 {
+				height: 80rpx;
+			}
+
+			.myBalance-contx-box-t {
+				padding: 20rpx;
+				box-shadow: 0 0 10rpx 0 #efefef;
+				margin-top: 30rpx;
+			}
+			.myBalance-contx-box-t:first-child {
+				margin-top: 0 ;
+			}
+			
+			.myBalance-contx-box-tt {
+				width: 55%;
+			}
+			.myBalance-contx-tx {
+				padding: 20rpx;
+				box-shadow: 0 0 10rpx 0 #efefef;
+				margin-top: 30rpx;
+				.cosu-img {
+					width: 120rpx;
+					height: 120rpx;
+				}
+				
+				.pt-txt {
+					padding-top: 6rpx;
+				}
+			}
+		}
+		
+		// 弹框
+		.conm-time-slt {
+			padding: 20rpx 20rpx 40rpx;
+			
+			.tet-l {
+				width: 160rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				background-color: #f6f6f6;
+				margin-top: 30rpx;
+				
+			}
+			
+			.cus-time {
+				width: 190rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				margin-top: 40rpx;
+				background-color: #f6f6f6;
+			}
+		}
+		
+		.selTim-box {
+			width: 400rpx;
+			position: fixed;
+			top: 150rpx;
+			right: 20rpx;
+			z-index: 33;
+			box-shadow: 0 0 10rpx 0 #efefef;
+			
+			.he-t {
+				width: 16rpx;
+				height: 2rpx;
+				margin-top: 30rpx;
+				background-color: #ccc;
+			}
+		}
+		
+		.teitDate {
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			background-color: rgba(0,0,0, .4);
+			z-index: 888;
+		}
+		
+		.pick-box{
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 888;
+			background-color: rgba(0,0,0, .4);
+			display: flex;
+			flex-direction: column;
+			justify-content: flex-end;
+			
+			.pick-t-btn {
+				padding: 20rpx;
+				border-radius: 20rpx 20rpx 0 0;
+				border-bottom: 2rpx solid #eaeaea;
+			}
+		}
+	}
+	
+	// pick 组件样式
+	uni-picker-view {
+	  display: block;
+	 
+	}
+	uni-picker-view .uni-picker-view-wrapper {
+	  display: flex;
+	  position: relative;
+	  overflow: hidden;
+	  height: 100%;
+	  background-color: white;
+	}
+	uni-picker-view[hidden] {
+	  display: none;
+	}
+	picker-view {
+	  width: 100%;
+	  // height: 600upx;
+	  height: 560rpx;
+	  // margin-top: 20upx;
+	   background-color: #FFFFFF;
+	}
+	.item {
+	  line-height: 100upx;
+	  text-align: center;
+	}
+	
+</style>
diff --git a/newOtherPages/myFans/myFans.vue b/newOtherPages/myFans/myFans.vue
new file mode 100644
index 0000000..07360c3
--- /dev/null
+++ b/newOtherPages/myFans/myFans.vue
@@ -0,0 +1,136 @@
+<template>
+	<view class="my-fans">
+		<view class="my-interest-topic overflow-hd" >
+			<block v-for="(item, idx) in fansList" :key="item.id">
+				<view class="topic-box flex j-between al-item-center" >
+					<view class="my-interest-contx flex al-item-center" @click="goto" :data-url="'/diary/info/info?id='+item.id">
+						<image v-if="item.headimg" class="conton-img border-rius-r" :src="item.headimg" mode=""></image>
+						<text v-else style="font-size: 80rpx; color: #ccc;" class="iconfont icon-wode"></text>
+						<view class="conton-tex overflow-hd flex flex-colum j-between flex1">
+							<view class="font-w text-overflow-tx conton-tex-tlt">{{item.nickname}}</view>
+							<text class="color-gray text-overflow-tx fs12">笔记·{{item.zan_count}} | 粉丝·{{item.fans_count}}</text>	
+						</view>
+					</view>
+					<text v-if="item.is_member_follow == 0" class="concern-btn color-white border-rius-5" :style="{'background-color': t('color1')}" @click="attention(item.id, idx)">关注</text>
+					<view v-else  class="concern-btn  border-rius-5" :style="{'border-color':t('color1'), 'color':t('color1')}" @click="attention(item.id, idx)">
+						已关注
+					</view>
+				</view>
+			</block>
+		</view>
+		<loading v-if="loading"></loading>
+		<nomore v-if="!isData"></nomore>
+	</view>
+</template>
+
+<script>
+	var app = getApp()
+	export default {
+		data() {
+			
+			return {
+				fansList: [],
+				pages: 1,
+				loading:false,
+				isData: true,
+			}
+		},
+		onLoad() {
+			this.getFansList()
+		},
+		onReachBottom() {
+			if(this.isData) {
+				this.getFansList()
+			}
+		},
+		methods: {
+			getFansList() {
+				app.post('ApiMy/FansList',{pagenum: this.pages}, res => {
+					if(res.datalist.length > 0) {
+						this.fansList = [...this.fansList, ...res.datalist]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+				})
+			},
+			attention(id, idxs) {
+				app.post('ApiMy/addFollow',{follow_id:id,type:'user'}, res => {
+					if(res.msg == '已关注') {			
+						this.fansList[idxs].is_member_follow = 1
+						// this.$forceUpdate()
+					}else {	
+						this.fansList[idxs].is_member_follow = 0
+						// this.$forceUpdate()
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex {display: flex;}
+	.flex1 {flex: 1;}
+	.j-center {justify-content: center;}
+	.j-between {justify-content: space-between;}
+	.j-around {justify-content: space-around;}
+	.j-evenly {justify-content: space-evenly;}
+	.flex-colum{flex-direction: column;}
+	.flex-w{flex-wrap: wrap;}
+	.al-item-center {align-items: center;}
+	.font-w {font-weight: bold;}
+	.fs12 {font-size: 24rpx;}
+	.color-gray {color: #999;}
+	.color-white{color: #fff;}
+	.bg-color-white {background-color: #fff;}
+	.border-rius-r {border-radius: 800rpx;}
+	.border-rius-5 {border-radius: 10rpx;}
+	.border-rius-10 {border-radius: 20rpx;}
+	.overflow-hd {overflow: hidden;}
+	.text-overflow-tx {text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
+	.text-overflow-line { display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;word-wrap: break-word;word-break: break-all;}
+	
+	.my-fans {
+		// padding: 20rpx;
+	}
+	.my-interest-topic {
+		padding: 0 20rpx 20rpx;
+		.topic-box {
+			margin-top: 28rpx;
+		}
+		.my-interest-contx {
+			width: 80%;
+			.tip-c-l-img-t {
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				text-align: center;
+				border-radius: 50%;
+
+			}
+			
+		}
+
+	}
+	.conton-img {
+		width: 100rpx;
+		height: 100rpx;
+	}
+	.conton-tex {
+		height: 80rpx;
+		padding-left: 30rpx;
+		
+		.conton-tex-tlt {
+			font-size: 30rpx;
+		}
+	}
+	.concern-btn {
+		width: 124rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		border-width: 2rpx ;
+		border-style: solid;
+	}
+</style>
diff --git a/newOtherPages/myInterest/index.vue b/newOtherPages/myInterest/index.vue
new file mode 100644
index 0000000..affb041
--- /dev/null
+++ b/newOtherPages/myInterest/index.vue
@@ -0,0 +1,336 @@
+<template>
+	<view class="my-interest">
+		<view class="my-interest-h-title flex j-evenly bg-color-white">
+			<block v-for="(item, idx) in heartitleList" :key="idx">
+				<view class="my-interest-h-title-tx "  @click="selectTitle(idx)">
+					<text>{{item }}</text>
+					<view v-if="sleIndex == idx"  class="actives" :style="{'background-color': t('color1')}"></view>
+				</view>
+			</block>
+			
+		</view>
+		<view class="my-interest-user" v-if="sleIndex == 0">
+			<block v-for="(item, idx) in userList" :key="item.id" >
+				<view class="topic-box flex j-between al-item-center" >
+					<view class="my-interest-conton flex al-item-center text-overflow-tx" @tap="goto" :data-url="'/diary/info/info?id=' + item.id">
+						<image v-if="item.headimg" class="conton-img border-rius-r" :src="item.headimg" mode=""></image>
+						<text v-else style="font-size: 90rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text>
+						<view class="conton-tex overflow-hd flex flex-colum j-between flex1 ">
+							<view class="font-w text-overflow-tx conton-tex-tlt">{{item.nickname}}</view>
+							<text class="color-gray text-overflow-tx fs12">笔记·{{item.luntan_count}} | 粉丝·{{item.fans_count}}</text>	
+						</view>
+					</view>
+					<text v-if="item.is_member_follow == 0" class="concern-btn color-white border-rius-5" :style="{'background-color': t('color1')}" @click="attention(item.id, idx, 'user')">关注</text>
+					<view v-else  class="concern-btn  border-rius-5" :style="{'border-color':t('color1'), 'color':t('color1')}" @click="attention(item.id, idx, 'user')">
+						已关注
+					</view>
+				</view>
+			</block>
+		</view>
+		<view class="my-interest-topic overflow-hd" v-if="sleIndex == 1">
+			<block v-for="(item, idx) in topicList" :key="item.id">
+				<view class="topic-box flex j-between al-item-center" >
+					<view class="my-interest-contx flex al-item-center" @click="goto" :data-url="'/diary/topic/topic?id='+item.id">
+						<text class="tip-c-l-img-t color-white" :style="{'background-color': t('color1')}">#</text>
+						<view class="conton-tex overflow-hd flex flex-colum j-between flex1">
+							<view class="font-w text-overflow-tx conton-tex-tlt">{{item.topic_name}}</view>
+							<text class="color-gray text-overflow-tx fs12">话题·{{item.member_count}}人参与讨论</text>	
+						</view>
+					</view>
+					<text v-if="item.is_member_follow == 0" class="concern-btn color-white border-rius-5" :style="{'background-color': t('color1')}" @click="attention(item.id, idx, 'topic')">关注</text>
+					<view v-else  class="concern-btn  border-rius-5" :style="{'border-color':t('color1'), 'color':t('color1')}" @click="attention(item.id, idx, 'topic')">
+						已关注
+					</view>
+				</view>
+			</block>
+		</view>
+		<view class="my-interest-sorte overflow-hd" v-if="sleIndex == 2">
+			<block v-for="(item, idx) in sorteList" :key="item.id">
+				<view class="my-interest-sorte-bx bg-color-white border-rius-5">
+					<view class=" flex j-between al-item-center">
+							<view class="my-interest-contx flex al-item-center">
+								<image v-if="item.logo" class="sorte-img border-rius-5" :src="item.logo" mode=""></image>
+								<text v-else style="font-size: 80rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text>
+								<view class="conton-tex overflow-hd flex flex-colum j-between flex1">
+									<view class="font-w conton-tex-tlt text-overflow-tx">{{item.name}}</view>
+									<text class="color-gray text-overflow-tx fs12">关注数{{item.fans_count}}</text>	
+								</view>
+							</view>
+							<text class="concern-btn color-white border-rius-5" :style="{'background-color': t('color1')}" @tap="goto"  :data-url="'/pagesA/shop/index?id=' + item.id">进店</text>
+					</view>
+					<view class="flex flex-w">
+						<block v-for="(data, nm) in item.prolist" :key="nm">
+							<view class="sorte-gs flex">
+								<image v-if="data.pic" class="sorte-gs-img border-rius-5" :src="data.pic" mode=""></image>
+								<view v-else style="width: 150rpx;height: 150rpx;text-align: center;line-height: 150rpx;">
+									<text style="font-size: 80rpx; color: #ccc;" class="iconfont icon-tupianjiazaishibai"></text>
+								</view>
+								<view class="sorte-gs-tx border-rius-5 color-white fs12">¥{{data.sell_price}}</view>
+							</view>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		<loading v-if="loading"></loading>
+		<nomore v-if="!isData"></nomore>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data(){
+			return {
+				loading:false,
+				isData: true,
+				sleIndex: 0,
+				heartitleList: ['用户','话题','店铺'],
+				pages:1,
+				userList: [],
+				topicList: [],
+				sorteList:[]
+			}
+		},
+		onLoad() {
+			this.getUserList()
+		},
+		onReachBottom() {
+			if(this.sleIndex == 0 && this.isData) {
+				this.getUserList()
+			}else if(this.sleIndex == 1 && this.isData) {
+				this.getTopicList()
+			}else if(this.sleIndex == 2 && this.isData) {
+				this.getSorteList()
+			}
+		},
+		
+		methods: {
+			selectTitle(num) {
+				this.sleIndex = num
+				this.pages = 1
+				this.isData = true
+				this.userList = []
+				this.topicList = []
+				this.sorteList = []
+				if(this.sleIndex == 0) {
+					this.getUserList()
+				}else if(this.sleIndex == 1) {
+					this.getTopicList()
+				}else {
+					this.getSorteList()
+				}
+			},
+			// 点击关注
+			attention(id, idxs, type) {
+				//  type -> 用户 user  话题 topic
+				app.post('ApiMy/addFollow',{follow_id:id,type:type}, res => {
+					if(res.msg == '已关注') {
+						if(type == 'user') {
+							this.userList[idxs].is_member_follow = 1
+						}else {
+							this.topicList[idxs].is_member_follow = 1
+						}
+						
+						// this.$forceUpdate()
+					}else {	
+						if(type == 'user') {
+							this.userList[idxs].is_member_follow = 0
+						}else {
+							this.topicList[idxs].is_member_follow = 0
+						}
+						// this.$forceUpdate()
+					}
+				})
+			},
+
+			// 用户列表
+			getUserList() {
+				this.loading = true
+				app.post('ApiMy/followList',{pagenum:this.pages,type:'user'}, res => {
+					this.loading = false
+					if(res.datalist.length > 0) {
+						this.userList= [...this.userList, ...res.datalist]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+				})
+			},
+			// 话题列表
+			getTopicList() {
+				this.loading = true
+				app.post('ApiMy/followList',{pagenum:this.pages,type:'topic'}, res => {
+					this.loading = false
+					if(res.datalist.length > 0) {
+						this.topicList= [...this.topicList, ...res.datalist]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+				})
+			},
+			// 店铺列表
+			getSorteList() {
+				this.loading = true
+				app.post('ApiMy/followList',{pagenum:this.pages,type:'store'}, res => {
+					this.loading = false
+					if(res.datalist.length > 0) {
+						this.sorteList= [...this.sorteList, ...res.datalist]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.my-interest {
+		
+		.flex {display: flex;}
+		.flex1 {flex: 1;}
+		.j-center {justify-content: center;}
+		.j-between {justify-content: space-between;}
+		.j-around {justify-content: space-around;}
+		.j-evenly {justify-content: space-evenly;}
+		.flex-colum{flex-direction: column;}
+		.flex-w{flex-wrap: wrap;}
+		.al-item-center {align-items: center;}
+		.font-w {font-weight: bold;}
+		.fs12 {font-size: 24rpx;}
+		.color-gray {color: #999;}
+		.color-white{color: #fff;}
+		.bg-color-white {background-color: #fff;}
+		.border-rius-r {border-radius: 800rpx;}
+		.border-rius-5 {border-radius: 10rpx;}
+		.border-rius-10 {border-radius: 20rpx;}
+		.overflow-hd {overflow: hidden;}
+		.text-overflow-tx {text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
+		.text-overflow-line { display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;word-wrap: break-word;word-break: break-all;}
+		
+		.my-interest-h-title {
+			height: 80rpx;
+			padding: 20rpx 0;
+			.my-interest-h-title-tx {
+				padding: 0 10rpx;
+				position: relative;
+			}
+			.actives {
+				width: 100%;
+				height: 6rpx;
+				display: block;
+				position: absolute;
+				border-radius: 2rpx;
+				bottom: -10rpx;
+				left: 0;
+				// background-color: #EFBD6F;
+			}
+		}
+		
+
+		// 用户
+		.my-interest-user {
+			padding: 20rpx;
+			.topic-box {
+				margin-top: 28rpx;
+			}
+			.topic-box:first-child {
+				margin-top: 0;
+			}
+
+			.my-interest-conton {
+				width: 80%;
+				// height: 90rpx;
+				// margin-top: 28rpx;
+				
+				.conton-img {
+					width: 100rpx;
+					height: 100rpx;
+				}
+
+			}
+
+		}
+		.conton-tex {
+			height: 80rpx;
+			padding-left: 30rpx;
+			
+			.conton-tex-tlt {
+				font-size: 30rpx;
+			}
+		}
+		.concern-btn {
+			width: 124rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			border-width: 2rpx ;
+			border-style: solid;
+		}
+		// 话题
+		.my-interest-topic {
+			padding: 0 20rpx 20rpx;
+			.topic-box {
+				margin-top: 28rpx;
+			}
+			.my-interest-contx {
+				width: 80%;
+				.tip-c-l-img-t {
+					width: 40rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					text-align: center;
+					border-radius: 50%;
+
+				}
+				
+			}
+
+		}
+		
+		 // 店铺
+		.my-interest-sorte {
+			padding: 0 20rpx 20rpx;
+			
+			.my-interest-sorte-bx {
+				padding: 20rpx;
+				margin-top: 30rpx;
+				
+				.my-interest-contx {
+					overflow: hidden;
+					width: 80%;
+				}
+				.sorte-img {
+					width: 80rpx;
+					height: 80rpx;
+				}
+				
+				.sorte-gs:nth-child(4n + 1) {
+						margin-left: 0;
+					}
+				.sorte-gs {
+					padding-top: 20rpx;
+					margin-left: calc((100% - 600rpx) / 3);
+					position: relative;
+					.sorte-gs-img {
+						width: 150rpx;
+						height: 150rpx;
+					}
+					.sorte-gs-tx {
+						padding: 2rpx 16rpx;
+						position: absolute;
+						bottom: 2rpx;
+						right: 6rpx;
+						background-color: rgba(153, 153, 153, .7);
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/newOtherPages/myService/myService.vue b/newOtherPages/myService/myService.vue
new file mode 100644
index 0000000..ef560e5
--- /dev/null
+++ b/newOtherPages/myService/myService.vue
@@ -0,0 +1,206 @@
+<template>
+	<view class="my-service">
+		<view class="scarch bg-color-white">
+			<view class="input_box">
+			  <text :style="{color:t('color1')||'#efbd6f'}" class="iconfont icon-search"></text>	
+			  <input placeholder="店铺搜索" type="text" style="padding-left: 10rpx;margin-right: 30rpx;"  v-model="searchVlaue" @confirm="search" />
+			  <text v-if="searchVlaue" style="color: #fff;font-size: 24rpx;padding: 10rpx;" class="iconfont icon-shanchu1" @click="clear"></text>
+			</view>
+		</view>
+		<view  style="width: 100%;height: 100rpx;"></view>
+		<view class="service-content-bx">
+			<block v-for="(item, idx) in myServiceList" :key="idx">
+				<view class="service-content flex flex-colum j-around bg-color-white border-rius-5">
+					<view class="content-t flex flex-colum">
+						<view class="content-til font-w">{{item.name}}</view>
+						<view class="flex fs12 al-item-center" style="padding-top: 20rpx;">
+							<text class="iconfont icon-31shijian" :style="{color:t('color1')||'#efbd6f'}"></text>
+							<text class="color-gray" style="padding-left: 10rpx;">服务时间：{{item.date ||'无'}}</text>
+						</view>
+					</view>
+					<button class="service-btn flex al-item-center j-center color-white border-rius-5"  type="" :style="{backgroundColor:t('color1')||'#efbd6f'}" @tap="callUp(item.tel)">
+						 <text class="iconfont icon-31dianhua" style="font-size: 40rpx;padding-right: 10rpx;"></text>
+						 联系客服：{{item.tel ||'无'}}
+					</button>
+				</view>
+			</block>
+		</view>
+		<loading v-if="loading"></loading>
+		<nomore v-if="!isData"></nomore>
+		<nodata v-if="isDisk"></nodata>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp()
+	export default {
+		data() {
+			
+			return {
+				myServiceList: [],
+				pages: 1,
+				searchVlaue: '',
+				loading:false,
+				isData: true,
+				isDisk: false,
+				cid: '',
+				field: 'juli',
+				order: 'asc',
+				longitude: '',
+				latitude: '',
+			}
+		},
+		onLoad() {
+		this.getServiceData()
+		},
+		onReachBottom() {
+			if(this.isData) {
+				this.getServiceData()
+			}
+		},
+		methods: {
+			// 搜索
+			search() {
+				this.myServiceList = []
+				this.pages = 1
+				this.getServiceData()
+				setTimeout(() => {
+					if(this.myServiceList.length == 0) {
+						this.isData = true
+						this.isDisk = true
+					}else {
+						this.isData = true
+						this.isDisk = false
+					}
+				}, 200)
+			},
+			clear() {
+				if(this.myServiceList.length > 0) {
+					this.searchVlaue = ''
+					this.isDisk = false
+				}else {
+					this.isDisk = false
+					this.myServiceList = []
+					this.pages = 1
+					this.searchVlaue = ''
+					this.getServiceData()
+				}
+
+			},
+			// 拨打号码
+			callUp(phone) {
+				if(phone == '') {
+					uni.showModal({
+						title: '提示',
+						content: '拨打的号码不能为空',
+						showCancel: false,
+					})
+					return
+				}
+				uni.makePhoneCall({
+					phoneNumber: phone 
+				});
+			},
+
+			getServiceData() {
+				this.loading = true
+				app.post('ApiBusiness/blist',{
+					pagenum: this.pages,
+					cid: this.cid,
+					field: this.field,
+					order: this.order,
+					longitude: this.longitude,
+					latitude: this.latitude,
+					keyword: this.searchVlaue
+				}, res => {
+					this.loading = false
+					console.log(res, 'ddhhdhdhdhhd')
+					if(res.data.length > 0) {
+						this.myServiceList = [...this.myServiceList, ...res.data]
+						this.pages++
+					}else {
+						this.isData = false
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex {display: flex;}
+	.flex1 {flex: 1;}
+	.j-center {justify-content: center;}
+	.j-between {justify-content: space-between;}
+	.j-around {justify-content: space-around;}
+	.j-evenly {justify-content: space-evenly;}
+	.flex-colum{flex-direction: column;}
+	.flex-w{flex-wrap: wrap;}
+	.al-item-center {align-items: center;}
+	.font-w {font-weight: bold;}
+	.fs12 {font-size: 24rpx;}
+	.color-gray {color: #999;}
+	.color-white{color: #fff;}
+	.bg-color-white {background-color: #fff;}
+	.border-rius-r {border-radius: 800rpx;}
+	.border-rius-5 {border-radius: 10rpx;}
+	.border-rius-10 {border-radius: 20rpx;}
+	.overflow-hd {overflow: hidden;}
+	.text-overflow-tx {text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
+	.text-overflow-line { display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;word-wrap: break-word;word-break: break-all;}
+	
+	.my-service {
+		
+		.scarch {
+			width: 100%;
+			padding: 10rpx 20rpx 30rpx;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 3;
+			
+			.input_box{
+				display: flex;
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				background-color: #eeeeee;
+				padding: 0 20rpx;
+				border-radius: 60rpx;
+				
+				.iconfont{
+					font-size: 40rpx;
+				}
+				input{
+					flex: 1;
+				}
+			
+			}
+		}
+		.service-content-bx {
+			padding: 0 20rpx 20rpx;
+			
+			.service-content {
+				width: 100%;
+				height: 260rpx;
+				padding: 0 30rpx;
+				margin-top: 30rpx;
+				
+				.content-t {
+					
+				}
+				.content-til {
+					
+				}
+				
+				.service-btn {
+					width: 100%;
+					height: 66rpx;
+					line-height: 66rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/node_modules/.package_versions.json b/node_modules/.package_versions.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/node_modules/.package_versions.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md
new file mode 100644
index 0000000..7c91d7b
--- /dev/null
+++ b/node_modules/jweixin-module/README.md
@@ -0,0 +1,30 @@
+# jweixin-module
+
+微信JS-SDK
+
+## 安装
+
+### NPM
+
+```shell
+npm install jweixin-module --save
+```
+
+### UMD
+
+```http
+https://unpkg.com/jweixin-module/out/index.js
+```
+
+## 使用
+
+```js
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
+    // TODO
+});
+```
+
+## 完整API
+
+>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115)
diff --git a/node_modules/jweixin-module/lib/index.js b/node_modules/jweixin-module/lib/index.js
new file mode 100644
index 0000000..1b5014b
--- /dev/null
+++ b/node_modules/jweixin-module/lib/index.js
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();S._completes=[]},S}()),g.preVerifyStartTime=L();else{y.state=1;for(var e=S._completes,n=0,i=e.length;n<i;++n)e[n]();S._completes=[]}}),w.invoke||(w.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,x(n),i)},w.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=y.state?e():(S._completes.push(e),!l&&v.debug&&e())},error:function(e){m<"6.0.2"||(-1==y.state?e(y.data):S._fail=e)},checkJsApi:function(e){M("checkJsApi",{jsApiList:C(e.jsApiList)},(e._complete=function(e){if(p){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=a[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){P(c.onMenuShareTimeline,{complete:function(){M("shareTimeline",{title:e.title||t,desc:e.title||t,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){P(c.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){P(c.onMenuShareQQ,{complete:function(){M("shareQQ",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){P(c.onMenuShareWeibo,{complete:function(){M("shareWeiboApp",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){P(c.onMenuShareQZone,{complete:function(){M("shareQZone",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){M("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){M("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){M("startRecord",{},e)},stopRecord:function(e){M("stopRecord",{},e)},onVoiceRecordEnd:function(e){P("onVoiceRecordEnd",e)},playVoice:function(e){M("playVoice",{localId:e.localId},e)},pauseVoice:function(e){M("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){M("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){P("onVoicePlayEnd",e)},uploadVoice:function(e){M("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){M("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){M("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){M("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(p){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){M(c.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){M("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){M("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===I?(I=!0,M("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(I=!1,0<_.length){var n=_.shift();wx.getLocalImgData(n)}},e))):_.push(e)},getNetworkType:function(e){M("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){M("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){M(c.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){M("hideOptionMenu",{},e)},showOptionMenu:function(e){M("showOptionMenu",{},e)},closeWindow:function(e){M("closeWindow",{},e=e||{})},hideMenuItems:function(e){M("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){M("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){M("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){M("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){M("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(f){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){M(c.openAddress,{},(e._complete=function(e){e=function(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}(e)},e))},openProductSpecificView:function(e){M(c.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}M(c.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){M("chooseCard",{app_id:v.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}M(c.openCard,{card_list:i},e)},consumeAndShareCard:function(e){M(c.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){M(c.chooseWXPay,V(e),e)},openEnterpriseRedPacket:function(e){M(c.openEnterpriseRedPacket,V(e),e)},startSearchBeacons:function(e){M(c.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){M(c.stopSearchBeacons,{},e)},onSearchBeacons:function(e){P(c.onSearchBeacons,e)},openEnterpriseChat:function(e){M("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){M("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},openBusinessView:function(e){M("openBusinessView",{businessType:e.businessType,queryString:e.queryString||"",envVersion:e.envVersion},(e._complete=function(n){if(p){var e=n.extraData;if(e)try{n.extraData=JSON.parse(e)}catch(e){n.extraData={}}}},e))},miniProgram:{navigateBack:function(e){e=e||{},O(function(){M("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){O(function(){M("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){O(function(){M("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){O(function(){M("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){O(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},T=1,k={};return i.addEventListener("error",function(e){if(!p){var n=e.target,i=n.tagName,t=n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)if(-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=T++,n["wx-id"]=o),k[o])return;k[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),i.addEventListener("load",function(e){if(!p){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(k[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=w),w}function M(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,x(e),function(e){A(n,e,i)}):B(n,i)}function P(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):B(n,t||i)}function x(e){return(e=e||{}).appId=v.appId,e.verifyAppId=v.appId,e.verifySignType="sha1",e.verifyTimestamp=v.timestamp+"",e.verifyNonceStr=v.nonceStr,e.verifySignature=v.signature,e}function V(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"!=e&&"openBusinessView"!==e||(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=a[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",v.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function C(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=c[t];o&&(e[n]=o)}return e}}function B(e,n){if(!(!v.debug||n&&n.isInnerInvoke)){var i=a[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function L(){return(new Date).getTime()}function O(e){l&&(o.WeixinJSBridge?e():i.addEventListener&&i.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json
new file mode 100644
index 0000000..a6fafdd
--- /dev/null
+++ b/node_modules/jweixin-module/package.json
@@ -0,0 +1,54 @@
+{
+  "_from": "jweixin-module",
+  "_id": "jweixin-module@1.6.0",
+  "_inBundle": false,
+  "_integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+  "_location": "/jweixin-module",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "jweixin-module",
+    "name": "jweixin-module",
+    "escapedName": "jweixin-module",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+  "_shasum": "4a7ea614083e3c9c3f49e2fdc2bb882cfa58dfcd",
+  "_spec": "jweixin-module",
+  "_where": "E:\\_web\\www.diandashop.com\\ddshop2\\uniapp",
+  "author": {
+    "name": "Shengqiang Guo"
+  },
+  "bugs": {
+    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "微信JS-SDK",
+  "devDependencies": {},
+  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "keywords": [
+    "wxjssdk",
+    "weixin",
+    "jweixin",
+    "wechat",
+    "jssdk",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "lib/index.js",
+  "name": "jweixin-module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+  },
+  "scripts": {},
+  "version": "1.6.0"
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..5112685
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..6294e12
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+    "id": "mr-calendar",
+    "name": "改进版的mr-calendar多选范围日历组件",
+    "version": "0.1",
+    "description": "支持单选 多选，单范围、多个范围选择的日历插件",
+    "keywords": [
+        "日历，日期选择，日期范围，多个日期范围"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..5c3e584
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,2702 @@
+{
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarTitleText": "",
+		"h5": {
+			"titleNView": false
+		},
+		"app-plus": {
+			"scrollIndicator": "none"
+		}
+	},
+
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
+				"navigationStyle": "custom",
+
+				"app-plus": {
+					"titleView": false
+				}
+			}
+		},
+		{
+			"path": "pages/index/main",
+			"style": {
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/index/webView",
+			"style": {
+				"titleNView": false
+			}
+		},
+		{
+			"path": "pages/index/webView2",
+			"style": {
+				"titleNView": false
+			}
+		},
+		{
+			"path": "pages/index/reg",
+			"style": {
+				"navigationBarTitleText": "用户注册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/login",
+			"style": {
+				"navigationBarTitleText": "用户登录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/getpwd",
+			"style": {
+				"navigationBarTitleText": "找回密码",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/index/bind",
+			"style": {
+				"navigationBarTitleText": "绑定管理员",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/index/about",
+			"style": {
+				"navigationBarTitleText": "关于知味",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/address/address",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/address/addressadd",
+			"style": {
+				"navigationBarTitleText": "编辑收货地址",
+				"enablePullDownRefresh": false
+			}
+		},
+
+
+		{
+			"path": "pages/business/index",
+			"style": {
+				"navigationBarTitleText": "店铺主页",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/business/main",
+			"style": {
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/business/clist",
+			"style": {
+				"navigationBarTitleText": "商家列表",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/business/blist",
+			"style": {
+				"navigationBarTitleText": "附近商家",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/business/apply",
+			"style": {
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/business/commentlist",
+			"style": {
+				"navigationBarTitleText": "商家评价",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/business/clist2",
+			"style": {
+				"navigationBarTitleText": "选择商家",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		
+
+		{
+			"path": "pages/coupon/couponlist",
+			"style": {
+				"navigationBarTitleText": "领券中心",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/coupon/mycoupon",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/coupon/coupondetail",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#058552",
+				"navigationBarTextStyle": "#FFFFFF"
+			}
+		},
+
+		{
+			"path": "pages/form/formlog",
+			"style": {
+				"navigationBarTitleText": "提交记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/form/formdetail",
+			"style": {
+				"navigationBarTitleText": "详细信息",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/form/formpay",
+			"style": {
+				"navigationBarTitleText": "订单支付",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/lipin/index",
+			"style": {
+				"navigationBarTitleText": "兑换中心",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/lipin/prodh",
+			"style": {
+				"navigationBarTitleText": "兑换商品",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/lipin/dhlog",
+			"style": {
+				"navigationBarTitleText": "兑换记录",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/maidan/maidanlog",
+			"style": {
+				"navigationBarTitleText": "买单付款记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/maidan/maidandetail",
+			"style": {
+				"navigationBarTitleText": "买单付款详情",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/maidan/pay",
+			"style": {
+				"navigationBarTitleText": "买单付款",
+				"enablePullDownRefresh": true
+			}
+		},
+
+
+		{
+			"path": "pages/yuebao/yuebaolog",
+			"style": {
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/yuebao/withdraw",
+			"style": {
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/my/usercenter",
+			"style": {
+				"enablePullDownRefresh": false,				
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/levelinfo",
+			"style": {
+				"navigationBarTitleText": "等级说明",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/levelup",
+			"style": {
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/leveluppay",
+			"style": {
+				"navigationBarTitleText": "订单支付",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/scorelog",
+			"style": {
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/scoreTransfer",
+			"style": {
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/scoreWithdraw",
+			"style": {
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/favorite",
+			"style": {
+				"navigationBarTitleText": "我的收藏",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/history",
+			"style": {
+				"navigationBarTitleText": "我的足迹",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/my/paypwd",
+			"style": {
+				"navigationBarTitleText": "设置支付密码",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/set",
+			"style": {
+				"navigationBarTitleText": "个人设置",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/setpwd",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/setnickname",
+			"style": {
+				"navigationBarTitleText": "设置昵称",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/setrealname",
+			"style": {
+				"navigationBarTitleText": "设置姓名",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/settel",
+			"style": {
+				"navigationBarTitleText": "设置手机号",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/setsex",
+			"style": {
+				"navigationBarTitleText": "设置性别",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/setbirthday",
+			"style": {
+				"navigationBarTitleText": "设置生日",
+				"enablePullDownRefresh": false
+			}
+		},
+		//{"path": "pages/my/setweixin","style": {"navigationBarTitleText": "设置微信号","enablePullDownRefresh": false}},
+		{
+			"path": "pages/my/setaliaccount",
+			"style": {
+				"navigationBarTitleText": "设置支付宝账号",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/setbankinfo",
+			"style": {
+				"navigationBarTitleText": "设置银行卡账号",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/setvita",
+			"style": {
+				"navigationBarTitleText": "个人简介",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/order/refundlist",
+			"style": {
+				"navigationBarTitleText": "退款订单",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/order/refundDetail",
+			"style": {
+				"navigationBarTitleText": "退款详情",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/order/orderlist",
+			"style": {
+				"navigationBarTitleText": "订单列表",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/order/detail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/order/logistics",
+			"style": {
+				"navigationBarTitleText": "查看物流",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/order/comment",
+			"style": {
+				"navigationBarTitleText": "我要评论",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/order/commentdp",
+			"style": {
+				"navigationBarTitleText": "店铺评价",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/order/commentps",
+			"style": {
+				"navigationBarTitleText": "评价配送员",
+				"enablePullDownRefresh": false
+			}
+		},
+	
+		{
+			"path": "pages/order/refundSelect",
+			"style": {
+				"navigationBarTitleText": "申请退款",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/order/refund",
+			"style": {
+				"navigationBarTitleText": "申请退款",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/order/invoice",
+			"style": {
+				"navigationBarTitleText": "发票",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/shop/product",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/shop/commentlist",
+			"style": {
+				"navigationBarTitleText": "商品评论",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/shop/cart",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shop/prolist",
+			"style": {
+				"navigationBarTitleText": "商品列表",
+				"navigationBarBackgroundColor":"#0A5D3B",
+				"enablePullDownRefresh": false,
+				"navigationBarTextStyle": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/shop/search",
+			"style": {
+				"navigationBarTitleText": "商品搜索",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shop/category1",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shop/category2",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shop/category3",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shop/category4",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shop/classify",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#fff",				
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/fastbuy",
+			"style": {
+				"navigationBarTitleText": "快速购买",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shop/fastbuy2",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/shop/mendian",
+			"style": {
+				"navigationBarTitleText": "门店",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/sign/index",
+			"style": {
+				"navigationBarTitleText": "签到",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/sign/signrecord",
+			"style": {
+				"navigationBarTitleText": "签到记录",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/kefu/index",
+			"style": {
+				"navigationBarTitleText": "在线咨询",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/pay/pay",
+			"style": {
+				"navigationBarTitleText": "收银台",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/pay/transfer",
+			"style": {
+				"navigationBarTitleText": "转账汇款",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/store/detail",
+			"style": {
+				"navigationBarTitleText": "店铺详情",
+				"enablePullDownRefresh": false
+			}
+		}
+
+	],
+	"subPackages": [{
+			// #ifdef MP
+			"root": "pages/live",
+			"plugins": {
+				"live-player-plugin": {
+					"version": "1.3.2",
+					// 填写该直播组件版本号
+					"provider": "wx2b03c6e691cd7370"
+					// 必须填该直播组件appid
+				}
+			},
+			"pages": [{
+				"path": "index",
+				"style": {
+					"usingComponents": {
+						"subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+					}
+				}
+			}]
+			// #endif
+		},
+		{
+			"root": "pagesA",
+			"pages": [
+				
+				
+				
+				{
+					"path": "article/artlist",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "article/detail",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "article/pinglun",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},{
+					"path": "shop/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shop/index",
+					"style": {
+						"navigationBarTitleText": "店铺首页",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "shop/classify",
+					"style": {
+						"navigationBarTitleText": "店铺分类",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "shop/shop-detail",
+					"style": {
+						"navigationBarTitleText": "店铺详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shop/search",
+					"style": {
+						"navigationBarTitleText": "商品搜索",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#FFFFFF"
+					}
+				},
+				{
+					"path": "shop/classify2",
+					"style": {
+						"navigationBarTitleText": "分类商品",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shop/sizeShop",
+					"style": {
+						"navigationBarTitleText": "选择店铺",
+						"navigationBarBackgroundColor": "#fff",		
+						"enablePullDownRefresh": false
+					}
+				},
+				
+			
+				{
+					"path": "commission/index",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/commissionlog",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/commissionlogMendian",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/orderMendian",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/withdraw",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/myteam",
+					"style": {
+						"navigationBarTitleText": "我的团队",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/downorder",
+					"style": {
+						"navigationBarTitleText": "推广订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/poster",
+					"style": {
+						"navigationBarTitleText": "分享海报",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/fhlog",
+					"style": {
+						"navigationBarTitleText": "分红记录",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/fhorder",
+					"style": {
+						"navigationBarTitleText": "分红订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/fenhong",
+					"style": {
+						"navigationBarTitleText": "股东分红",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/teamfenhong",
+					"style": {
+						"navigationBarTitleText": "团队分红",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/areafenhong",
+					"style": {
+						"navigationBarTitleText": "区域代理分红",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/orderYeji",
+					"style": {
+						"navigationBarTitleText": "业绩统计",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/myteamline",
+					"style": {
+						"navigationBarTitleText": "我的上下级",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "commission/mysameline",
+					"style": {
+						"navigationBarTitleText": "同等级会员",
+						"enablePullDownRefresh": true
+					}
+				},
+				
+				{
+					"path": "money/moneylog",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "money/withdraw",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "money/recharge",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "money/rechargeToMember",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				}
+
+			]
+		},
+		{
+			"root": "diary",
+			"pages": [{
+					"path": "topic/topic",
+					"style": {
+						"navigationBarTitleText": "话题中心"
+					}
+				},
+				{
+					"path": "topic/plaza",
+					"style": {
+						"navigationBarTitleText": "话题广场 "
+					}
+				},
+				{
+					"path": "live/live",
+					"style": {
+						"navigationBarTitleText": " ",
+						"navigationStyle": "custom",
+						"app-plus": {
+							"titleView": false
+						}
+
+					}
+				},
+				{
+					"path": "info/info",
+					"style": {
+						"navigationBarTitleText": "",
+
+						"navigationStyle": "custom",
+						"app-plus": {
+							"titleView": false
+						}
+					}
+				},
+
+				{
+					"path": "note/note",
+					"style": {
+						"navigationBarTitleText": "笔记详情"
+					}
+				},
+				{
+					"path": "issue/issue",
+					"style": {
+						"navigationBarTitleText": "生活圈",
+						"navigationStyle": "custom"
+					}
+				},
+
+				{
+					"path": "search/search",
+					"style": {
+						"navigationBarTitleText": "搜索"
+					}
+				},
+				{
+					"path": "comment/comment",
+					"style": {
+						"navigationBarTitleText": "收到的评论"
+					}
+				},
+				{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "知味日记",
+						"navigationStyle": "custom",
+
+						"app-plus": {
+							"titleView": false
+						}
+					}
+
+				},
+				{
+					"path": "attention/attention",
+					"style": {
+						"navigationBarTitleText": "关注",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "evernote/evernote",
+					"style": {
+						"navigationBarTitleText": "笔记",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "video/video",
+					"style": {
+						"navigationBarTitleText": "视频",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}
+
+			]
+		},
+		{
+			"root": "activity",
+			"pages": [
+
+				{
+					"path": "yx/kouling",
+					"style": {
+						"navigationBarTitleText": "口令",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "scoreshop/index",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "scoreshop/prolist",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "scoreshop/product",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "scoreshop/cart",
+					"style": {
+						"navigationBarTitleText": "购物车",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "scoreshop/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "scoreshop/orderlist",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "scoreshop/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "scoreshop/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "scoreshop/poster",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+
+				{
+					"path": "kanjia/index",
+					"style": {
+						"navigationBarTitleText": "砍价商品列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "kanjia/product",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "kanjia/join",
+					"style": {
+						"navigationBarTitleText": "砍价详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "kanjia/helplist",
+					"style": {
+						"navigationBarTitleText": "帮砍列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "kanjia/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "kanjia/orderlist",
+					"style": {
+						"navigationBarTitleText": "砍价订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "kanjia/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "kanjia/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "collage/index",
+					"style": {
+						"navigationBarTitleText": "拼团商品列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "collage/product",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "collage/team",
+					"style": {
+						"navigationBarTitleText": "参团成员",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "collage/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "collage/orderlist",
+					"style": {
+						"navigationBarTitleText": "拼团订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "collage/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "collage/comment",
+					"style": {
+						"navigationBarTitleText": "我要评论",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "collage/commentlist",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "collage/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "seckill/index",
+					"style": {
+						"navigationBarTitleText": "秒杀列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "seckill/product",
+					"style": {
+						"navigationBarTitleText": "秒杀商品",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "seckill/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "seckill/orderlist",
+					"style": {
+						"navigationBarTitleText": "秒杀订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "seckill/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "seckill/comment",
+					"style": {
+						"navigationBarTitleText": "我要评论",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "seckill/commentlist",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "seckill/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "tuangou/prolist",
+					"style": {
+						"navigationBarTitleText": "团购列表",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#0A5D3B",
+						"navigationBarTextStyle": "#FFFFFF"
+					}
+				},
+				{
+					"path": "tuangou/product",
+					"style": {
+						"navigationBarTitleText": "团购商品",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "tuangou/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "tuangou/orderlist",
+					"style": {
+						"navigationBarTitleText": "团购订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "tuangou/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "tuangou/comment",
+					"style": {
+						"navigationBarTitleText": "我要评论",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "tuangou/commentlist",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "tuangou/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "xydzp/index",
+					"style": {
+						"navigationBarTitleText": "幸运大转盘",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "xydzp/myprize",
+					"style": {
+						"navigationBarTitleText": "我的奖品",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "ggk/index",
+					"style": {
+						"navigationBarTitleText": "刮刮卡",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "ggk/myprize",
+					"style": {
+						"navigationBarTitleText": "我的奖品",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "luntan/ltlist",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luntan/detail",
+					"style": {
+						"navigationBarTitleText": "笔记详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luntan/fatie",
+					"style": {
+						"navigationBarTitleText": "发帖",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luntan/pinglun",
+					"style": {
+						"navigationBarTitleText": "评论",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "peisong/dating",
+					"style": {
+						"navigationBarTitleText": "接单大厅",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "peisong/orderlist",
+					"style": {
+						"navigationBarTitleText": "我的配送单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "peisong/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "peisong/my",
+					"style": {
+						"navigationBarTitleText": "个人中心",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "peisong/moneylog",
+					"style": {
+						"navigationBarTitleText": "余额明细"
+					}
+				},
+				{
+					"path": "peisong/withdraw",
+					"style": {
+						"navigationBarTitleText": "余额提现"
+					}
+				},
+				{
+					"path": "peisong/setinfo",
+					"style": {
+						"navigationBarTitleText": "提现设置"
+					}
+				},
+
+				{
+					"path": "yuyue/selectpeople",
+					"style": {
+						"navigationBarTitleText": "人员列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/product",
+					"style": {
+						"navigationBarTitleText": "服务详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "yuyue/product2",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/prolist",
+					"style": {
+						"navigationBarTitleText": "服务列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/buy2",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/orderlist",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/logistics",
+					"style": {
+						"navigationBarTitleText": "查看进度",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/comment",
+					"style": {
+						"navigationBarTitleText": "评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/commentps",
+					"style": {
+						"navigationBarTitleText": "评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/commentlist",
+					"style": {
+						"navigationBarTitleText": "评价列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/peolist",
+					"style": {
+						"navigationBarTitleText": "人员列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/peolist2",
+					"style": {
+						"navigationBarTitleText": "师傅列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/peodetail",
+					"style": {
+						"navigationBarTitleText": "人员详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/peodetail2",
+					"style": {
+						"navigationBarTitleText": "师傅详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/jdorderlist",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/jdorderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/my",
+					"style": {
+						"navigationBarTitleText": "我的",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/dating",
+					"style": {
+						"navigationBarTitleText": "我的",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/moneylog",
+					"style": {
+						"navigationBarTitleText": "账单明细",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/search",
+					"style": {
+						"navigationBarTitleText": "搜索",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/setinfo",
+					"style": {
+						"navigationBarTitleText": "提现设置",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/withdraw",
+					"style": {
+						"navigationBarTitleText": "我的钱包",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/login",
+					"style": {
+						"navigationBarTitleText": "服务人员登录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "yuyue/setpwd",
+					"style": {
+						"navigationBarTitleText": "修改密码",
+						"enablePullDownRefresh": false
+					}
+				},
+
+				{
+					"path": "shortvideo/index",
+					"style": {
+						"navigationBarTitleText": "短视频列表"
+					}
+				},
+				{
+					"path": "shortvideo/detail",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
+						"titleNView": false
+					}
+				},
+				{
+					"path": "shortvideo/uploadvideo",
+					"style": {
+						"navigationBarTitleText": "发布短视频"
+					}
+				},
+				{
+					"path": "shortvideo/myupload",
+					"style": {
+						"navigationBarTitleText": "我的发表记录"
+					}
+				},
+
+
+				{
+					"path": "kecheng/list",
+					"style": {
+						"navigationBarTitleText": "课程列表",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#0A5D3B",
+						"navigationBarTextStyle": "#FFFFFF"
+					}
+				},
+				{
+					"path": "kecheng/product",
+					"style": {
+						"navigationBarTitleText": "课程详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "kecheng/mldetail",
+					"style": {
+						"navigationBarTitleText": "目录详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "kecheng/orderlist",
+					"style": {
+						"navigationBarTitleText": "我的课程",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "kecheng/tiku",
+					"style": {
+						"navigationBarTitleText": "开始答题",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "kecheng/complete",
+					"style": {
+						"navigationBarTitleText": "答题完成",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "kecheng/recordlog",
+					"style": {
+						"navigationBarTitleText": "答题记录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "kecheng/error",
+					"style": {
+						"navigationBarTitleText": "错题回顾",
+						"enablePullDownRefresh": false
+					}
+				},
+
+				{
+					"path": "luckycollage/classify",
+					"style": {
+						"navigationBarTitleText": "幸运拼团分类",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/prolist",
+					"style": {
+						"navigationBarTitleText": "商品列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/product",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/team",
+					"style": {
+						"navigationBarTitleText": "参团成员",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "luckycollage/orderlist",
+					"style": {
+						"navigationBarTitleText": "拼团订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/comment",
+					"style": {
+						"navigationBarTitleText": "我要评论",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "luckycollage/commentlist",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "luckycollage/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/index",
+					"style": {
+						"navigationBarTitleText": "开团列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "luckycollage/product2",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "express/index",
+					"style": {
+						"navigationBarTitleText": "快递查询",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "express/mail",
+					"style": {
+						"navigationBarTitleText": "寄快递",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "express/addressadd",
+					"style": {
+						"navigationBarTitleText": "新增地址",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "express/address",
+					"style": {
+						"navigationBarTitleText": "地址薄",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "express/logistics",
+					"style": {
+						"navigationBarTitleText": "物流信息",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "express/kddetail",
+					"style": {
+						"navigationBarTitleText": "快递详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "toupiao/index",
+					"style": {
+						"navigationBarTitleText": "活动详情"
+					}
+				},
+				{
+					"path": "toupiao/detail",
+					"style": {
+						"navigationBarTitleText": "投票详情"
+					}
+				},
+				{
+					"path": "toupiao/phb",
+					"style": {
+						"navigationBarTitleText": "排行榜"
+					}
+				},
+				{
+					"path": "toupiao/baoming",
+					"style": {
+						"navigationBarTitleText": "我要报名"
+					}
+				},
+				{
+					"path": "toupiao/shuoming",
+					"style": {
+						"navigationBarTitleText": "活动说明"
+					}
+				},
+
+				{
+					"path": "hongbaoEveryday/index",
+					"style": {
+						"navigationBarTitleText": "活动",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "hongbaoEveryday/log",
+					"style": {
+						"navigationBarTitleText": "获得记录",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "hongbaoEveryday/eduLog",
+					"style": {
+						"navigationBarTitleText": "额度记录",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "hongbaoEveryday/withdraw",
+					"style": {
+						"navigationBarTitleText": "提现",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "workorder/index",
+					"style": {
+						"navigationBarTitleText": "工单提交",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "workorder/detail",
+					"style": {
+						"navigationBarTitleText": "工单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "workorder/record",
+					"style": {
+						"navigationBarTitleText": "工单列表",
+						"enablePullDownRefresh": true
+					}
+				}
+
+			]
+		},
+		{
+			"root": "admin",
+			"pages": [{
+					"path": "index/login",
+					"style": {
+						"navigationBarTitleText": "管理员登录"
+					}
+				},
+				{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "管理中心",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "index/setpwd",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+					}
+				},
+				{
+					"path": "index/setinfo",
+					"style": {
+						"navigationBarTitleText": "店铺设置"
+					}
+				},
+				{
+					"path": "index/recharge",
+					"style": {
+						"navigationBarTitleText": "店铺设置"
+					}
+				},
+
+				{
+					"path": "hexiao/hexiao",
+					"style": {}
+				},
+				{
+					"path": "hexiao/record",
+					"style": {
+						"navigationBarTitleText": "我的核销",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "finance/index",
+					"style": {
+						"navigationBarTitleText": "财务"
+					}
+				},
+				{
+					"path": "finance/commissionlog",
+					"style": {}
+				},
+				{
+					"path": "finance/comwithdrawdetail",
+					"style": {}
+				},
+				{
+					"path": "finance/comwithdrawlog",
+					"style": {}
+				},
+				{
+					"path": "finance/moneylog",
+					"style": {}
+				},
+				{
+					"path": "finance/rechargelog",
+					"style": {
+						"navigationBarTitleText": "充值记录"
+					}
+				},
+				{
+					"path": "finance/withdrawdetail",
+					"style": {}
+				},
+				{
+					"path": "finance/withdrawlog",
+					"style": {}
+				},
+				{
+					"path": "finance/bmoneylog",
+					"style": {
+						"navigationBarTitleText": "余额明细"
+					}
+				},
+				{
+					"path": "finance/bwithdraw",
+					"style": {
+						"navigationBarTitleText": "余额提现"
+					}
+				},
+				{
+					"path": "finance/bwithdrawlog",
+					"style": {
+						"navigationBarTitleText": "提现记录"
+					}
+				},
+				{
+					"path": "finance/txset",
+					"style": {
+						"navigationBarTitleText": "提现信息"
+					}
+				},
+				{
+					"path": "finance/yuebaowithdrawlog",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "finance/yuebaowithdrawdetail",
+					"style": {}
+				},
+				{
+					"path": "finance/yuebaolog",
+					"style": {}
+				},
+
+				{
+					"path": "kefu/index",
+					"style": {
+						"navigationBarTitleText": "消息列表"
+					}
+				},
+				{
+					"path": "kefu/message",
+					"style": {}
+				},
+				{
+					"path": "member/index",
+					"style": {}
+				},
+				{
+					"path": "member/detail",
+					"style": {}
+				},
+				{
+					"path": "order/collageorder",
+					"style": {
+						"navigationBarTitleText": "拼团订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/collageorderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/luckycollageorder",
+					"style": {
+						"navigationBarTitleText": "幸运拼团订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/luckycollageorderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/kanjiaorder",
+					"style": {
+						"navigationBarTitleText": "砍价订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/kanjiaorderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/seckillorder",
+					"style": {
+						"navigationBarTitleText": "秒杀订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/seckillorderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "order/seckill2order",
+					"style": {
+						"navigationBarTitleText": "秒杀订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/seckill2orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+
+				{
+					"path": "order/yuyueorder",
+					"style": {
+						"navigationBarTitleText": "预约订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/yuyueorderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+
+				{
+					"path": "order/scoreshoporder",
+					"style": {
+						"navigationBarTitleText": "积分兑换订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/scoreshoporderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/shoporder",
+					"style": {
+						"navigationBarTitleText": "商城订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/shoporderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/shopRefundOrder",
+					"style": {
+						"navigationBarTitleText": "退款订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/shopRefundOrderDetail",
+					"style": {
+						"navigationBarTitleText": "退款订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "order/tuangouorder",
+					"style": {
+						"navigationBarTitleText": "团购订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order/tuangouorderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "workorder/record",
+					"style": {
+						"navigationBarTitleText": "处理工单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "workorder/add",
+					"style": {
+						"navigationBarTitleText": "提交工单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "workorder/formlog",
+					"style": {
+						"navigationBarTitleText": "工单记录",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "workorder/formdetail",
+					"style": {
+						"navigationBarTitleText": "工单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "workorder/myformdetail",
+					"style": {
+						"navigationBarTitleText": "商户工单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+
+
+
+				{
+					"path": "form/formlog",
+					"style": {
+						"navigationBarTitleText": "表单提交记录"
+					}
+				},
+				{
+					"path": "form/formdetail",
+					"style": {
+						"navigationBarTitleText": "表单提交记录"
+					}
+				},
+
+				{
+					"path": "shortvideo/uploadvideo",
+					"style": {
+						"navigationBarTitleText": "发布短视频"
+					}
+				},
+				{
+					"path": "shortvideo/myupload",
+					"style": {
+						"navigationBarTitleText": "我的发表记录"
+					}
+				},
+
+				{
+					"path": "product/edit",
+					"style": {
+						"navigationBarTitleText": "商品设置"
+					}
+				},
+				{
+					"path": "product/index",
+					"style": {
+						"navigationBarTitleText": "商品管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "index/businessqr",
+					"style": {
+						"navigationBarTitleText": "推广码"
+					}
+				}
+				// #custom if restaurant
+				, {
+					"path": "restaurant/product/edit",
+					"style": {
+						"navigationBarTitleText": "菜品设置"
+					}
+				},
+				{
+					"path": "restaurant/product/index",
+					"style": {
+						"navigationBarTitleText": "菜品管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/category/edit",
+					"style": {
+						"navigationBarTitleText": "菜品分类设置"
+					}
+				},
+				{
+					"path": "restaurant/category/index",
+					"style": {
+						"navigationBarTitleText": "菜品分类管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/tableEdit",
+					"style": {
+						"navigationBarTitleText": "餐桌设置"
+					}
+				},
+				{
+					"path": "restaurant/table",
+					"style": {
+						"navigationBarTitleText": "餐桌管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/tableWaiter",
+					"style": {
+						"navigationBarTitleText": "餐桌管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/tableWaiterDetail",
+					"style": {
+						"navigationBarTitleText": "餐桌详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/tableWaiterPay",
+					"style": {
+						"navigationBarTitleText": "结算",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/tableCategoryEdit",
+					"style": {
+						"navigationBarTitleText": "餐桌分类设置"
+					}
+				},
+				{
+					"path": "restaurant/tableCategory",
+					"style": {
+						"navigationBarTitleText": "餐桌分类管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/takeawayorder",
+					"style": {
+						"navigationBarTitleText": "外卖订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/takeawayorderdetail",
+					"style": {
+						"navigationBarTitleText": "外卖订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/shoporder",
+					"style": {
+						"navigationBarTitleText": "点餐订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/shoporderdetail",
+					"style": {
+						"navigationBarTitleText": "点餐订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/shoporderEdit",
+					"style": {
+						"navigationBarTitleText": "点餐订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/bookingorder",
+					"style": {
+						"navigationBarTitleText": "预定订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/bookingorderdetail",
+					"style": {
+						"navigationBarTitleText": "预定订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/depositorder",
+					"style": {
+						"navigationBarTitleText": "寄存订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/depositorderdetail",
+					"style": {
+						"navigationBarTitleText": "寄存订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/booking",
+					"style": {
+						"navigationBarTitleText": "添加预定",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/bookingTableList",
+					"style": {
+						"navigationBarTitleText": "选择餐桌",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/queue",
+					"style": {
+						"navigationBarTitleText": "排队叫号",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/queueCategory",
+					"style": {
+						"navigationBarTitleText": "排队管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "restaurant/queueCategoryEdit",
+					"style": {
+						"navigationBarTitleText": "排队管理",
+						"enablePullDownRefresh": true
+					}
+				}
+				// #custom endif
+			]
+		}
+		// #custom if restaurant
+		, {
+			"root": "restaurant",
+			"pages": [{
+					"path": "takeaway/blist",
+					"style": {
+						"navigationBarTitleText": "商家列表"
+					}
+				},
+				{
+					"path": "takeaway/index",
+					"style": {
+						"navigationBarTitleText": "商家详情"
+					}
+				},
+				{
+					"path": "takeaway/product",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "takeaway/commentlist",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "takeaway/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认"
+					}
+				},
+				{
+					"path": "takeaway/orderlist",
+					"style": {
+						"navigationBarTitleText": "外卖订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "takeaway/comment",
+					"style": {
+						"navigationBarTitleText": "我要评论",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "takeaway/commentdp",
+					"style": {
+						"navigationBarTitleText": "店铺评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "takeaway/commentps",
+					"style": {
+						"navigationBarTitleText": "评价配送员",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "takeaway/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "takeaway/logistics",
+					"style": {
+						"navigationBarTitleText": "查看物流",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "takeaway/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "shop/index",
+					"style": {
+						"navigationBarTitleText": "点餐"
+					}
+				},
+				{
+					"path": "shop/search",
+					"style": {
+						"navigationBarTitleText": "搜索"
+					}
+				},
+				{
+					"path": "shop/product",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "shop/commentlist",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "shop/buy",
+					"style": {
+						"navigationBarTitleText": "订单确认"
+					}
+				},
+				{
+					"path": "shop/orderlist",
+					"style": {
+						"navigationBarTitleText": "点餐记录",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "shop/comment",
+					"style": {
+						"navigationBarTitleText": "我要评论",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shop/commentdp",
+					"style": {
+						"navigationBarTitleText": "店铺评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shop/commentps",
+					"style": {
+						"navigationBarTitleText": "评价配送员",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shop/orderdetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "shop/logistics",
+					"style": {
+						"navigationBarTitleText": "查看物流",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "shop/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "booking/add",
+					"style": {
+						"navigationBarTitleText": "预定",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "booking/tableList",
+					"style": {
+						"navigationBarTitleText": "餐桌列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "booking/orderlist",
+					"style": {
+						"navigationBarTitleText": "预定列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "booking/detail",
+					"style": {
+						"navigationBarTitleText": "预定详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "queue/index",
+					"style": {
+						"navigationBarTitleText": "排队信息",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "queue/quhao",
+					"style": {
+						"navigationBarTitleText": "取号排队",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "queue/record",
+					"style": {
+						"navigationBarTitleText": "排队记录",
+						"enablePullDownRefresh": true
+					}
+				},
+
+				{
+					"path": "deposit/orderlist",
+					"style": {
+						"navigationBarTitleText": "全部寄存"
+					}
+				},
+				{
+					"path": "deposit/orderdetail",
+					"style": {
+						"navigationBarTitleText": "寄存详情"
+					}
+				},
+				{
+					"path": "deposit/add",
+					"style": {
+						"navigationBarTitleText": "寄存"
+					}
+				}
+			]
+		}, {
+			"root": "newOtherPages",
+			"pages": [{
+					"path": "moreSearch/moreSearch",
+					"style": {
+						"navigationBarTitleText": "知味日记"
+					}
+				},
+				{
+					"path": "myInterest/index",
+					"style": {
+						"navigationBarTitleText": "我的关注",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#FFFFFF"
+					}
+				},
+				{
+					"path": "myBalance/myBalance",
+					"style": {
+						"navigationBarTitleText": "我的余额",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#FFFFFF"
+					}
+				},
+				{
+					"path": "editProfile/editProfile",
+					"style": {
+						"navigationBarTitleText": "编辑资料",
+						"enablePullDownRefresh": false,			
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "myFans/myFans",
+					"style": {
+						"navigationBarTitleText": "我的粉丝",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#FFFFFF"
+					}
+				},
+				{
+					"path": "myService/myService",
+					"style": {
+						"navigationBarTitleText": "联系客服",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#FFFFFF"
+					}
+				}
+			]
+		}
+	],
+	"navigateToMiniProgramAppIdList": [
+		"wxeb490c6f9b154ef9",
+		"wx2b03c6e691cd7370"
+	],
+	"sitemapLocation": "sitemap.json",
+	"permission": {
+		"scope.userLocation": {
+			"desc": "你的位置信息将用于获取距离信息"
+		}
+	},
+	"condition": { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "店铺首页", //模式名称
+			"path": "pagesA/shop/index", //启动页面，必选
+			"query": "a=1" //启动参数，在页面的onLoad函数里面得到
+		}]
+	}
+}
diff --git a/pages/address/address.vue b/pages/address/address.vue
new file mode 100644
index 0000000..547cff5
--- /dev/null
+++ b/pages/address/address.vue
@@ -0,0 +1,168 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入姓名/手机号搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view v-for="(item, index) in datalist" :key="index" class="content" @tap.stop="setdefault" :data-id="item.id">
+			<view class="f1">
+				<text class="t1">{{item.name}}</text>
+				<text class="t2">{{item.tel}}</text>
+				<text class="t2" v-if="item.company">{{item.company}}</text>
+				<text class="t2" v-if="item.isdefault == 1" style="color: #F55726;    line-height: 40rpx;height: 40rpx;padding: 0 10rpx;border-radius: 6rpx;    border: 1px solid #F55726;">默认</text>
+				<text class="flex1"></text>
+				<image class="t3" :src="event_rul +'/static/img/static/img/edit.png'" @tap.stop="goto" :data-url="'/pages/address/addressadd?id=' + item.id + '&type=' + (item.latitude>0 ? '1' : '0')">
+			</view>
+			<view class="f2">{{item.area}} {{item.address}}</view>
+			<view class="f3">
+				<view class="flex-y-center">
+					<view class="radio" :style="item.isdefault ? 'border:0;background:'+t('color1') : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					<view class="mrtxt">{{item.isdefault ? '默认地址' : '设为默认'}}</view>
+				</view>
+				<view class="flex1"></view>
+				<view class="del" :style="{color:t('color1')}" @tap.stop="del" :data-id="item.id">删除</view>
+				<!-- <view class="del" style="color: #666;" @tap.stop="del" :data-id="item.id">删除</view> -->
+			</view>
+		</view>
+		<nodata v-if="nodata"></nodata>
+		<view style="height:140rpx"></view>
+		<view class="btn-add" :class="menuindex>-1?'tabbarbot':'notabbarbot3'" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" @tap="goto" :data-url="'/pages/address/addressadd?type=' + type"><image :src="event_rul +'/static/img/static/img/add.png'" style="width:28rpx;height:28rpx;margin-right:6rpx"/>添加地址</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		type: "",
+		keyword:'',
+		nodata:false,
+
+		event_rul: app.globalData.event_url,
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.type = this.opt.type || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			that.nodata = false;
+			app.get('ApiAddress/address', {type: that.opt.type,keyword:that.keyword}, function (res) {
+				that.loading = false;
+				var datalist = res.data;
+				if(datalist && datalist.length == 1) {
+					datalist.forEach((item, idx) => {
+						item.isdefault = 1
+					})
+				}
+				if (datalist.length == 0 && that.keyword == ''){
+					uni.redirectTo({
+						url: '/pages/address/addressadd?type=' + (that.opt.type || 0)
+					});
+				}else if(datalist.length == 0){
+					that.datalist = datalist;
+					that.nodata = true;
+				}else{
+					that.datalist = datalist;
+				}
+				that.loaded();
+			});
+		},
+    //选择收货地址
+    setdefault: function (e) {
+      var that = this;
+      var fromPage = this.opt.fromPage;
+      var addressId = e.currentTarget.dataset.id;
+      app.post('ApiAddress/setdefault', {addressid: addressId}, function (data) {
+        if (fromPage) {
+          app.goback(true);
+        } else {
+          that.getdata();
+        }
+      });
+    },
+    del: function (e) {
+      var that = this;
+      var addressId = e.currentTarget.dataset.id;
+      console.log(addressId);
+      app.confirm('确定要删除此地址吗?', function () {
+        app.post("ApiAddress/del", {addressid: addressId}, function (res) {
+          app.success(res.msg);
+          that.getdata();
+        });
+      });
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    },
+		getweixinaddress:function(){
+      var that = this;
+			wx.chooseAddress({
+				success (res) {
+					app.showLoading('提交中');
+					app.post('ApiAddress/addressadd', {type: that.type,addressid: '',name: res.userName,tel: res.telNumber,area: res.provinceName+','+res.cityName+','+res.countyName,address: res.detailInfo}, function (res) {
+						app.showLoading(false);
+						if (res.status == 0) {
+							app.alert(res.msg);
+							return;
+						}
+						that.getdata();
+						app.success('添加成功');
+					});
+				}
+			})
+		}
+  }
+};
+</script>
+<style>
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:20rpx 40rpx;}
+.content .f1{height:96rpx;line-height:96rpx;display:flex;align-items:center}
+.content .f1 .t1{color:#2B2B2B;font-weight:bold;font-size:30rpx}
+.content .f1 .t2{color:#999999;font-size:28rpx;margin-left:10rpx}
+.content .f1 .t3{width:28rpx;height:28rpx}
+.content .f2{color:#2b2b2b;font-size:26rpx;line-height:42rpx;padding-bottom:20rpx;border-bottom:1px solid #F2F2F2}
+.content .f3{height:96rpx;display:flex;align-items:center}
+.content .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;}
+.content .radio .radio-img{width:100%;height:100%}
+.content .mrtxt{color:#2B2B2B;font-size:26rpx;margin-left:10rpx}
+.content .del{font-size:24rpx}
+
+.container .btn-add{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:0;margin-bottom:20rpx;}
+.container .btn-add2{width:43%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:5%;bottom:0;margin-bottom:20rpx;}
+.container .btn-add3{width:43%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;right:5%;bottom:0;margin-bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/pages/address/addressadd.vue b/pages/address/addressadd.vue
new file mode 100644
index 0000000..e710a66
--- /dev/null
+++ b/pages/address/addressadd.vue
@@ -0,0 +1,295 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="addfromwx" v-if="getplatform() == 'wx' && type!=1" @tap="getweixinaddress"><image :src="event_rul + '/static/img/static/img/weixin.png'" class="img"/> 获取微信收货地址 <view class="flex1"></view><image :src="event_rul + '/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx;"/></view>
+		<form @submit="formSubmit">
+			<view class="form">
+				<view class="form-item">
+					<text class="label">姓 名</text>
+					<input class="input" type="text" placeholder="请输入姓名" placeholder-style="font-size:28rpx;color:#BBBBBB" name="name" :value="name"></input>
+				</view>
+				<view class="form-item" v-if="showCompany">
+					<text class="label">公 司</text>
+					<input class="input" type="text" placeholder="请输入公司或单位名称" placeholder-style="font-size:28rpx;color:#BBBBBB" name="company" :value="company"></input>
+				</view>
+				<view class="form-item">
+					<text class="label">手机号</text>
+					<input class="input" type="number" placeholder="请输入手机号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="tel" :value="tel"></input>
+					<text>+86</text>
+				</view>
+				<view class="form-item" v-if="type==1">
+					<text class="label flex0">选择位置</text>
+					<text class="flex1" style="text-align:left" :style="area ? '' : 'color:#BBBBBB'" @tap="selectzuobiao" >{{area ? area : '请选择您的位置'}}</text>
+					<!-- <input class="input" type="text" placeholder="请选择您的位置" placeholder-style="font-size:28rpx;color:#BBBBBB" name="area" :value="area" @tap="selectzuobiao"></input> -->
+				</view>
+				<view class="form-item" v-else>
+					<text class="label ">所在地区</text>
+					<uni-data-picker class="flex1" :localdata="items" :border="false" :placeholder="regiondata || '请选择省市区'" @change="regionchange"></uni-data-picker>
+					<text class="iconfont icon-weizhi1" style="font-size: 50rpx;"></text>
+					<!-- <picker mode="region" name="regiondata" :value="regiondata" class="input" @change="bindPickerChange">
+						<view class="picker" v-if="regiondata">{{regiondata}}</view>
+						<view v-else>请选择地区</view>
+					</picker> -->
+				</view>
+				<view class="form-item">
+					<text class="label">详细地址</text>
+					<input class="input" type="text" placeholder="请输入详细地址" placeholder-style="font-size:28rpx;color:#BBBBBB" name="address" :value="address"></input>
+				</view>
+				<view class="item flex-y-center" v-if="type!=1">
+					<view class="f2 flex-y-center flex1">
+						<input id="addressxx" placeholder="粘贴地址信息，可自动识别并填写，如：张三，188********，广东省 东莞市 xx区 xx街道 xxxx" placeholder-style="font-size:24rpx;color:#BBBBBB" style="width:85%;font-size:24rpx;margin:20rpx 0;height:100rpx;padding:4rpx 10rpx" @input="setaddressxx"></input>
+						<view style="width:15%;text-align:center;color:#999" @tap="shibie">识别</view>
+					</view>
+				</view>
+			</view>
+			<button class="savebtn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'" form-type="submit">保存并使用</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		name: '',
+		tel: '',
+		area: '',
+		address: '',
+		longitude: '',
+		latitude: '',
+		regiondata: '',
+		type: 0,
+		addressxx: '',
+		company: '',
+		items:[],
+		showCompany:false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+    this.type = this.opt.type || 0;
+		var that = this;
+		app.get('ApiIndex/getCustom',{}, function (customs) {
+			var url = app.globalData.pre_url+'/static/area.json';
+			if(customs.data.includes('plug_zhiming')) {
+				url = app.globalData.pre_url+'/static/area_gaoxin.json';
+			}
+			uni.request({
+				url: url,
+				data: {},
+				method: 'GET',
+				header: { 'content-type': 'application/json' },
+				success: function(res2) {
+					that.items = res2.data
+				}
+			});
+		});
+		
+    this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			var addressId = that.opt.id || '';
+			app.get('ApiIndex/getCustom',{}, function (customs) {
+				if(customs.data.includes('plug_xiongmao')) {
+					that.showCompany = true;
+				}
+			});
+			if(addressId) {
+				that.loading = true;
+				app.get('ApiAddress/addressadd', {id: addressId,type: that.type}, function (res) {
+					that.loading = false;
+					that.name = res.data.name;
+					that.tel = res.data.tel;
+					that.area = res.data.area;
+					that.address = res.data.address;
+					that.longitude = res.data.longitude;
+					that.latitude = res.data.latitude;
+					that.company = res.data.company;
+					if (res.data.province){
+						var regiondata = res.data.province+ ',' + res.data.city+ ',' + res.data.district;
+					} else {
+						var regiondata = '';
+					}
+					that.regiondata = regiondata
+					that.loaded();
+				});
+			}else{
+				that.loaded();
+			}
+		},
+		regionchange(e) {
+			const value = e.detail.value
+			console.log(value[0].text + ',' + value[1].text + ',' + value[2].text);
+			this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text
+		},
+    selectzuobiao: function () {
+			console.log('selectzuobiao')
+      var that = this;
+      uni.chooseLocation({
+        success: function (res) {
+          console.log(res);
+          that.area = res.address;
+          that.address = res.name;
+          that.latitude = res.latitude;
+          that.longitude = res.longitude;
+        },
+        fail: function (res) {
+					console.log(res)
+          if (res.errMsg == 'chooseLocation:fail auth deny') {
+            //$.error('获取位置失败，请在设置中开启位置信息');
+            app.confirm('获取位置失败，请在设置中开启位置信息', function () {
+              uni.openSetting({});
+            });
+          }
+        }
+      });
+    },
+    formSubmit: function (e) {
+      var that = this;
+      var formdata = e.detail.value;
+      var addressId = that.opt.id || '';
+      var name = formdata.name;
+      var tel = formdata.tel;
+      var regiondata = that.regiondata;
+
+      if (that.type == 1) {
+        var area = that.area;
+				if(area == '') {
+					app.error('请选择位置');
+					return;
+				}
+      } else {
+        var area = regiondata;
+				if(area == '') {
+					app.error('请选择省市区');
+					return;
+				}
+      }
+      var address = formdata.address;
+      var longitude = that.longitude;
+      var latitude = that.latitude;
+      var company = formdata.company;
+
+      if (name == '' || tel == '' || address == '') {
+        app.error('请填写完整信息');
+        return;
+      } else {
+				if (!/^1[3456789]\d{9}$/.test(tel)) {
+					app.error("请输入正确手机号");
+					return;
+				}
+			}
+			app.showLoading('提交中');
+      app.post('ApiAddress/addressadd', {type: that.type,addressid: addressId,name: name,tel: tel,area: area,address: address,latitude: latitude,longitude: longitude,company:company}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          app.alert(res.msg);
+          return;
+        }
+        app.success('保存成功');
+        setTimeout(function () {
+          app.goback(true);
+        }, 1000);
+      });
+    },
+    delAddress: function () {
+      var that = this;
+      var addressId = that.opt.id;
+      app.confirm('确定要删除该收获地址吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiAddress/del', {addressid: addressId}, function () {
+					app.showLoading(false);
+          app.success('删除成功');
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    bindPickerChange: function (e) {
+      var val = e.detail.value;
+      this.regiondata = val;
+    },
+    setaddressxx: function (e) {
+      this.addressxx = e.detail.value;
+    },
+    shibie: function () {
+      var that = this;
+      var addressxx = that.addressxx;
+      app.post('ApiAddress/shibie', {addressxx: addressxx}, function (res) {
+        var isrs = 0;
+        if (res.province) {
+          isrs = 1;
+          that.regiondata = res.province + ',' +res.city + ',' +res.county
+        }
+        if (res.detail) {
+          isrs = 1;
+          that.address = res.detail
+        }
+        if (res.person) {
+          isrs = 1;
+          that.name = res.person
+        }
+        if (res.phonenum) {
+          isrs = 1;
+          that.tel = res.phonenum
+        }
+        if (isrs == 0) {
+          app.error('识别失败');
+        } else {
+          app.success('识别完成');
+        }
+      });
+    },
+		getweixinaddress:function(){
+      var that = this;
+			wx.chooseAddress({
+				success (res) {
+					app.showLoading('提交中');
+					app.post('ApiAddress/addressadd', {type: that.type,addressid: '',name: res.userName,tel: res.telNumber,area: res.provinceName+','+res.cityName+','+res.countyName,address: res.detailInfo}, function (res) {
+						app.showLoading(false);
+						if (res.status == 0) {
+							app.alert(res.msg);
+							return;
+						}
+						app.success('添加成功');
+						setTimeout(function () {
+							app.goback(true);
+						}, 1000);
+					});
+				}
+			})
+		}
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+
+.addfromwx{width:94%;margin:20rpx 3% 0 3%;border-radius:5px;padding:20rpx 3%;background: #FFF;display:flex;align-items:center;color:#666;font-size:28rpx;}
+.addfromwx .img{width:40rpx;height:40rpx;margin-right:20rpx;}
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{ color:#8B8B8B;font-weight:bold;height: 60rpx; line-height: 60rpx; text-align:left;width:150rpx;padding-right:20rpx}
+.form-item .input{ flex:1;height: 60rpx; line-height: 60rpx;text-align:left}
+/* .savebtn{ width: 90%; height:96rpx; line-height: 96rpx; text-align:center;border-radius:48rpx; color: #fff;font-weight:bold;margin: 0 5%; margin-top:60rpx; border: none;font-size: 30rpx; } */.savebtn{width:90%;max-width:700px;margin:0 auto;height:96rpx;line-height:96rpx;text-align:center;color:#fff;font-size:30rpx;font-weight:bold;border-radius:40rpx;position: fixed;left:0px;right:0;bottom:0;margin-bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/pages/business/apply.vue b/pages/business/apply.vue
new file mode 100644
index 0000000..bcb58fd
--- /dev/null
+++ b/pages/business/apply.vue
@@ -0,0 +1,374 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view style="color:red;padding:10rpx 30rpx;margin-top:20rpx" v-if="info.id && info.status==2">审核不通过：{{info.reason}}，请修改后再提交</view>
+		<view style="color:red;padding:10rpx 30rpx;margin-top:20rpx" v-if="info.id && info.status==0">您已提交申请，请等待审核</view>
+		<form @submit="subform">
+			<view class="apply_box">
+				<view class="apply_item">
+					<view>联系人姓名<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="linkman" :value="info.linkman" placeholder="请填写姓名"></input></view>
+				</view>
+				<view class="apply_item">
+					<view>联系人电话<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="linktel" :value="info.linktel" placeholder="请填写手机号码"></input></view>
+				</view>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item">
+					<view>商家名称<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="name" :value="info.name" placeholder="请输入商家名称"></input></view>
+				</view>
+				<view class="apply_item">
+					<view>商家描述<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="desc" :value="info.desc" placeholder="请输入商家描述"></input></view>
+				</view>
+				<view class="apply_item">
+					<view>主营类目<text style="color:red"> *</text></view>
+					<view>
+						<picker @change="cateChange" :value="cindex" :range="cateArr">
+							<view class="picker">{{cateArr[cindex]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="apply_item">
+					<view>店铺坐标<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" disabled placeholder="请选择坐标" name="zuobiao" :value="latitude ? latitude+','+longitude:''" @tap="locationSelect"></input></view>
+				</view>
+				<view class="apply_item">
+					<view>店铺地址<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="address" :value="address" placeholder="请输入商家详细地址"></input></view>
+				</view>
+				<input type="text" hidden="true" name="latitude" :value="latitude"></input>
+				<input type="text" hidden="true" name="longitude" :value="longitude"></input>
+				<view class="apply_item">
+					<view>客服电话<text style="color:red"> *</text></view>
+					<view class="flex-y-center"><input type="text" name="tel" :value="info.tel" placeholder="请填写客服电话"></input></view>
+				</view>
+				<view class="apply_item" style="line-height:50rpx"><textarea name="content" placeholder="请输入商家简介" :value="info.content"></textarea></view>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item" style="border-bottom:0"><text>商家主图<text style="color:red"> *</text></text></view>
+				<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					<view v-for="(item, index) in pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pic"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pic" v-if="pic.length==0"></view>
+				</view>
+				<input type="text" hidden="true" name="pic" :value="pic.join(',')" maxlength="-1"></input>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item" style="border-bottom:0"><text>商家照片(3-5张)<text style="color:red"> *</text></text></view>
+				<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pics"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" v-if="pics.length<5"></view>
+				</view>
+				<input type="text" hidden="true" name="pics" :value="pics.join(',')" maxlength="-1"></input>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item" style="border-bottom:0"><text>证明材料<text style="color:red"> </text></text></view>
+				<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					<view v-for="(item, index) in zhengming" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="zhengming"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="zhengming"></view>
+				</view>
+				<input type="text" hidden="true" name="zhengming" :value="zhengming.join(',')" maxlength="-1"></input>
+			</view>
+			<view class="apply_box">
+				<view class="apply_item">
+					<text>登录账号<text style="color:red"> *</text></text>
+					<view class="flex-y-center"><input type="text" name="un" :value="info.un" placeholder="请填写登录账号" autocomplete="off"></input></view>
+				</view>
+				<view class="apply_item">
+					<text>登录密码<text style="color:red"> *</text></text>
+					<view class="flex-y-center"><input type="password" name="pwd" :value="info.pwd" placeholder="请填写登录密码" autocomplete="off"></input></view>
+				</view>
+				<view class="apply_item">
+					<text>确认密码<text style="color:red"> *</text></text>
+					<view class="flex-y-center"><input type="password" name="repwd" :value="info.repwd" placeholder="请再次填写密码"></input></view>
+				</view>
+			</view>
+			<block v-if="bset.xieyi_show==1">
+			<view class="flex-y-center" style="margin-left:20rpx;color:#999" v-if="!info.id || info.status==2">
+				<checkbox-group @change="isagreeChange"><label class="flex-y-center"><checkbox value="1" :checked="isagree"></checkbox>阅读并同意</label></checkbox-group>
+				<text style="color:#666" @tap="showxieyiFun">《商户入驻协议》</text>
+			</view>
+			</block>
+			<view style="padding:30rpx 0"><button v-if="!info.id || info.status==2" form-type="submit" class="set-btn" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'">提交申请</button>
+</view>
+		</form>
+		
+		<view id="xieyi" :hidden="!showxieyi" style="width:100%;height:100%;position:fixed;top:0;left:0;z-index:99;background:rgba(0,0,0,0.7)">
+			<view style="width:90%;margin:0 auto;height:85%;margin-top:10%;background:#fff;color:#333;padding:5px 10px 50px 10px;position:relative;border-radius:2px">
+				<view style="overflow:scroll;height:100%;">
+					<parse :content="bset.xieyi"/>
+				</view>
+				<view style="position:absolute;z-index:9999;bottom:10px;left:0;right:0;margin:0 auto;text-align:center" @tap="hidexieyi">已阅读并同意</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		datalist: [],
+		pagenum: 1,
+		cateArr: [],
+		cindex: 0,
+		isagree: false,
+		showxieyi: false,
+		pic:[],
+		pics:[],
+		zhengming:[],
+		info: {},
+		bset:{},
+		latitude: '',
+		longitude: '',
+		address:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiBusiness/apply', {}, function (res) {
+				that.loading = false;
+				if (res.status == 2) {
+					app.alert(res.msg, function () {
+						app.goto('/admin/index/index', 'redirect');
+					})
+					return;
+				}
+				uni.setNavigationBarTitle({
+					title: res.title
+				});
+				var clist = res.clist;
+				var cateArr = [];
+				for (var i in clist) {
+					cateArr.push(clist[i].name);
+				}
+				var pics = res.info ? res.info.pics : '';
+				if (pics) {
+					pics = pics.split(',');
+				} else {
+					pics = [];
+				}
+				var zhengming = res.info ? res.info.zhengming : '';
+				if (zhengming) {
+					zhengming = zhengming.split(',');
+				} else {
+					zhengming = [];
+				}
+				that.clist = res.clist
+				that.bset = res.bset
+				that.info = res.info
+        that.address = res.info.address;
+        that.latitude = res.info.latitude;
+        that.longitude = res.info.longitude;
+				that.cateArr = cateArr;
+				that.pic = res.info.pic ? [res.info.pic] : [];
+				that.pics = pics;
+				that.zhengming = zhengming;
+				that.loaded();
+			});
+		},
+    cateChange: function (e) {
+      this.cindex = e.detail.value;
+    },
+    locationSelect: function () {
+      var that = this;
+      uni.chooseLocation({
+        success: function (res) {
+          that.info.address = res.name;
+					that.info.latitude = res.latitude;
+          that.info.longitude = res.longitude;
+          that.address = res.name;
+          that.latitude = res.latitude;
+          that.longitude = res.longitude;
+        }
+      });
+    },
+    subform: function (e) {
+      var that = this;
+      var info = e.detail.value;
+      if (info.linkman == '') {
+        app.error('请填写联系人姓名');
+        return false;
+      }
+      if (info.linktel == '') {
+        app.error('请填写联系人电话');
+        return false;
+      }
+      if (info.tel == '') {
+        app.error('请填写客服电话');
+        return false;
+      }
+      if (info.name == '') {
+        app.error('请填写商家名称');
+        return false;
+      }
+      if (info.zuobiao == '') {
+        //app.error('请选择店铺坐标');
+        //return false;
+      }
+      if (info.address == '') {
+        app.error('请填写店铺地址');
+        return false;
+      }
+      if (info.pic == '') {
+        app.error('请上传商家主图');
+        return false;
+      }
+      if (info.pics == '') {
+        app.error('请上传商家照片');
+        return false;
+      }
+      if (info.zhengming == '') {//$.error('请上传证明材料');return false;
+      }
+      if (info.un == '') {
+        app.error('请填写登录账号');
+        return false;
+      }
+      if (info.pwd == '') {
+        app.error('请填写登录密码');
+        return false;
+      }
+      var pwd = info.pwd;
+      if (pwd.length < 6) {
+        app.error('密码不能小于6位');
+        return false;
+      }
+      if (info.repwd != info.pwd) {
+        app.error('两次输入密码不一致');
+        return false;
+      } //if(!/(^0?1[3|4|5|6|7|8|9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$)/.test(tel)){
+      //	dialog('手机号格式错误');return false;
+      //}
+      info.address = that.address;
+      info.latitude = that.latitude;
+      info.longitude = that.longitude;
+      if (that.bset.xieyi_show == 1 && !that.isagree) {
+        app.error('请先阅读并同意商户入驻协议');
+        return false;
+      }
+      info.cid = that.clist[that.cindex].id;
+      if (that.info && that.info.id) {
+        info.id = that.info.id;
+      }
+			app.showLoading('提交中');
+      app.post("ApiBusiness/apply", {info: info}, function (res) {
+				app.showLoading(false);
+        app.error(res.msg);
+				if(res.status == 1){
+					setTimeout(function () {
+						app.goto(app.globalData.indexurl);
+					}, 1000);
+				}
+      });
+    },
+    isagreeChange: function (e) {
+      console.log(e.detail.value);
+      var val = e.detail.value;
+      if (val.length > 0) {
+        this.isagree = true;
+      } else {
+        this.isagree = false;
+      }
+    },
+    showxieyiFun: function () {
+      this.showxieyi = true;
+    },
+    hidexieyi: function () {
+      this.showxieyi = false;
+			this.isagree = true;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'pic'){
+				var pics = that.pic
+				pics.splice(index,1);
+				that.pic = pics;
+			}else if(field == 'pics'){
+				var pics = that.pics
+				pics.splice(index,1);
+				that.pics = pics;
+			}else if(field == 'zhengming'){
+				var pics = that.zhengming
+				pics.splice(index,1);
+				that.zhengming = pics;
+			}
+		},
+  }
+}
+</script>
+<style>
+radio{transform: scale(0.6);}
+checkbox{transform: scale(0.6);}
+.apply_box{ padding:2rpx 24rpx 0 24rpx; background: #fff;margin: 24rpx;border-radius: 10rpx}
+.apply_title { background: #fff}
+.apply_title .qr_goback{ width:18rpx;height:32rpx; margin-left:24rpx;     margin-top: 34rpx;}
+.apply_title .qr_title{ font-size: 36rpx; color: #242424;   font-weight:bold;margin: 0 auto; line-height: 100rpx;}
+
+.apply_item{ line-height: 100rpx; display: flex;justify-content: space-between;border-bottom:1px solid #eee }
+.apply_box .apply_item:last-child{ border:none}
+.apply_item input{ width: 100%; border: none;color:#111;font-size:28rpx; text-align: right}
+.apply_item input::placeholder{ color:#999999}
+.apply_item textarea{ width:100%;min-height:200rpx;padding:20rpx 0;border: none;}
+.apply_item .upload_pic{ margin:50rpx 0;background: #F3F3F3;width:90rpx;height:90rpx; text-align: center  }
+.apply_item .upload_pic image{ width: 32rpx;height: 32rpx; }
+.set-btn{width: 90%;margin:0 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/pages/business/blist.vue b/pages/business/blist.vue
new file mode 100644
index 0000000..1035645
--- /dev/null
+++ b/pages/business/blist.vue
@@ -0,0 +1,327 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="搜索你感兴趣的商家" placeholder-style="font-size:24rpx;color:#C2C2C2" confirm-type="search" @confirm="search"></input>
+				</view>
+			</view>
+			<view class="search-navbar">
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='juli'?'color:'+t('color1'):''" data-field="juli" data-order="asc">距离最近</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='comment_score'?'color:'+t('color1'):''" data-field="comment_score" data-order="desc">评分排序</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" data-field="sales" :data-order="order=='asc'?'desc':'asc'">
+					<text :style="field=='sales'?'color:'+t('color1'):''">销量排序</text>
+					<text class="iconfont iconshangla" :style="field=='sales'&&order=='asc'?'color:'+t('color1'):''"></text>
+					<text class="iconfont icon-xia" :style="field=='sales'&&order=='desc'?'color:'+t('color1'):''"></text>
+				</view>
+				<view class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view>
+			</view>
+		</view>
+		<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+			<view class="filter-scroll-view">
+				<scroll-view class="filter-scroll-view-box" scroll-y="true">
+					<view class="search-filter">
+						<view class="filter-title">筛选</view>
+						<view class="filter-content-title">商家分类</view>
+						<view class="search-filter-content">
+							<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+							<block v-for="(item, index) in clist" :key="index">
+								<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+							</block>
+						</view>
+						<view class="search-filter-btn">
+							<view class="btn" @tap="filterReset">重置</view>
+							<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-drawer>
+		
+		<view class="ind_business">
+			<view class="ind_buslist" id="datalist">
+				<block v-for="(item, index) in datalist" :key="index">
+				<view @tap="goto" :data-url="'/pages/business/index?id=' + item.id">
+					<view class="ind_busbox flex1 flex-row">
+						<view class="ind_buspic flex0"><image :src="item.logo"></image></view>
+						<view>
+							<view class="bus_title">{{item.name}}</view>
+							<view class="bus_sales">销量：{{item.sales}}</view>
+						
+							<view  class="info_box">
+								<view class="left">
+									<view class="bus_score">
+										<image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.comment_score>item2?'2':'') + '.png'"/>
+										<view class="txt">{{item.comment_score}}分</view>
+									</view>
+									<view class="bus_address"><text class="x1">{{item.address}}</text><text class="x2">{{item.juli}}</text></view>
+									
+								</view>
+								<view class="right" @click.stop="">
+									<button @click="goClass(item)" type="default">去下单</button>
+								</view>
+							</view>
+							<scroll-view scroll-x="true" style="width: 550rpx;">
+							<view class="prolist" v-if="(item.prolist).length > 0 || (item.restaurantProlist && (item.restaurantProlist).length > 0)">
+									 <view v-for="(item2, index2) in item.prolist" class="product" @tap.stop="goto" :data-url="'/pages/shop/product?id=' + item2.id">
+									 	<image class="f1" :src="item2.pic"></image>
+									 	<view class="f2">￥{{item2.sell_price}}</view>
+									 </view>
+									 <block v-if="item.restaurantProlist && (item.restaurantProlist).length > 0">
+									 <view v-for="(item3, index3) in item.restaurantProlist" class="product" @tap.stop="goto" :data-url="'/restaurant/takeaway/product?id=' + item3.id">
+									 	<image class="f1" :src="item3.pic"></image>
+									 	<view class="f2">￥{{item3.sell_price}}</view>
+									 </view>
+									 </block>
+							</view>
+							</scroll-view>
+						</view>
+					</view>
+				</view>
+				</block>
+				<nomore v-if="nomore"></nomore>
+				<nodata v-if="nodata"></nodata>
+			</view>
+		</view>
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		field: 'juli',
+		order:'asc',
+		oldcid: "",
+		catchecid: "",
+		longitude: '',
+		latitude: '',
+		clist:[],
+		datalist: [],
+		pagenum: 1,
+		keyword: '',
+		cid: '',
+		nomore: false,
+		nodata: false,
+		types: "",
+		typesc:'',
+		showfilter: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+	  this.typesc = opt.tpyes || ''
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid;
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getDataList(true);
+    }
+  },
+  methods: {
+	  goClass(item){
+		  console.log('123',item)
+		  
+		  uni.setStorageSync('class_store_info',JSON.stringify(item))
+	uni.reLaunch({url:'/pages/shop/classify'})
+	// app.goto('/pages/shop/classify')
+		  // uni.setStorageSync('storage_key', 'hello');
+	  },
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiBusiness/blist', {}, function (res) {
+				that.loading = false;
+				that.clist = res.clist;
+				that.loaded();
+			});
+			app.getLocation(function (res) {
+				var latitude = res.latitude;
+				var longitude = res.longitude;
+				that.longitude = longitude;
+				that.latitude = latitude;
+				that.getDataList();
+			},
+			function () {
+				that.getDataList();
+			});
+		},
+    getDataList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var latitude = that.latitude;
+      var longitude = that.longitude;
+      var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiBusiness/blist', {pagenum: pagenum,cid: that.cid,field: that.field,order: that.order,longitude: longitude,latitude: latitude,keyword: keyword}, function (res) {
+        that.loading = false;
+				uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+      that.catchecid = cid
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.gid = this.catchegid;
+			this.getDataList();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    changetab: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+      that.cid = cid
+      that.pagenum = 1;
+      that.datalist = [];
+      that.getDataList();
+    },
+    search: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+			that.pagenum = 1;
+      that.datalist = [];
+      that.getDataList();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.getDataList();
+    },
+    filterClick: function (e) {
+      var that = this;
+      var types = e.currentTarget.dataset.types;
+      that.types = types;
+    }
+  }
+};
+</script>
+<style lang="scss">
+	.info_box{
+		margin-top: 14rpx;
+		display: flex;
+		justify-content: space-between;
+		.right{
+			button{
+				width: 180rpx;
+				height: 66rpx;
+				border-radius: 66rpx;
+				background-color: #f0bd71;
+				color: #fff;
+				margin-right: 20rpx;
+			}
+		}
+	}
+.search-container {position: fixed;width: 100%;background: #fff;z-index:9;top:var(--window-top)}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+.topsearch .search-btn{display:flex;align-items:center;color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.search-navbar {display: flex;text-align: center;align-items:center;padding:5rpx 0}
+.search-navbar-item {flex: 1;height: 70rpx;line-height: 70rpx;position: relative;font-size:28rpx;font-weight:bold;color:#323232}
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 30rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.ind_business {width: 100%;margin-top: 190rpx;font-size:26rpx;padding:0 24rpx}
+.ind_business .ind_busbox{ background: #fff;padding:20rpx;overflow: hidden; margin-bottom:20rpx;border-radius:8rpx;position:relative}
+.ind_business .ind_buspic{ width:120rpx;height:120rpx; margin-right: 28rpx; }
+.ind_business .ind_buspic image{ width: 100%;height:100%;border-radius: 8rpx;object-fit: cover;}
+.ind_business .bus_title{ font-size: 28rpx; color: #222;font-weight:bold;line-height: 40rpx}
+.ind_business .bus_score{font-size: 24rpx;color:#FC5648;display:flex;align-items:center}
+.ind_business .bus_score .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.ind_business .bus_score .txt{margin-left:20rpx}
+.ind_business .indsale_box{ display: flex}
+.ind_business .bus_sales{ font-size: 24rpx; color:#999;position:absolute;top:20rpx;right:28rpx}
+
+.ind_business .bus_address{color:#999;font-size: 24rpx;height:30rpx;line-height: 30rpx;overflow:hidden;margin-top:6rpx}
+.ind_business .bus_address .x2{padding-left:20rpx}
+.ind_business .prolist{white-space: nowrap;margin-top:16rpx; margin-bottom: 10rpx;}
+.ind_business .prolist .product{width:108rpx;height:160rpx;overflow:hidden;display:inline-flex;flex-direction:column;align-items:center;margin-right:24rpx}
+.ind_business .prolist .product .f1{width:108rpx;height:108rpx;border-radius:8rpx;background:#f6f6f6}
+.ind_business .prolist .product .f2{font-size:22rpx;color:#FC5648;font-weight:bold;margin-top:4rpx}
+</style>
\ No newline at end of file
diff --git a/pages/business/clist.vue b/pages/business/clist.vue
new file mode 100644
index 0000000..10813ea
--- /dev/null
+++ b/pages/business/clist.vue
@@ -0,0 +1,227 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view @tap.stop="goto" data-url="/pages/business/blist" class="search-container">
+			<view class="search-box">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<view class="search-text">搜索感兴趣的商家</view>
+			</view>
+		</view>
+		<view class="content-container">
+			<view class="nav_left">
+				<view :class="'nav_left_items ' + (curIndex == -1 ? 'active' : '')" @tap="switchRightTab" data-index="-1" data-id="0"><view class="before" :style="{background:t('color1')}"></view>全部</view>
+				<block v-for="(item, index) in clist" :key="index">
+					<view :class="'nav_left_items ' + (curIndex == index ? 'active' : '')" @tap="switchRightTab" :data-index="index" :data-id="item.id"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+				</block>
+			</view>
+			<view class="nav_right">
+				<view class="nav_right-content">
+					<scroll-view class="classify-box" scroll-y="true" @scrolltolower="scrolltolower">
+						<view v-for="(item, index) in datalist" :key="index" class="item" @tap="goto" :data-url="'/pages/business/index?id=' + item.id">
+							<image class="logo" :src="item.logo"></image>
+							<view class="detail">
+								<view class="f1">{{item.name}}</view>
+								<view class="f2"><block v-if="item.tel">电话：<text style="font-weight:bold">{{item.tel}}</text></block></view>
+								<view class="f4">地址：<text style="font-weight:bold">{{item.address}}</text></view>
+								<view class="f3" v-if="item.juli">距离：{{item.juli}}</view>
+							</view>
+						</view>
+						<nomore text="没有更多商家了" v-if="nomore"></nomore>
+						<nodata text="暂无相关商家" v-if="nodata"></nodata>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading" loadstyle="left:62.5%"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+
+<!-- <view class="container" :class="menuindex>-1?'tabbarbot':''">
+	<view class="nav_left">
+    <block v-for="(item, index) in clist" :key="index">
+      <view :class="'nav_left_items ' + (curIndex == index ? 'active' : '')" @tap="switchRightTab" :data-index="index" :data-id="item.id">
+      {{item.name}}
+      </view>
+    </block>
+  </view>
+  <view class="nav_right">
+    <scroll-view class="classify-box" scroll-y="true" @scrolltolower="scrolltolower">
+			<view v-for="(item, index) in datalist" :key="index" class="item" @tap="goto" :data-url="'/pages/business/index?id=' + item.id">
+				<image :src="item.logo"></image>
+				<view class="detail">
+					<view class="f1">{{item.name}}</view>
+					<view class="f2"><block v-if="item.tel"><text class="fa fa-phone"></text> {{item.tel}}</block></view>
+					<view class="f4"><text class="fa fa-map-marker"></text> {{item.address}}</view>
+					<view class="f3" v-if="item.juli">距离：{{item.juli}}</view>
+				</view>
+			</view>
+			<nomore v-if="nomore"></nomore>
+			<nodata v-if="nodata"></nodata>
+    </scroll-view>
+  </view>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view> -->
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		nodata:false,
+		nomore:false,
+		pagenum: 1,
+		datalist: [],
+		clist: [],
+		curIndex: -1,
+		curCid: 0,
+		nomore: false,
+		longitude: "",
+		latitude: "",
+		blist: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.curCid = this.opt.cid || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.pagenum = 1;
+			that.prolist = [];
+			that.loading = true;
+			app.get('ApiBusiness/clist', {}, function (res) {
+				that.loading = false;
+				that.clist = res.clist;
+				that.loaded();
+				app.getLocation(function (res) {
+					var latitude = res.latitude;
+					var longitude = res.longitude;
+					that.longitude = longitude;
+					that.latitude = latitude;
+					that.getblist();
+				},
+				function () {
+					that.getblist();
+				});
+			});
+		},
+    scrolltolower: function () {
+      if (!this.nodata && !this.nomore) {
+        this.pagenum = this.pagenum + 1;
+        this.getblist();
+      }
+    },
+    getblist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var cid = that.curCid;
+      var longitude = that.longitude;
+      var latitude = that.latitude;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiBusiness/clist', {longitude: longitude,latitude: latitude,pagenum: pagenum,cid: cid}, function (res) {
+				that.loading = false;
+				uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    //事件处理函数
+    switchRightTab: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var index = parseInt(e.currentTarget.dataset.index);
+      that.curIndex = index;
+      that.curCid = id;
+      that.pagenum = 1;
+      that.blist = [];
+      this.getblist();
+    }
+  }
+};
+</script>
+<style>
+page {height:100%;}
+.container{width: 100%;height:100%;max-width:640px;background-color: #fff;color: #939393;display: flex;flex-direction:column}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.content-container{flex:1;height:100%;display:flex;overflow: hidden;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;font-size:24rpx;position: relative;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 0 20rpx}
+.nav_right-content{background: #ffffff;padding:0 20rpx;height:100%}
+.classify-box{padding: 0 0 20rpx 0;width: 100%;height:calc(100% - 60rpx);overflow-y: scroll; border-top:1px solid #F5F6F8;}
+.classify-box .nav_right_items{ width:100%;border-bottom:1px #f4f4f4 solid;  padding:16rpx 0;  box-sizing:border-box;  position:relative; }
+
+.nav_right .item{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f5f5f5 solid;position:relative}
+.nav_right .item:last-child{ border-bottom: 0; }
+.nav_right .item .logo{ width: 160rpx; height: 160rpx;}
+.nav_right .item .detail{width:100%;overflow:hidden;display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.nav_right .item .detail .f1{color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.nav_right .item .detail .f2{margin-top:6rpx;height: 40rpx;line-height: 40rpx;color: #888;font-size:24rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.nav_right .item .detail .f3{margin-top:6rpx;height: 40rpx;line-height: 40rpx;color: #31C88E;font-size:24rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.nav_right .item .detail .f4{margin-top:6rpx;line-height: 40rpx;color: #999;font-size:24rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.nav_right .item .detail .f5{margin-top:6rpx;display:flex;height: 35rpx;line-height: 35rpx;font-size:24rpx;color: #ff4246;font-size: 22rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+/*
+.nomore-footer-tips{background:#ffffff}
+.container {position:fixed;width: 100%;max-width:640px;background-color: #fff;color: #939393;top: 0;bottom: 0;}
+.nav_left{overflow-y: scroll;width: 25%;height: 100%;background: #f5f5f5; box-sizing: border-box;text-align: center;position: absolute; top:var(--window-top); left: 0;}
+.nav_left .nav_left_items{height:100rpx;line-height:100rpx;color:#666666;padding:0;border-bottom: 1px solid #E6E6E6;font-size:28rpx;position: relative;border-right:1px solid #E6E6E6}
+.nav_left .nav_left_items.active{background: #fff;color:#FC4343;border-left:3px solid #FC4343}
+
+.nav_right{position: absolute;display:flex;flex-direction:column;top: var(--window-top);right: 0;flex: 1;width:75%;height: 100%;padding:0px 20rpx 20rpx 20rpx ;background: #fff;box-sizing: border-box;overflow-y: hidden;}
+
+.classify-box{ width: 100%;overflow-y: scroll; height:100%;}
+.nav_right_items{ width:100%;border-bottom:1px #eeeeee solid;  padding:16rpx 0;  box-sizing:border-box;  position:relative; }
+
+.nav_right .item{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f5f5f5 solid;position:relative}
+.nav_right .item:last-child{ border-bottom: 0; }
+.nav_right .item .logo{ width: 160rpx; height: 160rpx;}
+.nav_right .item .detail{width:100%;overflow:hidden;display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.nav_right .item .detail .f1{height: 40rpx;line-height: 40rpx;color: #111;}
+.nav_right .item .detail .f2{height: 40rpx;line-height: 40rpx;color: #888;overflow: hidden;font-size: 24rpx;}
+.nav_right .item .detail .f3{height: 40rpx;line-height: 40rpx;color: #31C88E;overflow: hidden;font-size: 24rpx;}
+.nav_right .item .detail .f4{height: 40rpx;line-height: 40rpx;color: #999;overflow: hidden;font-size: 24rpx;}
+.nav_right .item .detail .f5{display:flex;height: 35rpx;line-height: 35rpx;color: #ff4246;font-size: 22rpx}
+*/
+</style>
\ No newline at end of file
diff --git a/pages/business/clist2.vue b/pages/business/clist2.vue
new file mode 100644
index 0000000..4df81b6
--- /dev/null
+++ b/pages/business/clist2.vue
@@ -0,0 +1,255 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="搜索你感兴趣的商家" placeholder-style="font-size:24rpx;color:#C2C2C2" confirm-type="search" @confirm="search"></input>
+				</view>
+			</view>
+		</view>
+		
+		<view class="ind_business">
+			<view class="ind_buslist" id="datalist">
+				<block v-for="(item, index) in datalist" :key="index">
+				<view @tap="goto" :data-url="'/pages/index/index?select_bid=' + item.id">
+					<view class="ind_busbox flex1 flex-row">
+						<view>
+							<view class="bus_title">{{item.name}}</view>
+							<view class="bus_address"><text class="x1">{{item.address}}</text><text class="x2">{{item.juli}}</text><text class="x2" @tap.stop="phone" :data-phone="item.tel">{{item.tel}}</text></view>
+						</view>
+					</view>
+				</view>
+				</block>
+				<nomore v-if="nomore"></nomore>
+				<nodata v-if="nodata"></nodata>
+			</view>
+		</view>
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		field: 'juli',
+		order:'asc',
+		oldcid: "",
+		catchecid: "",
+		longitude: '',
+		latitude: '',
+		clist:[],
+		datalist: [],
+		pagenum: 1,
+		keyword: '',
+		cid: '',
+		nomore: false,
+		nodata: false,
+		types: "",
+		showfilter: "",
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid;
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getDataList(true);
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			// app.get('ApiBusiness/blist2', function (res) {
+			// 	that.loading = false;
+			// 	that.clist = res.clist;
+			// 	that.loaded();
+			// });
+			
+			that.loaded();
+			that.getDataList();
+			app.getLocation(function (res) {
+				that.loading = false;
+				var latitude = res.latitude;
+				var longitude = res.longitude;
+				that.longitude = longitude;
+				that.latitude = latitude;
+				that.getDataList();
+			},
+			function () {
+				that.getDataList();
+			});
+		},
+    getDataList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var latitude = that.latitude;
+      var longitude = that.longitude;
+      var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiBusiness/blist2', {pagenum: pagenum,cid: that.cid,field: that.field,order: that.order,longitude: longitude,latitude: latitude,keyword: keyword}, function (res) {
+        that.loading = false;
+				uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+      that.catchecid = cid
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.gid = this.catchegid;
+			this.getDataList();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    changetab: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+      that.cid = cid
+      that.pagenum = 1;
+      that.datalist = [];
+      that.getDataList();
+    },
+    search: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+			that.pagenum = 1;
+      that.datalist = [];
+      that.getDataList();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.getDataList();
+    },
+    filterClick: function (e) {
+      var that = this;
+      var types = e.currentTarget.dataset.types;
+      that.types = types;
+    },
+		phone:function(e) {
+			var phone = e.currentTarget.dataset.phone;
+			uni.makePhoneCall({
+				phoneNumber: phone,
+				fail: function () {
+				}
+			});
+		}
+  }
+};
+</script>
+<style>
+.search-container {position: fixed;width: 100%;background: #fff;z-index:9;top:var(--window-top)}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+.topsearch .search-btn{display:flex;align-items:center;color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.search-navbar {display: flex;text-align: center;align-items:center;padding:5rpx 0}
+.search-navbar-item {flex: 1;height: 70rpx;line-height: 70rpx;position: relative;font-size:28rpx;font-weight:bold;color:#323232}
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 30rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.ind_business {width: 100%;margin-top: 120rpx;font-size:26rpx;padding:0 24rpx}
+.ind_business .ind_busbox{ background: #fff;padding:20rpx;overflow: hidden; margin-bottom:20rpx;border-radius:8rpx;position:relative}
+.ind_business .ind_buspic{ width:120rpx;height:120rpx; margin-right: 28rpx; }
+.ind_business .ind_buspic image{ width: 100%;height:100%;border-radius: 8rpx;object-fit: cover;}
+.ind_business .bus_title{ font-size: 28rpx; color: #222;font-weight:bold;line-height: 40rpx}
+.ind_business .bus_score{font-size: 24rpx;color:#FC5648;display:flex;align-items:center}
+.ind_business .bus_score .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.ind_business .bus_score .txt{margin-left:20rpx}
+.ind_business .indsale_box{ display: flex}
+.ind_business .bus_sales{ font-size: 24rpx; color:#999;position:absolute;top:20rpx;right:28rpx}
+
+.ind_business .bus_address{color:#999;font-size: 24rpx;height:30rpx;line-height: 30rpx;overflow:hidden;margin-top:6rpx}
+.ind_business .bus_address .x2{padding-left:20rpx}
+.ind_business .prolist{white-space: nowrap;margin-top:16rpx; margin-bottom: 10rpx;}
+.ind_business .prolist .product{width:108rpx;height:160rpx;overflow:hidden;display:inline-flex;flex-direction:column;align-items:center;margin-right:24rpx}
+.ind_business .prolist .product .f1{width:108rpx;height:108rpx;border-radius:8rpx;background:#f6f6f6}
+.ind_business .prolist .product .f2{font-size:22rpx;color:#FC5648;font-weight:bold;margin-top:4rpx}
+</style>
\ No newline at end of file
diff --git a/pages/business/commentlist.vue b/pages/business/commentlist.vue
new file mode 100644
index 0000000..ae473e8
--- /dev/null
+++ b/pages/business/commentlist.vue
@@ -0,0 +1,154 @@
+<template>
+<view class="container">
+	<view class="shop">
+		<image :src="business.logo" class="p1"/>
+		<view class="p2 flex1">
+			<view class="t1">{{business.name}}</view>
+			<view class="t2">{{business.desc}}</view>
+		</view>
+		<button class="p4" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="goto" :data-url="'/pages/business/index?id='+business.id" data-opentype="reLaunch">进入店铺</button>
+	</view>
+	<view class="title">
+		<view class="f1">评价({{business.comment_num}})</view>
+		<view class="f2" @tap="goto">好评率 <text :style="{color:t('color1')}">{{business.comment_haopercent}}%</text></view>
+	</view>
+
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		business:{},
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiBusiness/commentlist', {bid: that.opt.bid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.business = res.business;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+
+.shop{display:flex;align-items:center;width:94%; background: #fff; padding: 20rpx 0;margin:0 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+
+.container .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex;margin:0 3%}
+.container .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.container .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/pages/business/index.vue b/pages/business/index.vue
new file mode 100644
index 0000000..7663907
--- /dev/null
+++ b/pages/business/index.vue
@@ -0,0 +1,669 @@
+<template>
+<view style="background-color: #fff;">
+	
+	<view class="">
+		<view class="info_box">
+			<view class="left" @click="goDetail">
+				<view class="l_left">
+					<image :src="info.logo" mode=""></image>
+				</view>
+				<view class="l_right" style="padding-bottom: 10rpx;">
+					<view class="l_r_top">
+						{{info.name}} <text style="color: #999; margin-left: 10rpx;" class="iconfont icon-arrow-right"></text>
+					</view>
+					<view class="l_r_bot">
+						<text>粉丝数 {{info.fans_count}}</text> 
+					</view>
+				</view>
+			</view>
+			<view class="right" @click="followFn" :style="{border:info.isFollow?'1px solid '+t('color1')+'':'',color:info.isFollow?t('color1'):'#fff','background-color':info.isFollow?'':t('color1')}">
+				{{info.isFollow?'已关注':'关注'}}
+			</view>
+		</view>
+		<view class="head_max_box">
+		 <view class="item" @click="tabClick(0)" :style="{color:tabIndex == 0?'#fff':'#333','background-color': tabIndex == 0?t('color1'):''}">
+		 	商品
+		 </view>
+		 <view class="item" @click="tabClick(1)"  :style="{color:tabIndex == 1?'#fff':'#333','background-color': tabIndex == 1?t('color1'):''}">
+		 	领券
+		 </view>
+		</view>
+
+	
+	<view class="conteont" v-if="tabIndex == 0">
+		<view  class="serach_tab">
+			<view class="serach_box">
+				<text class="iconfont icon-search" :style="{color:t('color1'),'font-size':'46rpx'}"></text>
+				 <!-- <input type="text" v-model="keyword" placeholder="请输入搜索内容" /> -->
+				 <input :value="keyword" placeholder="搜索感兴趣的商品" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+			<view class="head_box">
+				<view class="item" :class="{'itemz':!field||field=='sort'}" @tap.stop="sortClick" data-field="sort" data-order="desc">
+					<text class="txt">综合</text>
+				</view>
+				<view class="item"  :class="{'itemz':field=='sales'}" @tap.stop="sortClick" data-field="sales" data-order="desc">
+					<text class="txt">销量</text>
+				</view>
+				<view class="item"  :class="{'itemz':field=='createtime'}" @tap.stop="sortClick" data-field="createtime" data-order="desc">
+					<text class="txt">新品</text>
+				</view>
+				<view class="item"  :class="{'itemz':field=='sell_price'}" @tap.stop="sortClick"  data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+					<text class="txt">价格</text>
+				</view>
+			</view>
+		</view>
+		<view class="product-container">
+			<block v-if="datalist && datalist.length>0">
+				<dp-product-item v-if="productlisttype=='item2'" :data="datalist" :menuindex="menuindex"></dp-product-item>
+				<dp-product-itemlist v-if="productlisttype=='itemlist'" :data="datalist" :menuindex="menuindex"></dp-product-itemlist>
+			</block>
+			<nomore text="没有更多商品了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+	</view>
+	<view class="conteont" v-if="tabIndex == 1">
+		
+		
+		
+			<view class="coupon-list">
+					<view v-for="(item, index) in datalist" :key="item.id" style="display: flex; position: relative;" @tap.stop="goto" :data-url="'coupondetail?id=' + item.id">
+						<image style="position: absolute; width: 100%; height: 100%;" :src="event_rul + '/static/img/static/icon/b857ece13154962c055e341ca457d37d_thumb.png'" mode=""></image>
+						<image v-if="(item.haveget>=item.perlimit) ||item.stock<=0 " style="position: absolute; width: 16.5%; height: 100%; right: 0;" :src="event_rul + '/static/img/static/icon/926b1fd8b5d002dc4c2a3d00be8b2c57.png'" mode=""></image>
+						<image v-else style="position: absolute; width: 16.5%; height: 100%; right: 0;" :src="event_rul + '/static/img/static/icon/c4c6ce333b8b8943564cfa36d830cfda.png'" mode=""></image>
+						
+					<view  class="coupon" style="flex: 1;">
+						<view class="pt_left">
+							<view class="pt_left-content">
+								<view class="f1" :style="{color:t('color1')}" v-if="item.type==1"><text class="t0">￥</text><text class="t1">{{item.money}}</text></view>
+								<view class="f1" :style="{color:t('color1')}" v-if="item.type==2">礼品券</view>
+								<view class="f1" :style="{color:t('color1')}" v-if="item.type==3"><text class="t1">{{item.limit_count}}</text><text class="t2">次</text></view>
+								<view class="f1" :style="{color:t('color1')}" v-if="item.type==4">抵运费</view>
+								<view class="f1" :style="{color:t('color1')}" v-if="item.type==5"><text class="t0">￥</text><text class="t1">{{item.money}}</text></view>
+								<view class="f2" :style="{color:t('color1')}" v-if="item.type==1 || item.type==4 || item.type==5">
+									<text v-if="item.minprice>0">满{{item.minprice}}元可用</text>
+									<text v-else>无门槛</text>
+								</view>
+							</view>
+						</view>
+						<view class="pt_right">
+							<view class="f1">
+								<view class="t1">{{item.name}}</view>
+								<text class="t2" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="item.type==1">代金券</text>
+								<text class="t2" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="item.type==2">礼品券</text>
+								<text class="t2" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="item.type==3">计次券</text>
+								<text class="t2" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="item.type==4">运费抵扣券</text>
+								<text class="t2" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="item.type==5">餐饮券</text>
+								<view class="t4" v-if="item.bid>0">适用商家：{{item.bname}}</view>
+								<view class="t3" :style="item.bid>0?'margin-top:0':'margin-top:10rpx'">有效期至 {{item.yxqdate}}</view>
+							</view>
+							<!-- <button class="btn" v-if="item.haveget>=item.perlimit" style="background:#9d9d9d">已领取</button> -->
+							<!-- <button class="btn" v-else-if="item.stock<=0" style="background:#9d9d9d">已抢光了</button> -->
+							<!-- <button class="btn" :style="{background:'linear-gradient(270deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" v-else @tap.stop="getcoupon" :data-id="item.id" :data-price="item.price" :data-score="item.score" :data-key="index">{{item.price > 0 ? '购买' : (item.score>0?'兑换':'领取')}}</button> -->
+						</view>
+										
+					</view>
+					<view class="max_right" style="z-index: 1;">
+						<view  v-if="item.haveget>=item.perlimit" class="box">
+							已领取过
+						</view>
+						<view   v-else-if="item.stock<=0" class="box">
+							已抢光了
+						</view>
+						<view v-else  class="box" @click.stop="drawCoupon(item.id)">
+							立即领取
+						</view>
+					</view>
+				
+					</view>
+				</view>
+				<nodata v-if="nodata" :text="'暂无可领' + t('优惠券')"></nodata>
+				<nomore v-if="nomore"></nomore>
+		
+	</view>
+		
+		
+		
+	</view>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		info:{},
+		tabIndex:0,
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: false,
+		order: '',
+		field:'',
+		oldcid: "",
+		catchecid: "",
+		catchegid: "",
+		cid: "",
+		gid: '',
+		cid2:'',
+		oldcid2: "",
+		catchecid2: "",
+		clist: [],
+		clist2: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		bid:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.cid2 = this.opt.cid2 || '';
+		this.oldcid2 = this.opt.cid2 || '';
+		this.catchecid2 = this.opt.cid2;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		this.bid = this.opt.bid ? this.opt.bid : 0;
+		//console.log(this.bid);
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用商品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list');
+		this.getdata();
+		this.getInfo();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+	 if(this.tabIndex == 0){
+		 this.getprolist();
+	 }else{
+		  this.getCoupon();
+	 }
+    }
+  },
+  methods: {
+	  //  点击领取优惠券
+	  drawCoupon(id) {
+		 app.post('ApiCoupon/getcoupon', {id:id}, res => {
+			 app.error(res.msg)
+		 }) 
+		
+	  },
+	  goDetail(){
+		  uni.navigateTo({
+		  	url:'/pages/store/detail?id='+this.opt.id
+		  })
+	  },
+	  followFn(){
+		  var that = this;
+		 app.post('ApiMy/addFollow', {follow_id: that.opt.id ||'',type:'store'}, function (res) {
+		 	  
+		     console.log(res)	
+			 uni.showToast({
+			 	title:res.msg,
+				icon:'none'
+			 })
+			 that.getInfo()
+		 				 // that.info = res.business
+		 	  
+		 }) 
+	  },
+	    getInfo(){
+			var that = this;
+	  		 app.get('ApiBusiness/newIndex', {id: that.opt.id ||''}, function (res) {
+	  
+	             console.log(res)	
+				 that.info = res.business
+	  
+	  		 })
+	  	  },
+	     getCoupon: function () {
+	        var that = this;
+	        var pagenum = that.pagenum;
+	        var st = that.st;
+	        var bid = that.opt && (that.opt.bid || that.opt.bid === '0') ? that.opt.bid : '';
+	  			that.loading = true;
+	  			that.nomore = false;
+	  			that.nodata = false;
+	        app.post('ApiCoupon/couponlist', {st: st,pagenum: pagenum,bid: that.opt.id}, function (res) {
+	  				that.loading = false;
+	          var data = res.data;
+	          if (pagenum == 1) {
+	            that.datalist = data;
+	            if (data.length == 0) {
+	              that.nodata = true;
+	            }
+	          }else{
+	            if (data.length == 0) {
+	              that.nomore = true;
+	            } else {
+	              var datalist = that.datalist;
+	              var newdata = datalist.concat(data);
+	              that.datalist = newdata;
+	            }
+	          }
+	  				that.loaded();
+	        });
+	      },
+	      getcoupon: function (e) {
+	  			var that = this;
+	  			var datalist = that.datalist;
+	  			var id = e.currentTarget.dataset.id;
+	  			var score = parseInt(e.currentTarget.dataset.score);
+	  			var price = e.currentTarget.dataset.price;
+	  
+	  			if (price > 0) {
+	  				app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+	  					if(res.status == 0) {
+	  							app.error(res.msg);
+	  					} else {
+	  						app.goto('/pages/pay/pay?id=' + res.payorderid);
+	  					}
+	  				})
+	  				return;
+	  			}
+	  			var key = e.currentTarget.dataset.key;
+	  			if (score > 0) {
+	  				app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+	  					app.showLoading('兑换中');
+	  					app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+	  						app.showLoading(false);
+	  						if (data.status == 0) {
+	  							app.error(data.msg);
+	  						} else {
+	  							app.success(data.msg);
+	  							datalist[key]['haveget'] = data.haveget;
+	  							that.datalist = datalist;
+	  						}
+	  					});
+	  				});
+	  			} else {
+	  				app.showLoading('领取中');
+	  				app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+	  					app.showLoading(false);
+	  					if (data.status == 0) {
+	  						app.error(data.msg);
+	  					} else {
+	  						app.success(data.msg);
+	  						datalist[key]['haveget'] = data.haveget;
+	  						that.datalist = datalist;
+	  					}
+	  				});
+	  			}
+	  		},
+	  tabClick(e){
+		  this.pagenum = 1;
+		      this.datalist = [];
+		 this.tabIndex = e;
+		 if(e == 0){
+			 this.getdata();
+		 }else{
+			 this.getCoupon()
+		 }
+		 
+	  },
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			var bid = that.opt.id ? that.opt.id : '';
+			var cid2 = that.cid2;
+			that.loading = true;
+			app.get('ApiShop/prolist', {cid: cid,gid: gid,bid:bid,cid2:cid2}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.clist2 = res.clist2;
+			  that.glist = res.glist;
+				that.loaded();
+				that.getprolist();
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+			var cid2 = that.cid2;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			var bid = that.opt.id ? that.opt.id : '';
+      app.post('ApiShop/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cid2:cid2,cpid:cpid,bid:bid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+    cate2Click: function (e) {
+      var that = this;
+      var cid2 = e.currentTarget.dataset.cid2;
+			if(cid2 === true) cid2 = '';
+      that.catchecid2 = cid2
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.cid2 = this.catchecid2;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchecid2 = this.oldcid2;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+	.max_right{
+		z-index: 1;
+		    /* width: 100%; */
+		    display: flex;
+		    justify-content: center;
+			margin-right: 14rpx;
+		    align-items: center;
+			.box{
+				font-size: 32prx;
+				    color: #fff;
+				    /* padding-right: 9rpx; */
+				    /* height: 100%; */
+				    /* margin-left: -20rpx; */
+				    width: 70rpx;
+			}
+	}
+	.serach_tab{
+		
+		background-color: #fff;
+		// display: flex;
+		// align-items: center;
+		padding:0 20rpx;
+		padding-top: 30rpx;
+		.serach_box{
+			display: flex;
+			align-items: center;
+              .iconfont{
+				  margin: 0 20rpx;
+			  }
+			height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1;
+			input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+			
+		}
+	}
+	.head_box{
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		padding: 30rpx 20rpx 30rpx 0rpx;
+		// justify-content: space-between;
+		.item{
+			margin-right: 20rpx;
+		}
+		.itemz{
+			font-size: 30rpx;
+			color: #efbd6f;
+			font-weight: bold;
+		}
+	}
+	.head_max_box{
+		background-color: #FFFFFF;
+		display: flex;
+		.item{
+			
+			flex: 1;
+			height: 60rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 10rpx;
+		}
+		
+	}
+	.info_box{
+		display: flex;
+		align-items: center;
+		padding: 30rpx 20rpx;
+		justify-content: space-between;
+		.left{
+			display: flex;
+			flex: 1;
+			.l_left{
+				margin-right: 14rpx;
+				image{
+					width:120rpx;
+					height: 120rpx;
+					border-radius: 10rpx;
+					border-radius: 10rpx;
+				}
+			}
+			.l_right{
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.l_r_top{
+					font-size: 32rpx;
+					font-weight: bold;
+				}
+				.l_r_bot{
+					
+					display: flex;
+					align-items:center;
+				   font-size: 24rpx;
+				   color: #999;
+				   .iconfont{
+					   margin-left: 14rpx;
+				   }
+				}
+			}
+		}
+		.right{
+			width: 120rpx;
+			text-align: center;
+			font-size: 24rpx;
+			padding: 10rpx 20rpx;
+			// border: ;
+			border-radius: 10rpx;
+			color: #999;
+			
+		}
+	}
+	
+	.coupon-list{width:100%;padding:20rpx}
+	.coupon{flex: 1; z-index: 1; display:flex;border-radius:10rpx;overflow:hidden}
+	.coupon .pt_left{min-height:200rpx;color: #FFF;width:30%;display:flex;flex-direction:column;align-items:center;justify-content:center}
+	.coupon .pt_left-content{width:100%;height:100%;margin:30rpx 0;border-right:1px solid #EEEEEE;display:flex;flex-direction:column;align-items:center;justify-content:center}
+	.coupon .pt_left .f1{font-size:40rpx;font-weight:bold;text-align:center;}
+	.coupon .pt_left .t0{padding-right:0;}
+	.coupon .pt_left .t1{font-size:60rpx;}
+	.coupon .pt_left .t2{padding-left:10rpx;}
+	.coupon .pt_left .f2{font-size:20rpx;color:#4E535B;text-align:center;}
+	.coupon .pt_right{width:70%;display:flex;min-height:200rpx;text-align: left;padding:20rpx 20rpx;position:relative}
+	.coupon .pt_right .f1{flex-grow: 1;flex-shrink: 1;}
+	.coupon .pt_right .f1 .t1{font-size:28rpx;color:#2B2B2B;font-weight:bold;height:60rpx;line-height:60rpx;overflow:hidden}
+	.coupon .pt_right .f1 .t2{height:36rpx;line-height:36rpx;font-size:20rpx;font-weight:bold;padding:0 16rpx;border-radius:4rpx}
+	.coupon .pt_right .f1 .t3{font-size:20rpx;color:#999999;height:46rpx;line-height:46rpx;}
+	.coupon .pt_right .f1 .t4{font-size:20rpx;color:#999999;height:46rpx;line-height:46rpx;}
+	.coupon .pt_right .btn{position:absolute;right:30rpx;top:50%;margin-top:-28rpx;border-radius:28rpx;width:160rpx;height:56rpx;line-height:56rpx;color:#fff}
+	.coupon .pt_right .sygq{position:absolute;right:30rpx;top:50%;margin-top:-50rpx;width:100rpx;height:100rpx;}
+
+	
+.search-container {position: fixed;width: 100%;background: #fff;z-index:9;top:var(--window-top)}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+.topsearch .search-btn{display:flex;align-items:center;color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.search-navbar {display: flex;text-align: center;align-items:center;padding:5rpx 0}
+.search-navbar-item {flex: 1;height: 70rpx;line-height: 70rpx;position: relative;font-size:28rpx;font-weight:bold;color:#323232}
+
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 30rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%;font-size:26rpx;padding:0 24rpx}
+
+</style>
\ No newline at end of file
diff --git a/pages/business/main.vue b/pages/business/main.vue
new file mode 100644
index 0000000..7d0ca11
--- /dev/null
+++ b/pages/business/main.vue
@@ -0,0 +1,103 @@
+<template>
+<view class="container" :style="{backgroundColor:pageinfo.bgcolor}">
+	<dp :pagecontent="pagecontent" :menuindex="menuindex"></dp>
+	<view class="ggdialog" v-if="guanggaopic && hideguanggao==0">
+		<view class="main">
+			<view class="close" @tap="closegg"><image :src="event_rul +'/static/img/static/img/close.png'"></image></view>
+			<image :src="guanggaopic" class="guanggaopic" @tap="goto" :data-url="guanggaourl" mode="widthFix"></image>
+		</view>
+	</view>
+	<view style="position:fixed;top:15vh;left:20rpx;z-index:991;background:rgba(0,0,0,0.6);border-radius:20rpx;color:#fff;padding:0 10rpx" v-if="oglist">
+		<swiper style="position:relative;height:54rpx;width:450rpx;" autoplay="true" :interval="5000" vertical="true">
+			<swiper-item v-for="(item, index) in oglist" :key="index" @tap="goto" :data-url="'/pages/shop/product?id=' + item.proid" class="flex-y-center">
+				<image :src="item.headimg" style="width:40rpx;height:40rpx;border:1px solid rgba(255,255,255,0.7);border-radius:50%;margin-right:4px"></image>
+				<div style="width:400rpx;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;font-size:22rpx">{{item.nickname}} {{item.showtime}}购买了 {{item.name}}</div>
+			</swiper-item>
+		</swiper>
+	</view>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+	data() {
+	return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		id: 0,
+		pageinfo: [],
+		pagecontent: [],
+		hideguanggao: 0,
+		title: "",
+		oglist: "", 
+		guanggaopic: "",
+		guanggaourl: "",
+
+		event_rul: app.globalData.event_url,
+		}
+	},
+	onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+	},
+	onPullDownRefresh:function(e){
+		this.getdata();
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			var opt = this.opt
+			var id = 0;
+			if (opt && opt.id) {
+			  id = opt.id;
+			}
+			that.loading = true;
+			app.get('ApiBusiness/main', {id: id}, function (data) {
+				that.loading = false;
+			  if (data.status == 2) {
+			    //付费查看
+			    app.goto('/pages/pay/pay?fromPage=index&id=' + data.payorderid + '&pageid=' + that.id, 'redirect');
+			    return;
+			  }
+			  if (data.status == 1) {
+			    var pagecontent = data.pagecontent;
+					that.title = data.pageinfo.title;
+					that.oglist = data.oglist;
+					that.guanggaopic = data.guanggaopic;
+					that.guanggaourl = data.guanggaourl;
+					that.pageinfo = data.pageinfo;
+					that.pagecontent = data.pagecontent;
+			    uni.setNavigationBarTitle({
+			      title: data.pageinfo.title
+			    });
+					that.loaded();
+			  } else {
+			    if (data.msg) {
+			      app.alert(data.msg, function () {
+			        if (data.url) app.goto(data.url);
+			      });
+			    } else if (data.url) {
+			      app.goto(data.url);
+			    } else {
+			      app.alert('您无查看权限');
+			    }
+			  }
+			});
+		},
+		closegg: function () {
+			this.hideguanggao = 1;
+		},
+	}
+}
+</script>
+<style>
+.ggdialog{ position:fixed;z-index:99991;width:100%;max-width:640px;height:100%;background:rgba(0,0,0,0.6);display:flex;justify-content:center;align-items:center;top:0;}
+.ggdialog .main{ width:80%;height:70%;position:relative;display:flex;justify-content:center;align-items:center}
+.ggdialog .close{ position:absolute;padding:20rpx;top:-80rpx;right:-40rpx}
+.ggdialog .close image{ width:40rpx;height:40rpx;}
+.ggdialog .guanggaopic{max-width:100%;height:auto;max-height:100%}
+</style>
\ No newline at end of file
diff --git a/pages/coupon/coupondetail.vue b/pages/coupon/coupondetail.vue
new file mode 100644
index 0000000..d28697b
--- /dev/null
+++ b/pages/coupon/coupondetail.vue
@@ -0,0 +1,451 @@
+<template>
+<view class="container flex flex-col">
+	<block v-if="isload">
+		<view class="discount-detail flex1 flex-col">
+			<block v-if="record.id">
+				<view class="discount-detail__hd flex">
+					<view class="discount-detail__hd-left" :style="{color:t('color1')}" v-if="record.type==1">{{record.type==1?'券':(record.type==2?'礼':(record.type==3?'次':(record.type==4?'抵':(record.type==5?'餐':''))))}}</view>
+					<view class="discount-detail__hd-right">
+						<view class="discount-detail__hd-title">{{record.couponname}}</view>
+						<view class="discount-detail__hd-tips">到店使用时请出示核销码进行核销</view>
+					</view>
+				</view>
+				<view class="discount-detail__bd flex1">
+					<view class="discount-detail__bd-code" v-if="record.status==0 && record.hexiaoqr">
+						<image class="code-img" :src="record.hexiaoqr" @tap="previewImage" :data-url="record.hexiaoqr"></image>
+					</view>
+					<view class="discount-detail__bd-item flex" v-if="record.type==1">
+						<text class="item-hd">面额</text>
+						<text class="item-bd">{{record.money}}元</text>
+					</view>
+					<view class="discount-detail__bd-item flex" v-if="coupon.bid!=0">
+						<text class="item-hd">适用商家</text>
+						<text class="item-bd">{{coupon.bname}}</text>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">类型</text>
+						<text class="item-bd">{{record.type==1?'代金券':(record.type==2?'礼品券':(record.type==3?'计次券':(record.type==4?'运费抵扣券':(record.type==5?'餐饮券':''))))}}{{coupon.isgive == 1?'（可赠送）':''}}</text>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">使用条件</text>
+							<text class="item-bd">{{record.minprice > 0?'满'+record.minprice+'元可用':'无门槛'}}</text>
+					</view>
+					<block v-if="record.type==3">
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">共计次数</text>
+						<text class="item-bd">{{record.limit_count}}</text>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">已使用次数</text>
+						<text class="item-bd">{{record.used_count}}</text>
+					</view>
+					<block v-if="record.limit_perday>0">
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">每天限制次数</text>
+						<text class="item-bd">{{record.limit_perday}}</text>
+					</view>
+					</block>
+					</block>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">领取时间</text>
+						<text class="item-bd">{{record.createtime}}</text>
+					</view>
+					<block v-if="record.status==1">
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">使用时间</text>
+						<text class="item-bd">{{record.usetime}}</text>
+					</view>
+					</block>
+					
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">有效期</text>
+						<view class="item-bd">
+							<view>{{record.starttime}} 至</view>
+							<view>{{record.endtime}}</view>
+						</view>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">使用说明</text>
+						<view class="item-bd">{{coupon.usetips || "无"}}</view>
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<view class="discount-detail__hd flex al-item-center">
+					<view class="discount-detail__hd-left" :style="{color:t('color1')}" v-if="coupon.type==1">{{coupon.type==1?'券':(coupon.type==2?'礼':(coupon.type==3?'次':(coupon.type==4?'抵':(coupon.type==5?'餐':''))))}}</view>
+					<view class="discount-detail__hd-right">
+						<view class="discount-detail__hd-title">{{coupon.name}}</view>
+					</view>
+				</view>
+				<view class="discount-detail__bd flex1">
+					<view class="discount-detail__bd-item flex" v-if="coupon.type==1">
+						<text class="item-hd">面额</text>
+						<text class="item-bd">{{coupon.money}}元</text>
+					</view>
+					<view class="discount-detail__bd-item flex" v-if="coupon.bid!=0">
+						<text class="item-hd">适用商家</text>
+						<text class="item-bd">{{coupon.bname}}</text>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">类型</text>
+						<text class="item-bd">{{coupon.type==1?'代金券':(coupon.type==2?'礼品券':(coupon.type==3?'计次券':(coupon.type==4?'运费抵扣券':(coupon.type==5?'餐饮券':''))))}}{{coupon.isgive == 1?'（可赠送）':''}}</text>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">使用条件</text>
+							<text class="item-bd">{{coupon.minprice > 0 ? '满'+coupon.minprice+'元可用' : '无门槛'}}</text>
+					</view>
+					<block v-if="coupon.type==3">
+						<view class="discount-detail__bd-item flex">
+							<text class="item-hd">共计次数</text>
+							<text class="item-bd">{{coupon.limit_count}}次</text>
+						</view>
+						<block v-if="coupon.limit_perday>0">
+							<view class="discount-detail__bd-item flex">
+								<text class="item-hd">每天限制使用</text>
+								<text class="item-bd">{{coupon.limit_perday}}次</text>
+							</view>
+						</block>
+					</block>
+					<block v-if="coupon.price>0">
+						<view class="discount-detail__bd-item flex">
+							<text class="item-hd">所需金额</text>
+							<text class="item-bd">￥{{coupon.price}}</text>
+						</view>
+					</block>
+					<block v-if="coupon.score>0">
+						<view class="discount-detail__bd-item flex">
+							<text class="item-hd">所需{{t('积分')}}</text>
+							<text class="item-bd">{{coupon.score}}{{t('积分')}}</text>
+						</view>
+					</block>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">活动时间</text>
+						<view class="item-bd">
+							<view>{{coupon.starttime}} 至</view>
+							<view>{{coupon.endtime}}</view>
+						</view>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">有效日期</text>
+						<block v-if="coupon.yxqtype==1">
+						<view class="item-bd">
+							<view>{{coupon.yxqtime.substring(0,coupon.yxqtime.indexOf('~'))}} 至</view>
+							<view>{{coupon.yxqtime.substring(coupon.yxqtime.indexOf('~')+1,coupon.yxqtime.length)}}</view>
+						</view>
+						</block>
+						<block v-else-if="coupon.yxqtype==2">
+						<text class="item-bd">领取后{{coupon.yxqdate}}天内有效</text>
+						</block>
+						<block v-else-if="coupon.yxqtype==3">
+						<text class="item-bd">领取后{{coupon.yxqdate}}天内有效（次日0点生效）</text>
+						</block>
+					</view>
+					<view class="discount-detail__bd-item flex">
+						<text class="item-hd">使用说明</text>
+						<view class="item-bd">{{coupon.usetips || '无'}}</view>
+					</view>
+				</view>
+			</block>
+			<view v-if="!record.id"  class="discount-detail__ft" @tap="getcoupon" :data-id="coupon.id" :data-price="coupon.price" :data-score="coupon.score" :data-canget="coupon.canget">{{coupon.price>0?'立即购买':(coupon.score>0?'立即兑换':(coupon.canget?'立即领取':'立即使用'))}}</view>
+			<block v-if="mid == record.mid">
+				<view v-if="record.id && coupon.type==1 && record.status==0 && coupon.bid==0" class="discount-detail__ft" @tap="goto" :data-url="'/pages/maidan/pay?cprid=' + record.id">立即使用</view>
+				<block v-if="record.id && record.status==0 && coupon.isgive == 1">
+					<view class="discount-detail__ft" @tap="shareapp" v-if="getplatform() == 'app'" :data-id="record.id">转赠好友</view>
+					<view class="discount-detail__ft" @tap="sharemp" v-else-if="getplatform() == 'mp'" :data-id="record.id">转赠好友</view>
+					<view class="discount-detail__ft" @tap="sharemp" v-else-if="getplatform() == 'h5'" :data-id="record.id">转赠好友</view>
+					<button class="discount-detail__ft" open-type="share" v-else :data-id="record.id">转赠好友</button>
+				</block>
+			</block>
+			<block v-else>
+				<view v-if="coupon.isgive == 1 && opt.pid == record.mid && opt.pid > 0" class="discount-detail__ft" @tap="receiveCoupon" :style="{background:'linear-gradient(to bottom,'+t('color2')+' 0%,rgba('+t('color2rgb')+',0.8) 100%)'}" :data-id="record.id">立即领取</view>
+			</block>
+		</view>
+		
+		<view class='return-tips' @tap="goto" data-url='/pages/index/index'><text>返回首页</text></view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			pre_url:app.globalData.pre_url,
+
+			textset:{},
+			record:{},
+			coupon:{},
+			shareTitle:'',
+			sharePic:'',
+			shareDesc:'',
+			shareLink:'',
+			mid:0
+		}
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.shareTitle,pic:this.sharePic,desc:this.shareDesc,link:this.shareLink});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.shareTitle,pic:this.sharePic,desc:this.shareDesc,link:this.shareLink});
+		var query = (sharewxdata.path).split('?')[1];
+		console.log(sharewxdata)
+		console.log(query)
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiCoupon/coupondetail', {rid: that.opt.rid,id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.textset = app.globalData.textset;
+				uni.setNavigationBarTitle({
+					title: that.t('优惠券') + '详情'
+				});
+				if(!res.coupon.id) {
+					app.alert(that.t('优惠券')+'不存在');return;
+				}
+				that.mid = app.globalData.mid;
+				that.record = res.record;
+				that.coupon = res.coupon;
+				that.shareTitle = '送你一张优惠券，点击领取';
+				that.shareDesc = that.coupon.name;
+				that.sharePic = app.globalData.initdata.logo;
+				that.shareLink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/pages/coupon/coupondetail?scene=id_'+that.coupon.id+'-pid_' + app.globalData.mid+'-rid_' + that.record.id;
+				that.loaded({title:that.shareTitle,pic:that.sharePic,desc:that.shareDesc,link:that.shareLink});
+			});
+		},
+    getcoupon: function (e) {
+			var that = this;
+			var datalist = that.datalist;
+			var id = e.currentTarget.dataset.id;
+			var score = parseInt(e.currentTarget.dataset.score);
+			var price = e.currentTarget.dataset.price;
+			var canget = e.currentTarget.dataset.canget;
+
+			if (price > 0) {
+				app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+					if(res.status == 0) {
+							app.error(res.msg);
+					} else {
+						app.goto('/pages/pay/pay?id=' + res.payorderid);
+					}
+				})
+				return;
+			}
+			var key = e.currentTarget.dataset.key;
+			if (score > 0) {
+				app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+					app.showLoading('兑换中');
+					app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+						app.showLoading(false);
+						if (data.status == 0) {
+							app.error(data.msg);
+						} else {
+							app.success(data.msg);
+							datalist[key]['haveget'] = data.haveget;
+							that.datalist = datalist;
+						}
+					});
+				});
+			} else if(!canget) {
+				uni.navigateTo({
+					url:'/pages/shop/prolist?cpid='+ id
+				})
+			} else {
+				app.showLoading('领取中');
+				app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+					app.showLoading(false);
+					if (data.status == 0) {
+						app.error(data.msg);
+					} else {
+						app.success(data.msg);
+						setTimeout(function(){
+							app.goto('mycoupon');
+						},1000)
+					}
+				});
+			}
+    },
+		
+		receiveCoupon:function(){
+			var that = this;
+			var datalist = that.datalist;
+			var rid = that.record.id;
+			var id = that.coupon.id;
+			app.showLoading('领取中');
+			app.post('ApiCoupon/receiveCoupon', {id: id,rid:rid}, function (data) {
+				app.showLoading(false);
+				if (data.status == 0) {
+					app.error(data.msg);
+				} else {
+					app.success(data.msg);
+					that.getdata();
+				}
+			});
+		},
+		
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			that.sharetypevisible = false;
+			uni.showActionSheet({
+		    itemList: ['发送给微信好友', '分享到微信朋友圈'],
+		    success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = '送你一张优惠券，点击领取';
+						sharedata.summary = that.shareDesc;
+						sharedata.href = that.shareLink;
+						sharedata.imageUrl = that.sharePic;
+						
+						uni.share(sharedata);
+					}
+		    }
+		  });
+		},
+  }
+};
+</script>
+<style lang="scss">
+.container {
+	padding: 20rpx 40rpx;
+	min-height: 100vh;
+	box-sizing: border-box;
+	background: linear-gradient(180deg,#058552 0%,#096742 100%);
+	padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+}
+.discount-detail {
+	border-radius:50rpx;
+	background: #FFF;
+	padding: 44rpx 40rpx;
+	&__hd {
+		padding-bottom: 40rpx;
+		position: relative;
+		&::before,&::after {
+			content: "";
+			position: absolute;
+			width: 30rpx;
+			height: 30rpx;
+			bottom: -15rpx;
+			border-radius: 50%;
+			background: #068150;
+		}
+		&::before {
+			left: -55rpx;
+		}
+		&::after {
+			right: -55rpx;
+		}
+		&-left {
+			width: 96rpx;
+			height: 96rpx;
+			border-radius: 50%;
+			background: linear-gradient(to right,#EAFBF4 0%,#CAF6E5 100%);
+			font-size: 48rpx;
+			font-weight: bold;
+			line-height: 96rpx;
+			text-align: center;
+			margin-right: 16rpx;
+			flex-shrink: 0;
+		}
+		&-right {
+			flex: 1;
+		}
+		&-title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333333;
+			line-height: 44rpx;
+		}
+		&-tips {
+			margin-top: 10rpx;
+			font-size: 22rpx;
+			color: #999999;
+			line-height: 32rpx;
+		}
+	}
+	&__bd {
+		padding-top: 40rpx;
+		position: relative;
+		margin-bottom: 60rpx;
+		&::before {
+			content: "";
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 2rpx;
+            background-image: linear-gradient(to right, #EEEEEE 0%, #EEEEEE 50%, transparent 50%);
+            background-size: 20rpx 4rpx;
+            background-repeat: repeat-x;
+		}
+		&-code {
+			width: 530rpx;
+			height: 520rpx;
+			margin: 0 auto 16rpx;
+			.code-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		&-item {
+			margin-top: 28rpx;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			.item-hd {
+				color: #999999;
+				width: 140rpx;
+				flex-shrink: 0;
+				margin-right: 20rpx;
+			}
+			.item-bd {
+				color: #333333;
+				font-weight: bold;
+			}
+		}
+	}
+	&__ft {
+		height: 80rpx;
+		line-height :80rpx;
+		text-align: center;
+		color: #FFFFFF;
+		font-size: 32rpx;
+		font-weight: bold;
+		border-radius: 40rpx;
+		background: linear-gradient(to right,#00AE68 0%,#096742 100%);
+	}
+}
+.return-tips {margin-top: 60rpx;text-align: center;font-size: 28rpx;color: rgba(255,255,255,0.4);line-height: 40rpx;}
+</style>
\ No newline at end of file
diff --git a/pages/coupon/couponlist.vue b/pages/coupon/couponlist.vue
new file mode 100644
index 0000000..1501499
--- /dev/null
+++ b/pages/coupon/couponlist.vue
@@ -0,0 +1,272 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="coupon-list">
+			<view class="coupon-item flex al-item-center" :style="item.stock<=0?'color: #AAAAAA':'color:#0a5d3b'" v-for="(item, index) in datalist" :key="item.id" @tap.stop="goto" :data-url="'coupondetail?id=' + item.id">
+				<image class="coupon-item__bg" :src="item.stock<=0 ? event_rul + '/static/img/static/icon/couponed-bg.svg': (event_rul + '/static/img/static/icon/coupon-bg.svg')" mode=""></image>
+				<view class="coupon-item__hd flex al-item-center j-center">
+					<view class="coupon-item__hd-price" v-if="item.type==1"><text class="symbol">￥</text><text class="txt">{{item.money}}</text></view>
+					<view class="coupon-item__hd-txt" v-if="item.type==2">礼品券</view>
+					<view class="coupon-item__hd-price" v-if="item.type==3"><text class="txt">{{item.limit_count}}</text><text class="unit">次</text></view>
+					<view class="coupon-item__hd-txt" v-if="item.type==4">抵运费</view>
+					<view class="coupon-item__hd-price" v-if="item.type==5"><text class="symbol">￥</text><text class="txt">{{item.money}}</text></view>
+					<view class="coupon-item__hd-tips" v-if="item.type==1 || item.type==4 || item.type==5">
+						<text v-if="item.minprice>0">满{{item.minprice}}元可用</text>
+						<text v-else>无门槛</text>
+					</view>
+				</view>
+				<view class="coupon-item__bd flex j-between">
+					<view class="coupon-item__bd-title flex al-item-center" :style="item.stock<=0?'color: #AAAAAA':'color:#333333'">
+						<view class="coupon-item__bd-tag" :style="item.stock<=0?'color: #AAAAAA;border-color: #AAAAAA':'color:' + t('color1')">{{item.type==1?'代金券':(item.type==2?'礼品券':(item.type==3?'计次券':(item.type==4?'运费抵扣券':(item.type==5?'餐饮券':''))))}}</view>
+						{{item.name}}
+					</view>							
+					<view class="coupon-item__bd-txt" :style="item.stock<=0?'color: #AAAAAA':'color:#999999'" v-if="item.bid>0">适用商家：{{item.bname}}</view>
+					<view class="coupon-item__bd-time">有效期至 {{item.yxqdate}}</view>
+				</view>
+				<view class="coupon-item__ft" v-if="item.haveget>=item.perlimit" @tap.stop="goto" :data-url="'/pages/shop/prolist?cpid=' + item.id" >
+					<view class="coupon-item__ft-txt">立即使用</view>
+				</view>
+				<view class="coupon-item__ft" v-else-if="item.stock<=0">
+					<view class="coupon-item__ft-txt">已抢光了</view>
+				</view>
+				<view class="coupon-item__ft" v-else @tap.stop="getcoupon" :data-id="item.id" :data-price="item.price" :data-score="item.score" :data-key="index">
+					<view  class="coupon-item__ft-txt">{{item.price > 0 ? '立即购买' : (item.score>0?'立即兑换':'立即领取')}}</view>
+				</view>
+			</view>
+		</view>
+		<nodata v-if="nodata" :text="'暂无可领' + t('优惠券')"></nodata>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		nomore:false,
+		nodata:false,
+		datalist: [],
+		pagenum: 1,
+		title: '文章列表',
+		needAuth: 0,
+		authCanClose: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+    this.pagenum = 1;
+    this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+    getdata: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var bid = that.opt && (that.opt.bid || that.opt.bid === '0') ? that.opt.bid : '';
+			that.loading = true;
+			that.nomore = false;
+			that.nodata = false;
+      app.post('ApiCoupon/couponlist', {st: st,pagenum: pagenum,bid: bid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+			that.datalist = data;
+			console.log("打印优惠券列表datalist",that.datalist)
+          if (data.length == 0) {
+			  that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+				that.loaded();
+      });
+    },
+    getcoupon: function (e) {
+			var that = this;
+			var datalist = that.datalist;
+			var id = e.currentTarget.dataset.id;
+			var score = parseInt(e.currentTarget.dataset.score);
+			var price = e.currentTarget.dataset.price;
+
+			if (price > 0) {
+				app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+					if(res.status == 0) {
+							app.error(res.msg);
+					} else {
+						app.goto('/pages/pay/pay?id=' + res.payorderid);
+					}
+				})
+				return;
+			}
+			var key = e.currentTarget.dataset.key;
+			if (score > 0) {
+				app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+					app.showLoading('兑换中');
+					app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+						app.showLoading(false);
+						if (data.status == 0) {
+							app.error(data.msg);
+						} else {
+							app.success(data.msg);
+							datalist[key]['haveget'] = data.haveget;
+							that.datalist = datalist;
+						}
+					});
+				});
+			} else {
+				app.showLoading('领取中');
+				app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+					app.showLoading(false);
+					if (data.status == 0) {
+						app.error(data.msg);
+					} else {
+						app.success(data.msg);
+						datalist[key]['haveget'] = data.haveget;
+						that.datalist = datalist;
+					}
+				});
+			}
+		}
+  }
+};
+</script>
+
+<style lang="scss">
+.container {
+  background: #f5f5f5;
+  min-height: 100vh;
+}
+.coupon-list {
+  width: 100%;
+  padding: 6rpx;
+}
+.coupon-item {
+  display: flex;
+  position: relative;
+  z-index: 1;
+  height: 234rpx;
+  color: #0a5d3b;
+  &:not(:first-child) {
+    margin-top: -12rpx;
+  }
+  &__bg {
+    position: absolute;
+    z-index: -1;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  &__hd {
+    flex-shrink: 0;
+    flex-direction: column;
+    color: #ffffff;
+    width: 210rpx;
+    padding-left: 15rpx;
+    &-price {
+      font-size: 36rpx;
+      line-height: 50rpx;
+      font-weight: bold;
+      .txt {
+        font-size: 72rpx;
+        line-height: 100rpx;
+      }
+      .unit {
+        padding-left: 10rpx;
+      }
+    }
+    &-tips {
+      font-size: 24rpx;
+      line-height: 34rpx;
+    }
+    &-txt {
+      font-size: 46rpx;
+      font-weight: bold;
+      line-height: 58rpx;
+    }
+  }
+  &__bd {
+    flex: 1;
+    padding: 0 24rpx;
+    min-height: 125rpx;
+    flex-direction: column;
+    &-title {
+      font-size: 28rpx;
+      line-height: 40rpx;
+      color: #333333;
+    }
+    &-tag {
+      border-radius: 4rpx;
+      margin-right: 6rpx;
+      border: 1rpx solid #0a5d3b;
+      font-size: 22rpx;
+      font-weight: bold;
+      height: 32rpx;
+      line-height: 30rpx;
+      padding: 0 6rpx;
+    }
+    &-txt {
+      font-size: 22rpx;
+      color: #999999;
+      line-height: 32rpx;
+      margin-top: 16rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+    &-time {
+      margin-top: 10rpx;
+      font-size: 20rpx;
+      line-height: 28rpx;
+    }
+  }
+  &__ft {
+    padding: 0 50rpx 0 30rpx;
+    &-txt {
+      width: 20rpx;
+      font-size: 24rpx;
+      font-weight: bold;
+      line-height: 30rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/coupon/mycoupon.vue b/pages/coupon/mycoupon.vue
new file mode 100644
index 0000000..7a64951
--- /dev/null
+++ b/pages/coupon/mycoupon.vue
@@ -0,0 +1,245 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab style="position: fixed;left:0;right:0;z-index:11;top:-1rpx" :itemdata="['未使用','已使用','已过期']" :itemst="['0','1','2']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		<view class="coupon-list">
+			<view class="coupon-item flex al-item-center" :style="st ==2 || st == 1?'color: #AAAAAA':'color:#0a5d3b'" v-for="(item, index) in datalist" :key="index" @tap.stop="goto" :data-url="'coupondetail?rid=' + item.id">
+				<image class="coupon-item__bg" :src="event_rul + '/static/img/static/icon/coupon-bg.svg'"  mode=""></image>
+				<image v-if="st ==2 || st == 1" class="coupon-item__bg" :src="event_rul + '/static/img/static/icon/couponed-bg.svg'" mode=""></image>
+				<view class="coupon-item__hd flex al-item-center j-center">
+					<view class="coupon-item__hd-price" v-if="item.type==1"><text class="symbol">￥</text><text class="txt">{{item.money}}</text></view>
+					<view class="coupon-item__hd-txt" v-if="item.type==2">礼品券</view>
+					<view class="coupon-item__hd-price" v-if="item.type==3"><text class="txt">{{item.limit_count}}</text><text class="unit">次</text></view>
+					<view class="coupon-item__hd-txt" v-if="item.type==4">抵运费</view>
+					<view class="coupon-item__hd-price" v-if="item.type==5"><text class="symbol">￥</text><text class="txt">{{item.money}}</text></view>
+					<view class="coupon-item__hd-tips" v-if="item.type==1 || item.type==4 || item.type==5">
+						<text v-if="item.minprice>0">满{{item.minprice}}元可用</text>
+						<text v-else>无门槛</text>
+					</view>
+				</view>	
+				<view class="coupon-item__bd flex j-between">
+					<view class="coupon-item__bd-title flex al-item-center" :style="st ==2 || st == 1?'color: #AAAAAA':'color:#333333'">
+						<view class="coupon-item__bd-tag" :style="st ==2 || st == 1?'color: #AAAAAA;border-color: #AAAAAA':'color:' + t('color1')">{{item.type==1?'代金券':(item.type==2?'礼品券':(item.type==3?'计次券':(item.type==4?'运费抵扣券':(item.type==5?'餐饮券':''))))}}</view>
+						<view class="coupon-item__bd-tag" v-if="item.isgive == 1" :style="st ==2 || st == 1?'color: #AAAAAA;border-color: #AAAAAA':'color:' + t('color2')">可赠送</view>
+						{{item.couponname}}
+					</view>
+					<view class="coupon-item__bd-txt" :style="st ==2 || st == 1?'color: #AAAAAA':'color:#999999'" v-if="item.bid>0">适用商家：{{item.bname}}</view>
+					<view class="coupon-item__bd-time">有效期至 {{item.endtime}}</view>
+				</view>
+				<view class="coupon-item__ft" v-if="st==0 && item.type==1" @tap.stop="goto" :data-url="'/pages/shop/prolist?cpid=' + item.couponid">
+					<view class="coupon-item__ft-txt">立即使用</view>
+				</view>
+				<view class="coupon-item__ft" v-else-if="st==0" @tap.stop="goto" :data-url="'coupondetail?rid=' + item.id">
+					<view  class="coupon-item__ft-txt">立即使用</view>	
+				</view>
+				<view class="coupon-item__ft" v-if="st==1||st==2">
+					<view class="coupon-item__ft-txt">{{st==1?'已使用':(st==2?'已过期':'')}}</view>		
+				</view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		st: 0,
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+      var bid = that.opt && (that.opt.bid || that.opt.bid === '0') ? that.opt.bid : '';
+			that.loading = true;
+			that.nomore = false;
+			that.nodata = false;
+      app.post('ApiCoupon/mycoupon', {st: st,pagenum: pagenum,bid: bid}, function (res) {
+				that.loading = false;
+				uni.setNavigationBarTitle({
+					title: '我的' + that.t('优惠券')
+				});
+        var data = res.data;
+        if (pagenum == 1) {
+					that.pics = res.pics;
+					that.clist = res.clist;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    }
+  }
+};
+</script>
+<style lang="scss">
+.container {
+  background: #f5f5f5;
+  height: 100vh;
+  padding-top: 90rpx;
+  box-sizing: border-box;  
+	padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+}
+.coupon-list {
+  width: 100%;
+  padding: 6rpx;
+}
+.coupon-item {
+  display: flex;
+  position: relative;
+  z-index: 1;
+  height: 234rpx;
+  color: #0a5d3b;
+  &:not(:first-child) {
+    margin-top: -12rpx;
+  }
+  &__bg {
+    position: absolute;
+    z-index: -1;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  &__hd {
+    flex-shrink: 0;
+    flex-direction: column;
+    color: #ffffff;
+    width: 210rpx;
+	padding-left: 15rpx;
+    &-price {
+      font-size: 36rpx;
+      line-height: 50rpx;
+      font-weight: bold;
+      .txt {
+        font-size: 72rpx;
+        line-height: 100rpx;
+      }
+      .unit {
+        padding-left: 10rpx;
+      }
+    }
+    &-tips {
+      font-size: 24rpx;
+      line-height: 34rpx;
+    }
+	&-txt {
+		font-size: 46rpx;
+		font-weight: bold;
+		line-height: 58rpx;
+	}
+  }
+  &__bd {
+    flex: 1;
+    padding: 0 24rpx;
+    min-height: 125rpx;
+    flex-direction: column;
+    &-title {
+      font-size: 28rpx;
+      line-height: 40rpx;
+      color: #333333;
+    }
+    &-tag {
+      border-radius: 4rpx;
+      margin-right: 6rpx;
+      border: 1rpx solid #0a5d3b;
+      font-size: 22rpx;
+      font-weight: bold;
+      height: 32rpx;
+      line-height: 30rpx;
+      padding: 0 6rpx;
+    }
+    &-txt {
+      font-size: 22rpx;
+      color: #999999;
+      line-height: 32rpx;
+      margin-top: 16rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+    &-time {
+      margin-top: 10rpx;
+      font-size: 20rpx;
+      line-height: 28rpx;
+    }
+  }
+  &__ft {
+    padding: 0 50rpx 0 30rpx;
+    &-txt {
+      width: 20rpx;
+      font-size: 24rpx;
+      font-weight: bold;
+      line-height: 30rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/form/formdetail.vue b/pages/form/formdetail.vue
new file mode 100644
index 0000000..2e488ad
--- /dev/null
+++ b/pages/form/formdetail.vue
@@ -0,0 +1,132 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">标题</text>
+				<text class="t2">{{detail.title}}</text>
+			</view>
+			<view v-for="(item, index) in formcontent" :key="index" class="item">
+				<text class="t1">{{item.val1}}</text>
+				<text class="t2" v-if="item.key!='upload'">{{detail['form'+index]}}</text>
+				<view class="t2" v-else><image :src="detail['form'+index]" style="width:50px" mode="widthFix" @tap="previewImage" :data-url="detail['form'+index]"></image></view>
+			</view>
+			<view class="item">
+				<text class="t1">提交时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">审核状态</text>
+				<text class="t2" v-if="detail.status==0 && (!detail.payorderid||detail.paystatus==1)" style="color:#88e">待确认</text>
+				<text class="t2" v-if="detail.status==0 && detail.payorderid && detail.paystatus==0" style="color:red">待支付</text>
+				<text class="t2" v-if="detail.status==1" style="color:green">已确认</text>
+				<text class="t2" v-if="detail.status==2" style="color:red">已驳回</text>
+			</view>
+			<view class="item" v-if="detail.status==2">
+				<text class="t1">驳回原因</text>
+				<text class="t2" style="color:red">{{detail.reason}}</text>
+			</view>
+			<block v-if="detail.payorderid">
+			<view class="item">
+				<text class="t1">付款金额</text>
+				<text class="t2" style="font-size:32rpx;color:#e94745">￥{{detail.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款状态</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==0" style="color:green">已付款</text>
+				<text class="t2" v-if="detail.paystatus==1 && detail.isrefund==1" style="color:red">已退款</text>
+				<text class="t2" v-if="detail.paystatus==0" style="color:red">未付款</text>
+			</view>
+			<view class="item" v-if="detail.paystatus>0 && detail.paytime">
+				<text class="t1">付款时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			</block>
+		</view>
+
+		
+		<view style="width:100%;height:160rpx"></view>
+
+		<view class="bottom notabbarbot">
+			<view class="btn2" @tap="todel" :data-id="detail.id">删除</view>
+			<view class="btn2" @tap="goto" :data-url="detail.fromurl" v-if="detail.fromurl">再次提交</view>
+			<block v-if="detail.payorderid && detail.paystatus==0">
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			detail:{},
+			formcontent:[],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/formdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.form = res.form;
+				that.formcontent = res.formcontent;
+				that.detail = res.detail;
+				that.loaded();
+			});
+		},
+		todel:function(e){
+			var id = e.currentTarget.dataset.id;
+			app.confirm('确定要删除吗?',function(){
+				app.showLoading('删除中');
+        app.post('ApiMy/formdelete', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+			})
+		}
+  }
+};
+</script>
+<style>
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; height:92rpx;padding: 0 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;min-width:160rpx;padding: 0 20rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center;}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center;}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/pages/form/formlog.vue b/pages/form/formlog.vue
new file mode 100644
index 0000000..71e8540
--- /dev/null
+++ b/pages/form/formlog.vue
@@ -0,0 +1,117 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待确认','已确认','已驳回','待支付']" :itemst="['all','0','1','2','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view style="width:100%;height:90rpx"></view>
+		<view class="content" id="datalist">
+			<view class="item" @tap="goto" :data-url="'formdetail?id=' + item.id" v-for="(item, index) in datalist" :key="index">
+				<view class="f1">
+						<text class="t1">{{item.title}}</text>
+						<text class="t2">提交时间：{{item.createtime}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" v-if="item.status==0 && (!item.payorderid||item.paystatus==1)" style="color:#88e">待确认</text>
+					<text class="t1" v-if="item.status==0 && item.payorderid && item.paystatus==0" style="color:red">待支付</text>
+					<text class="t1" v-if="item.status==1" style="color:green">已确认</text>
+					<text class="t1" v-if="item.status==2" style="color:red">已驳回</text>
+				</view>
+			</view>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 'all';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			this.nodata = false;
+			this.nomore = false;
+			this.loading = true;
+      app.post('ApiMy/formlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+}
+</script>
+<style>
+
+	.content{ width:100%;margin:0;}
+	.content .item{ width:94%;margin:20rpx 3%;;background:#fff;border-radius:16rpx;padding:30rpx 30rpx;display:flex;align-items:center;}
+	.content .item:last-child{border:0}
+	.content .item .f1{width:80%;display:flex;flex-direction:column}
+	.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+	.content .item .f1 .t2{color:#666666;margin-top:10rpx}
+	.content .item .f1 .t3{color:#666666}
+	.content .item .f2{width:20%;font-size:32rpx;text-align:right}
+	.content .item .f2 .t1{color:#03bc01}
+	.content .item .f2 .t2{color:#000000}
+	.content .item .f3{ flex:1;font-size:30rpx;text-align:right}
+	.content .item .f3 .t1{color:#03bc01}
+	.content .item .f3 .t2{color:#000000}
+</style>
\ No newline at end of file
diff --git a/pages/form/formpay.vue b/pages/form/formpay.vue
new file mode 100644
index 0000000..308faf9
--- /dev/null
+++ b/pages/form/formpay.vue
@@ -0,0 +1,180 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view class="info-item">
+				<text class="t1">订单名称:</text>
+				<text class="t2">{{orderinfo.title}}</text>
+			</view>
+			<view class="info-item">
+				<text class="t1">订单编号:</text>
+				<text class="t2">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="info-item">
+				<text class="t1">支付金额:</text>
+				<text class="t2" style="color:#e94745">￥{{orderinfo.money}}</text>
+			</view>
+		</view>
+		<button class="fpay-btn" @tap="topay" data-typeid="1" v-if="wxpayst==1">微信支付</button>
+		<button class='fpay-btn' @tap="topay" data-typeid="10" v-if="alipay==1" style="background:#108EE9;margin-top:20rpx">支付宝支付</button>
+		<block v-if="moneypay==1">
+			<button class="fpay-btn2" @tap="modalinput" v-if="userinfo.haspwd">{{t('余额')}}支付（当前余额¥{{userinfo.money}}）</button>
+			<button class="fpay-btn2" @tap="topay" data-typeid="2" v-else>{{t('余额')}}支付（当前余额¥{{userinfo.money}}）</button>
+		</block>
+
+		<view v-if="userinfo.haspwd" :class="'weui-demo-dialog ' + (!hiddenmodalput ? 'weui-demo-dialog_show' : '')">
+			<view class="weui-mask" @tap="cancel"></view>
+			<view class="weui-dialog__wrp">
+				<view class="weui-dialog">
+					<view class="weui-dialog__hd">
+						<view class="weui-dialog__title">支付密码</view>
+					</view>
+					<view class="weui-dialog__bd">
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 130rpx;">
+							<text style="font-size:40rpx;color:#000"></text><input type="digit" placeholder="请输入支付密码" @input="getpwd"></input>
+						</view> 
+					</view>
+					<view class="weui-dialog__ft">
+						<view class="weui-dialog__btn weui-dialog__btn_default" @tap="cancel">取消</view>
+						<view class="weui-dialog__btn" @tap="topay" data-typeid="2">确定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			textset:{},
+			wxpayst:0,
+			alipay:0,
+			moneypay:0,
+			userinfo:{},
+      paypwd: '',
+      hiddenmodalput: true,
+      orderinfo: []
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiWxpay/formpay', {orderid: that.opt.orderid}, function (res) {
+				that.loading = false;
+				that.textset = app.globalData.textset;
+				if (res.status == 0) {
+					app.error(res.msg);
+				} else {
+					that.wxpayst = res.wxpayst;
+					that.alipay = res.alipay;
+					that.moneypay = res.moneypay;
+					that.orderinfo = res.orderinfo;
+					that.userinfo = res.userinfo;
+				}
+				that.loaded();
+			});
+		},
+    getpwd: function (e) {
+      var paypwd = e.detail.value;
+      this.paypwd = paypwd
+    },
+    cancel: function () {
+      this.hiddenmodalput = true
+    },
+    modalinput: function () {
+      this.hiddenmodalput = !this.hiddenmodalput
+    },
+    topay: function (e) {
+      var that = this;
+      var typeid = e.currentTarget.dataset.typeid;
+      var orderid = this.orderinfo.id;
+      if (typeid == 2) {
+        that.hiddenmodalput = true;
+        app.confirm('确定用' + that.t('余额') + '支付吗?', function () {
+          app.post('ApiWxpay/formpay', {orderid: orderid,typeid: typeid,paypwd: that.paypwd}, function (data) {
+            if (data.status == 0) {
+              app.error(data.msg);
+              return;
+            }
+            if (data.status == 2) {
+              //无需付款
+              app.success(data.msg);
+              setTimeout(function () {
+               app.goto(decodeURIComponent(that.opt.tourl));
+              }, 1000);
+              return;
+            }
+          });
+        });
+      } else {
+        app.post('ApiWxpay/uppay', {orderid: orderid,typeid: typeid}, function (data) {
+          if (data.status == 0) {
+            app.error(data.msg);
+            return;
+          }
+          if (data.status == 2) {
+            //无需付款
+            app.success(data.msg);
+            setTimeout(function () {
+              app.goto(decodeURIComponent(that.opt.tourl));
+            }, 1000);
+            return;
+          }
+          var opt = data.data;
+					uni.requestPayment({
+						'timeStamp': opt.timeStamp,
+						'nonceStr': opt.nonceStr,
+						'package': opt.package,
+						'signType': 'MD5',
+						'paySign': opt.paySign,
+						'success': function (res) {
+							app.success('付款完成');
+							setTimeout(function () {
+								app.goto(decodeURIComponent(that.opt.tourl));
+							}, 1000);
+						},
+						'fail': function (res) {}
+					});
+				})
+			}
+    }
+  }
+}
+</script>
+<style>
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:20rpx 20rpx;}
+.info-item2{ display:flex;width: 100%; background: #fff;padding: 0 3%;padding:20rpx 20rpx; margin-bottom:20rpx;}
+.info-item2 .t1{ width:70rpx; }
+.info-item2 .t2{ color: #000;}
+.info-item2 .x2{ color: #888;}
+
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding: 0 3%;  border-bottom: 1px #f3f3f3 solid;}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx; height: 80rpx; line-height: 80rpx; color: #000; }
+.info-item .t2{ height: 80rpx;line-height: 80rpx; color: #000;text-align:right;flex:1}
+
+
+.fpay-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; margin-top: 20px;border-radius: 5px; color: #fff; background: #1aac19; border: none; font-size: 15px; }
+.fpay-btn2{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; margin-top: 10px;border-radius: 5px; color: #fff; background: #e2cc05; border: none; font-size: 15px; }
+</style>
\ No newline at end of file
diff --git a/pages/index/about.vue b/pages/index/about.vue
new file mode 100644
index 0000000..ec2cdbc
--- /dev/null
+++ b/pages/index/about.vue
@@ -0,0 +1,67 @@
+<template>
+  <view class="pages-about flex al-item-center j-between">
+    <view class="pages-about__hd flex al-item-center">
+      <image
+        class="pages-about__logo"
+        :src="data.logo"
+        mode="widthFix"
+      ></image>
+      <view class="pages-about__version">{{ data.version }}</view>
+    </view>
+    <view class="pages-about__ft">
+      <view class="pages-about__copyright">{{ data.copyright }}</view>
+    </view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+      data:{},
+    };
+  },
+  onLoad() {
+    // const accountInfo = uni.getAccountInfoSync();
+
+    let that = this;
+    app.get("ApiHome/getWebInfo", {},function(res) {
+      that.data = res.data;
+    });
+  },
+};
+</script>
+<style lang="scss">
+.pages-about {
+  height: 100vh;
+  background: #ffffff;
+  flex-direction: column;
+  position: relative;
+  &__hd {
+    padding-top: 200rpx;
+    flex-direction: column;
+    color: #333333;
+    text-align: center;
+    font-size: 36rpx;
+    line-height: 40rpx;
+  }
+  &__logo {
+    width: 300rpx;
+    height: 300rpx;
+    margin-bottom: 30rpx;
+  }
+  &__ft {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    color: #999999;
+    text-align: center;
+    padding: 65rpx 20rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/bind.vue b/pages/index/bind.vue
new file mode 100644
index 0000000..aa54046
--- /dev/null
+++ b/pages/index/bind.vue
@@ -0,0 +1,42 @@
+<template>
+<view>
+	<loading v-if="loading"></loading>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      url: ''
+    };
+  },
+  onLoad: function (opt) {
+    this.opt = app.getopts(opt);
+		this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiIndex/bind',{id:that.opt.id,token:that.opt.token},function(res){
+				that.loading = false;
+				if(res.status == 1){
+					app.alert(res.msg,function(){
+						app.goto('/admin/index/index');
+					});
+				}else{
+					app.alert(res.msg);
+				}
+			});
+		}
+	}
+};
+</script>
diff --git a/pages/index/getpwd.vue b/pages/index/getpwd.vue
new file mode 100644
index 0000000..6c85a62
--- /dev/null
+++ b/pages/index/getpwd.vue
@@ -0,0 +1,179 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="title">重置密码</view>
+		<view class="regform">
+			<view class="form-item">
+				<image :src="event_rul +'/static/img/static/img/reg-tel.png'" class="img"/>
+				<input type="text" class="input" placeholder="请输入手机号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="tel" value="" @input="telinput"/>
+			</view>
+			<view class="form-item">
+				<image :src="event_rul +'/static/img/static/img/reg-code.png'" class="img"/>
+				<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="smscode" value=""/>
+				<view class="code" :style="{color:t('color1')}" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+			</view>
+			<view class="form-item">
+				<image :src="event_rul +'/static/img/static/img/reg-pwd.png'" class="img"/>
+				<input type="text" class="input" placeholder="6-16为字母数字组合密码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="pwd" value="" :password="true"/>
+			</view>
+			<view class="form-item">
+				<image :src="event_rul +'/static/img/static/img/reg-pwd.png'" class="img"/>
+				<input type="text" class="input" placeholder="再次输入登录密码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="repwd" value="" :password="true"/>
+			</view>
+			<button class="form-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">确定</button>
+		</view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		logintype_1:true,
+		logintype_2:false,
+		logintype_3:false,
+		xystatus:0,
+		xycontent:'',
+		needsms:false,
+		showxieyi:false,
+		isagree:false,
+		smsdjs: '',
+		tel:'',
+		hqing: 0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			this.loaded();
+		},
+    formSubmit: function (e) {
+			var that = this;
+      var formdata = e.detail.value;
+      if (formdata.tel == ''){
+        app.alert('请输入手机号');
+        return;
+      }
+      if (formdata.pwd == '') {
+        app.alert('请输入密码');
+        return;
+      }
+      if (formdata.pwd.length < 6) {
+        app.alert('新密码不小于6位');
+        return;
+      }
+      if (formdata.repwd == '') {
+        app.alert('请再次输入新密码');
+        return;
+      }
+      if (formdata.pwd != formdata.repwd) {
+        app.alert('两次密码不一致');
+        return;
+      }
+			if (formdata.smscode == '') {
+				app.alert('请输入短信验证码');
+				return;
+			}
+			
+			app.showLoading('提交中');
+      app.post("ApiIndex/getpwd", {tel:formdata.tel,pwd:formdata.pwd,smscode:formdata.smscode}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goto('/pages/index/login');
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    telinput: function (e) {
+      this.tel = e.detail.value
+    },
+    smscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var tel = that.tel;
+      if (tel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(tel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: tel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);
+        }
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    }
+  }
+};
+</script>
+
+<style>
+page{background:#ffffff}
+.container{width:100%;}
+.title{margin:70rpx 50rpx 50rpx 40rpx;height:60rpx;line-height:60rpx;font-size: 48rpx;font-weight: bold;color: #000000;}
+.regform{ width:100%;padding:0 50rpx;border-radius:5px;background: #FFF;}
+.regform .form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:88rpx;line-height:88rpx;border-bottom:1px solid #F0F3F6;margin-top:20rpx}
+.regform .form-item:last-child{border:0}
+.regform .form-item .img{width:44rpx;height:44rpx;margin-right:30rpx}
+.regform .form-item .input{flex:1;color: #000;}
+.regform .form-item .code{font-size:30rpx}
+.regform .xieyi-item{display:flex;align-items:center;margin-top:50rpx}
+.regform .xieyi-item{font-size:24rpx;color:#B2B5BE}
+.regform .xieyi-item .checkbox{transform: scale(0.6);}
+.regform .form-btn{margin-top:60rpx;width:100%;height:96rpx;line-height:96rpx;color:#fff;font-size:30rpx;border-radius: 48rpx;}
+
+.othertip{height:auto;overflow: hidden;display:flex;align-items:center;width:580rpx;padding:20rpx 20rpx;margin:0 auto;margin-top:60rpx;}
+.othertip-line{height: auto; padding: 0; overflow: hidden;flex:1;height:0;border-top:1px solid #F2F2F2}
+.othertip-text{padding:0 32rpx;text-align:center;display:flex;align-items:center;justify-content:center}
+.othertip-text .txt{color:#A3A3A3;font-size:22rpx}
+
+.othertype{width:70%;margin:20rpx 15%;display:flex;justify-content:center;}
+.othertype-item{width:50%;display:flex;flex-direction:column;align-items:center;}
+.othertype-item .img{width:88rpx;height:88rpx;margin-bottom:20rpx}
+.othertype-item .txt{color:#A3A3A3;font-size:24rpx}
+
+.xieyibox{width:100%;height:100%;position:fixed;top:0;left:0;z-index:99;background:rgba(0,0,0,0.7)}
+.xieyibox-content{width:90%;margin:0 auto;height:80%;margin-top:20%;background:#fff;color:#333;padding:5px 10px 50px 10px;position:relative;border-radius:2px}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..a9707fd
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,914 @@
+<template>
+<view class="pages-index" @touchstart="start" @touchend="end" @touchmove.stop="move">
+	<scroll-view class="pages-scroll" scroll-y="true" :enhanced="true"
+    :bounces="false" :show-scrollbar="false" @scroll="pageScroll($event)" @scrolltolower="reachBottom">
+	<!-- #ifdef MP -->
+	<view class="pages-hd" :style="'min-height: ' + (searchScrollTop+95) + 'px;background: url(' + event_rul + '/static/img/home/header-bg.png);background-size: 100% 100%;'">
+			<view class="title_box pages-hd__title" :style="'top: ' + fixTop + 'px;height: '+ menuButtonHeight+ 'px'">
+				<view class="title">
+					敬衡商城
+				</view>
+		</view>
+		<view class="input_box"
+			:style="[{'top': `${searchScrollTop}px`} ,
+			{'width': `${searchWidth}%`}]"
+			@click="goto" data-url='/pages/shop/search'>
+			 <text class="iconfont icon-sousuo"></text>
+			 <input :disabled='true' type="text" placeholder-style="font-size:28rpx; color: #FFF;" placeholder="餐桌盛宴 与你相食" />
+			<view class="btn">搜索</view>
+		</view>
+		<!-- 刷新状态view -->
+		<view v-if="touch" class='pull-refresh' :style="[
+			{'height': `${refreshHeight}px`},
+			{'padding-top': `${searchScrollTop+38}px`},
+			{'background': `url(${event_rul}/static/img/home/header-bg.png)`},
+			{'background-size': '100% 360rpx'},
+			{'background-position': 'bottom 0 left 0'}]">
+			<view class="pull-refresh__loading">
+				<view class="dot" :class="{'dot1': refreshLoading }"></view>
+				<view class="dot" :class="{'dot2': refreshLoading }"></view>
+				<view class="dot" :class="{'dot3': refreshLoading }"></view>
+			</view>
+		</view>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef H5 || APP-PLUS -->
+	<view class="pages-hd pages-hdh5" :style="'background: url(' + event_rul + '/static/img/home/header-bg.png);background-size: 100% 100%;'">
+		<view class="title_box pages-hd__title">
+			<view class="title">敬衡商城</view>
+		</view>
+		<view class="input_box"			
+			@click="goto" data-url='/pages/shop/search'>
+			 <text class="iconfont icon-sousuo"></text>
+			 <input :disabled='true' type="text" placeholder-style="font-size:28rpx; color: #FFF;" placeholder="" />
+			<view class="btn">搜索</view>
+		</view>
+		<!-- 刷新状态view -->
+		<view v-if="touch" class='pull-refresh' :style="[
+			{'height': `${refreshHeight}px`},
+			{'background': `url(${event_rul}/static/img/home/header-bg.png)`},
+			{'background-size': '100% 360rpx'},
+			{'background-position': 'bottom 0 left 0'},
+			{'background-repeat': 'no-repeat'}]">>
+			<view class="pull-refresh__loading">
+				<view class="dot" :class="{'dot1': refreshLoading }"></view>
+				<view class="dot" :class="{'dot2': refreshLoading }"></view>
+				<view class="dot" :class="{'dot3': refreshLoading }"></view>
+			</view>
+		</view>
+	</view>
+	<!-- #endif -->
+	<scroll-view class="scroll-box" :style="touch ? 'height: ' + scrollHeight + 'px;': ''" :scroll-y="touch">
+	  <view class="container">
+		<swiper
+			class="swiper-box"
+			:indicator-dots="bannerList.length > 1"
+			:autoplay="bannerList.length > 1"
+			circular="true"
+			indicator-active-color="#333333"
+			:interval="5000"
+			>
+			<swiper-item class="swiper-item" v-for="(item,index) in bannerList" :key="index">
+				<image class="swiper-item__img" :src="item.pic_url" mode="widthFix"></image>
+			</swiper-item>
+		</swiper>
+		<scroll-view class="nav_box" scroll-x="true">
+			<!-- #ifdef MP-WEIXIN -->
+			<view style="font-size: 24rpx;" class="item" @click="ChannelsUserProfile">
+				<image src="https://dev.lansoft.shop/static/img/home/item-icon5.svg" mode=""></image>
+				<text>视频号首页</text>
+			</view>
+			<!-- #endif -->
+			<block v-for="(item,index) in navData" :key='index'>
+				<view v-if="index != 4" style="font-size: 24rpx;" class="item" @click="goto" :data-url='item.url'>
+					<image :src="item.icon" mode=""></image>
+					<text>{{item.name}}</text>
+				</view>
+			</block>
+		</scroll-view>
+	
+		<view class="fashion_box">
+			<!-- #ifdef MP -->
+			<view class="left">
+				<view class="title">
+					<image class="fashion_box-icon" :src="event_rul +'/static/img/home/live-icon.svg'"></image>
+					<text>直播精选</text>
+					<text class="ico">限时热卖</text>
+				</view>
+				<view class="bot">
+					
+					<view class="item" @click="goto" :data-url="item.coverImg?'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id='+item.roomId:''" v-for="(item,index) in liveRec" :key='index'>
+					   <image class="border-a-n" v-if="item.coverImg" :src="item.coverImg" mode=""></image>
+					   
+					   <view  v-else  style="border-radius: 120rpx;" class="iconfont icon-shipintianchong shop_note border-a-n">
+					   	
+					   </view>
+						<view class="border" ></view>
+						
+						<view class="border-bx"></view>
+						<view class="title_box" style="border-radius: 4rpx;">
+							<view class="live-animation" v-show="item.coverImg">
+								<text  class="heng1"></text>
+								<text  class="heng2"></text>
+								<text  class="heng3"></text>
+							</view>
+							<view class="shop_title" v-if="item.coverImg" style="">
+								{{item.name}}
+							</view>
+							<view v-else class="shop_title" style="">
+								{{item.name}}
+							</view>
+						</view>
+					</view>
+			
+				</view>
+			</view>
+				<!-- #endif -->
+			<view class="right">
+				<view class="title">
+					<image class="fashion_box-icon" :src="event_rul +'/static/img/home/recommend-icon.svg'"></image>
+					<text>为你推荐</text>
+					<text class="ico">甄选好货</text>
+				</view>
+				<view class="bot">
+					<view class="item" @click="goto" :data-url="item.pic?'/pages/shop/product?id='+item.proid:''" v-for="(item,index) in shopRec" :key='index'>
+						<block v-if="item.pic">
+							<image style="border-radius: 10rpx;"
+								:src="item.pic" mode="aspectFill"></image>
+							<view class="price">
+								<text class="symbol">￥</text>{{item.sell_price}}
+							</view>
+						</block>
+						<view v-else  class="iconfont icon-shangpin shop_note">
+							<view class="item-tips">{{item.sell_price}}</view>
+						</view>							
+					</view>
+	
+				</view>
+			</view>
+		</view>
+	
+		<view class="content" style="margin-top: 30rpx;">
+			<home-list @dialogChange="dialogChange"  @listZanFn='listZanFn' :list='list'></home-list>
+		</view>
+		
+		<nodata v-if="nodata" ></nodata>
+		<nomore v-if="nomore"></nomore>
+		<loading loadstyle="top:70%;" v-if="loading"></loading>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+	
+		<!-- <popmsg ref="popmsg"></popmsg> -->
+	  </view>
+	</scroll-view>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	</scroll-view>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				anShow:false,
+				cartCount:0,
+				keyword:'',
+				list: [],
+				navData: [{
+						name: '敬衡日记',
+						url: '/diary/evernote/evernote',
+						icon: app.globalData.event_url +'/static/img/home/item-icon1.svg'
+					},
+					{
+						name: '话题广场',
+						url: '/diary/topic/plaza',
+						icon: app.globalData.event_url +'/static/img/home/item-icon2.svg'
+					},
+					{
+						name: '全部商品',
+						url: '/pages/shop/classify?homeType=true',
+						icon: app.globalData.event_url +'/static/img/home/item-icon3.svg'
+					},
+					{
+						name: '积分商城',
+						url: '/activity/scoreshop/prolist',
+						icon: app.globalData.event_url +'/static/img/home/item-icon4.svg'
+					},
+					{
+						name: '直播',
+						url: '/diary/live/live',
+						icon: app.globalData.event_url +'/static/img/home/item-icon5.svg'
+					},
+				],
+				liveRec:[{'name':'暂无直播'},{'name':'暂无直播'}],
+				shopRec:[{'sell_price':'暂无商品'},{'sell_price':'暂无商品'}],
+				opt: {},
+				pagenum: 1,
+				loading: false,
+				isload: false,
+				nomore: false,
+				nodata: false,
+				datalist: [],
+				proid: 0,
+				menuindex: -1,
+				buydialogShow: false,
+				bannerList: [],
+				isFixed: false,  // 是否固定搜索框
+				fixTop: 0, // 搜索框固定后到顶部的距离
+				scrollTop: 0,  // 内容区域距离顶部的距离
+				scrollHeight: 0, // 下拉刷新内容区域高度
+				windowHeight: 0, // 屏幕可视区域高度
+				clientY: '', // 手指滑动的Y坐标
+				touch: '',  // 用户上拉还是下滑 (上划: false,下拉: true)
+				refreshHeight: 0, // 刷新状态view的高度
+				timeout1: null,
+				timeout2: null,
+				timeout3: null,
+				refreshLoading: false,  // 刷新loading
+				searchWidth: 92, 
+				searchTop: 0, // 初始搜索框到顶部的距离
+				searchScrollTop: 0, // 搜索框滚动的距离 = 从(fixTop+胶囊按钮高度+8)px开始 到  fixTop px结束
+				menuButtonHeight: 0, // 胶囊按钮高度
+				pagesScrollTop: 0,  // 页面滚动高度
+				
+				event_rul: app.globalData.event_url,
+
+			}
+		},
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			
+			this.getLists()
+			this.getRec()
+			// #ifdef MP
+
+			// 获取右上角胶囊坐标信息
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+			let menuButtonTop = menuButtonInfo.top;  // 胶囊到顶部的距离
+			this.menuButtonHeight = menuButtonInfo.height;  // 胶囊的高度
+
+			this.fixTop = menuButtonTop - (38 - this.menuButtonHeight) / 2;
+			// console.log("胶囊距离顶部的距离:",menuButtonTop,"胶囊的高度:",this.menuButtonHeight,"input距离顶部的距离:",this.fixTop);
+
+			this.searchTop = this.fixTop + this.menuButtonHeight + 8;
+			this.searchScrollTop = this.searchTop;
+
+			// #endif
+
+			this.timeout3 = setTimeout(()=> {				
+				// 获取内容区域距离顶部的距离
+				uni.createSelectorQuery().in(this).select('.scroll-box').boundingClientRect(data => {
+					this.scrollTop = data.top;
+					// 获取scrollHeight = 屏幕可视区域高度 - 内容区域scroll-view距离顶部距离 - tabbar高度
+					this.scrollHeight = this.windowHeight - this.scrollTop - 89;
+				}).exec();
+			},500)
+		},
+		onReady() {
+			uni.getSystemInfo({
+				success: (res) => {
+					// 获取屏幕可视区域高度
+					this.windowHeight = res.windowHeight;
+				}
+			})
+		},
+		onUnload() {
+			this.anShow = false;
+			clearTimeout(this.timeout1);
+			clearTimeout(this.timeout2);
+			clearTimeout(this.timeout3);
+		},
+		onReachBottom: function () {
+		  if (!this.nodata && !this.nomore) {
+		    this.pagenum = this.pagenum + 1;
+			this.getList()
+		  }
+		},
+		methods: {
+			//  #ifdef MP-WEIXIN
+			// 视频号首页
+			ChannelsUserProfile() {
+				wx.openChannelsUserProfile({
+					finderUserName: "sphWdNInL60a6XV",
+					success: (res) => {
+						console.log("视频号视频获取成功的回调",res);
+					},
+					fail: (res) => {
+						console.log("视频号视频获取失败的回调",res);
+					}
+				})
+			},
+			// #endif
+			// 页面滚动
+			pageScroll(e) {
+				let height = this.searchTop;
+				// 是否固定搜索框
+				if(e.detail.scrollTop >= height - this.fixTop) {
+					this.isFixed = true;
+					this.searchScrollTop = this.fixTop;
+					this.searchWidth = 68;
+				} else{
+					if(Math.ceil(e.detail.scrollTop) < 5) {
+						this.searchWidth = 92;			
+					}
+					this.searchScrollTop = this.searchTop - e.detail.scrollTop;
+					this.isFixed = false;
+				}
+				// 改变搜索框宽度
+				if(this.pagesScrollTop < e.detail.scrollTop) {
+					if(this.searchWidth > 68) {
+						this.searchWidth -= Math.ceil((92-68)/(this.searchTop - this.fixTop));
+					}
+				} else {
+					if(this.searchWidth < 92) {
+						this.searchWidth += Math.ceil((92-68)/(this.searchTop - this.fixTop));
+					}
+				}
+				this.pagesScrollTop = e.detail.scrollTop;
+			},
+			// 页面触底
+			reachBottom() {
+				if (!this.nodata && !this.nomore) {
+					this.pagenum = this.pagenum + 1;
+					this.getList()
+				}
+			},
+			//@touchstart 触摸开始
+			start(e){        
+				// console.log("打印触摸开始",e)
+				this.clientY = e.changedTouches[0].clientY;   //手指按下时的Y坐标
+				this.refreshLoading = false;
+				this.refreshHeight = 0;
+			},
+			//@touchend触摸结束
+			end(e){  
+				if(this.refreshHeight > 150) {
+					this.list = [];
+					this.pagenum = 1;
+					this.timeout1 = setTimeout(() => {
+						this.refreshHeight = 150;
+						this.refreshLoading = true;
+						this.getLists();
+						this.getRec();
+					},500);
+					this.timeout2 = setTimeout(() => {
+						this.touch = false;
+					},2000);
+				} else {
+					this.touch = false;
+				}
+			},
+			//@touchmove触摸移动
+			move(e) {
+				// 如果手指开始触摸的Y坐标 < 手指触摸移动的Y坐标,表示下拉
+				if(this.clientY < e.changedTouches[0].clientY) {
+					// console.log("this.clientY",this.clientY,e.changedTouches[0].clientY)
+
+					// 下拉: 手指开始触摸的Y坐标 > 内容区域scroll-view到顶部的距离  (就开启下拉刷新)
+					if(this.clientY > this.scrollTop) {
+						this.touch = true;
+						// 限制下拉刷新的高度最高为260px
+						if(this.refreshHeight < 260) {
+							let refresh = e.changedTouches[0].clientY - this.clientY;
+							this.refreshHeight = refresh;
+						}
+					} else {
+						this.touch = false;
+					}
+				}
+			},
+			listZanFn(e){
+							this.list[e.index].iszan = e.show;
+							if(this.list[e.index].binfo){
+			this.list[e.index].zan_num = e.num;
+			}else{
+			this.list[e.index].zan = e.num;
+			}
+						
+						},
+			searchFn(){
+				uni.navigateTo({
+					url:'/pages/shop/search?keyword='+this.keyword,
+					
+				})
+			},
+			getRec(){
+				//shop
+				app.post('ApiHome/recommendGoodsList', {}, res => {
+					 this.shopRec = res.list;
+					//  if(res.list[0]){
+					// 	this.shopRec[0] = res.list[0]; 
+					//  }
+					//  if(res.list[1]){
+					//  	this.shopRec[1] = res.list[1]; 
+					//  }
+				})
+				//live
+				app.post('ApiHome/getLiveList', {}, res => {
+					// this.liveRec = res.list;
+					if(res.list[0]){
+											this.liveRec[0] = res.list[0]; 
+					}
+					if(res.list[1]){
+						this.liveRec[1] = res.list[1]; 
+					}
+					this.cartCount = res.cartCount;
+				})
+			},
+			getLists() {
+				this.loading = true;
+				app.post('ApiHome/getBanner', {}, res => {
+					this.bannerList = res.list;
+				})
+				//直播 笔记 视频 商品
+				let promise1 = new Promise((resolve, rej) => {
+					app.post('ApiHome/homeLiveList', {}, res => {
+						res.list.forEach((item, index) => {
+							item.listType = 'live'
+							item.goods = JSON.parse(item.goods)
+						})
+						resolve(res.list)
+					})
+				})
+				let promise2 = new Promise((resolve, rej) => {
+					app.post('ApiHome/homeLuntan', {}, res => {
+						res.list.forEach((item, index) => {
+							item.listType = 'note'
+						})
+						resolve(res.list)
+					})
+				})
+				let promise3 = new Promise((resolve, rej) => {
+					app.post('ApiHome/homeVideo', {}, res => {
+						res.list.forEach((item, index) => {
+							item.listType = 'video'
+						})
+						resolve(res.list)
+					})
+				})
+				Promise.all([promise1, promise2, promise3]).then((values) => {
+					this.list.push(...values[0], ...values[2], ...values[1])
+					this.getList()
+
+
+				})
+			},
+
+			getList() {
+				let that = this;
+				var page = that.pagenum;
+				that.loading = true;
+				that.nomore = false;
+				that.nodata = false;
+				app.post('ApiHome/homeGoodsList', {
+					pagenum: page,
+				}, function(res) {
+					that.loading = false;
+					var data = res.list;
+					res.list.forEach((item) => {
+						item.listType = 'shop'
+					})
+					if (page == 1) {
+						that.list.push(...data)
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+					} else {
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							that.list.push(...data)
+						}
+					}
+					that.loaded();
+				});
+
+				return
+				app.post('ApiZhiwei/topicDetail', {
+					topic_id: this.id
+				}, (res) => {
+					this.info = res.data
+				})
+			},
+			dialogChange(id) {
+				this.proid = id;
+				this.buydialogChange();
+			},
+			buydialogChange: function() {
+				this.buydialogShow = !this.buydialogShow;
+			},
+
+			closegg: function() {
+				this.hideguanggao = 1;
+			},
+			showsubqrcode: function() {
+				this.$refs.qrcodeDialog.open();
+			},
+			closesubqrcode: function() {
+				this.$refs.qrcodeDialog.close();
+			},
+		}
+	}
+</script>
+<style lang="scss">
+	.pages-index {
+		position:fixed;
+		top:0;
+		left:0;
+		height: 100vh;
+		width: 100vw;
+	}
+	.pages-scroll {
+		height: 100vh;
+		& ::-webkit-scrollbar {
+			display: none;
+		}
+	}
+ 	.pages-hd {
+		padding: 0 24rpx;
+		border-radius: 0 0 30rpx 30rpx;
+		&::before {
+			content: "";
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 176rpx;
+			z-index: 3;
+			background: #0A5D3B;
+		}
+		&.pages-hdh5 {
+			min-height: 300rpx;
+			padding-top: 36rpx;
+			box-sizing: border-box;
+			&::before {
+				height: 195rpx;
+			}
+			.input_box {
+				left: 30rpx;
+				right: 30rpx;
+				top: 92rpx;
+				// #ifdef H5
+				margin-top: 15rpx;
+				// #endif
+			}
+		}
+		.title_box {
+			position: fixed;
+			color: #EBE3AA;
+			font-size: 26rpx;
+			line-height: 40rpx;
+			padding: 0;
+			z-index: 4;
+			.title {
+				color: #EBE3AA;
+				font-weight: 400;
+				font-size: 36rpx;
+			}
+		}
+	}
+	.scroll-box {
+		margin-top: -90rpx;
+	}
+	.container {
+		padding: 0 24rpx;
+	}
+	.pull-refresh {
+		position: relative;
+		left: -24rpx;
+		right: -24rpx;
+		width: calc(100% + 48rpx);
+		box-sizing: content-box;
+		// #ifdef H5
+		padding-top: 120rpx;
+		// #endif
+		&__loading {
+			padding-top: 80rpx;
+			display: flex;
+			justify-content: center;
+			.dot {
+				width: 12rpx;
+				height: 12rpx;
+				background: rgba(255, 255, 255, 0.6);
+				border-radius: 50%;
+				margin: 0 10rpx;
+			}
+			.dot1 {
+				animation: loadings 0.6s linear infinite;
+			}
+			.dot2 {
+				animation: loadings 0.6s linear 0.2s infinite;
+			}
+			.dot3 {
+				animation: loadings 0.6s linear 0.4s infinite;
+			}
+		}
+	}
+	.swiper-box {
+		width: 100%;
+		height: 220rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+	}
+	.swiper-item {
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.shop_note{
+		font-size: 60rpx; border-radius: 10rpx; display: flex; justify-content: center; align-items: center; width: 120rpx; height: 120rpx; background-color: #faebd4; color: #fff;
+	}
+	.fashion_box {
+		width: 100%;
+		height: 260rpx;
+		display: flex;
+		box-sizing: border-box;
+		background: #FFFFFF;
+		margin-top: 24rpx;
+		border-radius: 12rpx;
+		&-icon {
+			width: 38rpx;
+			height: 38rpx;
+			margin-right: 10rpx;
+		}
+
+		.left,
+		.right {
+			padding: 18rpx 0 0 16rpx;
+			flex: 1;
+
+			.bot {
+				display: flex;
+				justify-content: space-around;
+			}
+
+			.title {
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #0A5D3B;
+				line-height: 40rpx;
+				display: flex;
+				align-items: center;
+				margin-bottom: 30rpx;
+
+				.ico {
+					// background-color: ;
+					background: linear-gradient(to right, #FF5E07, #FF9F28);
+					font-size: 22rpx;
+					line-height: 32rpx;
+					color: #fff;
+					padding: 0 16rpx;
+					border-radius: 32rpx 0 32rpx 32rpx;
+					margin-left: 14rpx;
+				}
+			}
+
+			.item {
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				&-tips {
+					position: absolute;
+					bottom: -48rpx;
+					color: #ED5925;
+					font-size: 24rpx;
+				}
+
+				.price {
+					color: #ED5925;
+					display: flex;
+					align-items: center;
+					position: absolute;
+					bottom: -64rpx;
+					font-weight: 500;
+					color: #ED5925;
+					font-size: 36rpx;
+					line-height: 50rpx;
+				}
+				.symbol {
+					font-size: 22rpx; 
+					margin-top: 6rpx;
+				}
+
+				image {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 120rpx;
+				}
+			}
+			.border-a-n {
+				transform: scale(1.1);
+				border: 2px solid #0A5D3B;
+				animation: border-x 1.5s linear infinite ;
+			}
+			.border-bx {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 136rpx;
+				height: 136rpx;
+				border-radius: 240rpx;
+				border: 2px solid #0A5D3B;
+				opacity: 1;
+				animation: border-bx 1.5s linear .2s infinite ;
+			}
+
+			.title_box {
+				background-color: #0A5D3B;
+				width: 120rpx;
+				display: flex;
+				color: #fff;
+				padding: 3rpx 7rpx;
+				position: absolute;
+				top: 110rpx;
+
+				.live-animation {
+					height: 24rpx;
+					display: flex;
+					align-items: flex-end;
+					margin-right: 3rpx;
+					
+					.heng1,
+					.heng2,
+					.heng3 {
+						display: block;
+						width: 4rpx;
+						border-radius: 4rpx;
+						margin-right: 3rpx;
+						background-color: #fff;
+					}
+					
+					
+					.heng1 {
+						height: 24rpx;
+						animation: hengos .8s linear infinite;
+					}
+					
+					.heng2 {
+						height: 10rpx;
+						animation: hengts .8s linear  infinite;
+					}
+					.heng3 {
+						height: 24rpx;
+						animation: henghs .8s linear .2s infinite;
+						
+					}
+				}
+
+			}
+		}
+		.right {
+			padding-left: 16rpx;
+			border-left: 1rpx solid #fafafa;
+			.title {
+				.ico {
+					// background-color: ;
+					background: linear-gradient(to right, #22B000, #53D71A);
+					font-size: 22rpx;
+					line-height: 32rpx;
+					color: #fff;
+					padding: 0 16rpx;
+					border-radius: 32rpx 0 32rpx 32rpx;
+					margin-left: 14rpx;
+				} 
+			}
+			.bot {
+				margin-top: -18rpx;
+			}
+		}
+	}
+
+	.nav_box {
+		display: flex;
+		justify-content: space-between;
+		padding: 24rpx 30rpx;
+		background: #FFF;
+		border-radius: 12rpx;
+		margin-top: 24rpx;
+		height: 168rpx;
+		white-space: nowrap;
+		& ::-webkit-scrollbar {
+			display: none;
+		}
+
+		.item {
+			width: calc(100% / 4);
+			flex-shrink: 0;
+			display: inline-flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			color: #333333;
+			line-height: 32rpx;
+
+			image {
+				width: 74rpx;
+				height: 74rpx;
+				margin-bottom: 14rpx;
+			}
+		}
+	}
+
+	.input_box {
+		position: fixed;
+		display: flex;
+		height: 76rpx;
+		align-items: center;
+		border-radius: 38rpx;
+		background: #538d76;
+		padding: 0 32rpx;
+		border: 1rpx solid rgba(255,255,255,.6);
+		z-index: 5;
+		.icon-sousuo {
+			font-size: 36rpx;
+			color: #FFF;
+			flex-shrink: 0;
+		}
+		input {
+			flex: 1;
+			margin-left: 16rpx;
+		}
+		.btn {
+			width: 100rpx;
+			color: #fff;
+			font-size: 28rpx;
+			text-align: right;
+			flex-shrink: 0;
+			position: relative;
+			&::before {
+				position: absolute;
+				content: "";
+				left: 20rpx;
+				top: 50%;
+				height: 22rpx;
+				border-left: 1rpx solid #FFF;
+				transform: translateY(-50%);
+			}
+		}
+	}
+
+	.title_box {
+		padding: 45rpx 0;
+		display: flex;
+		color: #333;
+		font-size: 24rpx;
+		align-items: center;
+		letter-spacing: 2px;
+
+		.title {
+			color: #333;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+		
+		.shop_title {
+			letter-spacing: 0px;
+			font-size: 22rpx; overflow: hidden;text-overflow: ellipsis;white-space:nowrap;
+		}
+	}
+	
+	page {
+		background-color: #f2f2f4;
+	}
+	
+	@keyframes hengos {
+		0%   {height: 24rpx;}
+		50%  {height: 10rpx;}
+		100% {height: 24rpx;}
+	}
+	@keyframes hengts {
+		0%   {height: 10rpx;}
+		50%  {height: 24rpx;}
+		100% {height: 10rpx;}
+	}
+	@keyframes henghs {
+		0%   {height: 24rpx;}
+		50%  {height: 10rpx;}
+		100% {height: 24rpx;}
+	}
+	
+	@keyframes border-x {
+		  // 35%   {transform: scale(1.1);}
+		  50%  {transform: scale(1);}
+		  // 60%  {transform: scale(1);}
+		  // 80%  {transform: scale(1.1);}
+		  100% {transform: scale(1.1);}
+	}
+
+	@keyframes border-bx {
+		  0%   {width: 136rpx;height: 136rpx; opacity: 1;border-width: 2rpx;}
+		  50%  {border-width: 1rpx;}
+		  100% {width: 158rpx;height: 158rpx; opacity: 0; border-width: 0;}
+	}
+	
+	@keyframes loadings {
+		0%   {background: rgba(0, 0, 0, 0.6);}
+		100% {background: rgba(255, 255, 255, 0.6)}
+	}
+</style>
diff --git a/pages/index/login.vue b/pages/index/login.vue
new file mode 100644
index 0000000..50446a7
--- /dev/null
+++ b/pages/index/login.vue
@@ -0,0 +1,612 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<block v-if="logintype==1">
+			<form @submit="formSubmit" @reset="formReset">
+				<view class="title">用户登录</view>
+				<view class="loginform">
+					
+					<!-- #ifdef MP -->
+						<view  style="display: flex; justify-content: center; align-items: center;  flex-direction: column; margin: 110rpx 0 300rpx;">
+							<image :src="event_rul +'/static/img/logo.png'" style="width: 240rpx; height: 240rpx; margin: 0 auto;" mode=""></image>
+							<text class="text-gray">知美味 知健康 知生活</text>
+						</view>
+						<button class="form-btn" @tap="weixinlogin" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" >微信快捷登录</button>
+						<view class="xieyi-item">
+							<radio-group  @change="isagreeChange"><label class="flex-y-center"><radio class="checkbox" value="1" :checked="isagree"/>我已阅读,并同意</label></radio-group >
+							<text :style="{color:t('color1')}" @tap="showxieyiFun('Service_agreement')">《用户服务协议》</text>
+							<text :style="{color:t('color1')}" @tap="showxieyiFun('Authorization_agreement')">《用户授权协议》</text>
+							<text :style="{color:t('color1')}" @tap="showxieyiFun('Privacy')">《隐私政策协议》</text>
+						</view>
+					<!-- #endif -->
+
+					<view class="form-item">
+				
+						<image :src="event_rul +'/static/img/static/img/reg-tel.png'" class="img"/>
+						<input type="text" class="input" placeholder="请输入手机号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="tel" value="" @input="telinput"/>
+					</view>
+					<view class="form-item">
+						<image :src="event_rul +'/static/img/static/img/reg-pwd.png'" class="img"/>
+						<input type="text" class="input" placeholder="请输入密码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="pwd" value="" :password="true"/>
+					</view>
+					<button class="form-btn" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" form-type="submit">登录</button>
+					<button class="form-btn2" @tap="goback" v-if="!login_mast">暂不登录</button>
+					<button v-if="platform2 == 'ios' && logintype_4==true" class="ioslogin-btn" @tap="ioslogin" style="width:100%"><image :src="event_rul +'/static/img/static/images/apple.png'"/>通过Apple登录</button>
+					
+				</view>
+			</form>
+			<view class="regtip">
+				<view @tap="goto" data-url="reg" data-opentype="redirect">注册账号</view>
+				<view class="flex1"></view>
+				<view @tap="goto" data-url="getpwd" data-opentype="redirect" v-if="needsms">忘记密码？</view>
+			</view>
+
+			<block v-if="logintype_2 || logintype_3">
+				<view class="othertip">
+					<view class="othertip-line"></view>
+					<view class="othertip-text">
+						<text class="txt">其他方式登录</text>
+					</view>
+					<view class="othertip-line"></view>
+				</view>
+				<view class="othertype">
+					<view class="othertype-item" v-if="logintype_3" @tap="weixinlogin">
+						<image class="img" :src="pre_url+'/static/img/login-'+platformimg+'.png'"/>
+						<text class="txt">{{platformname}}登录</text>
+					</view>
+					<view class="othertype-item" v-if="logintype_2" @tap="changelogintype" data-type="2">
+						<image class="img" :src="event_rul +'/static/img/static/img/reg-tellogin.png'"/>
+						<text class="txt">手机号登录</text>
+					</view>
+				</view>
+			</block>
+		</block>
+		<block v-if="logintype==2">
+			<form @submit="formSubmit" @reset="formReset">
+			<view class="title">用户登录</view>
+			<view class="loginform">
+				<view class="form-item">
+					<image :src="event_rul +'/static/img/static/img/reg-tel.png'" class="img"/>
+					<input type="text" class="input" placeholder="请输入手机号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="tel" value="" @input="telinput"/>
+				</view>
+				<view class="form-item">
+					<image :src="event_rul +'/static/img/static/img/reg-code.png'" class="img"/>
+					<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="smscode" value=""/>
+					<view class="code" :style="{color:t('color1')}" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+				</view>
+        <view class="form-item" v-if="reg_invite_code && !parent">
+        	<image :src="event_rul +'/static/img/static/img/reg-yqcode.png'" class="img"/>
+        	<input type="text" class="input" :placeholder="'请输入邀请人'+reg_invite_code_text+'(选填)'" placeholder-style="font-size:30rpx;color:#B2B5BE" name="yqcode" value=""/>
+        </view>
+        <view class="form-item" v-if="reg_invite_code && parent" style="color: #333;">
+          邀请人：<image :src="parent.headimg" style="width: 80rpx; height: 80rpx;border-radius: 50%;"></image> {{parent.nickname}} 
+        </view>
+				<view class="xieyi-item" v-if="xystatus==1">
+					<checkbox-group @change="isagreeChange"><label class="flex-y-center"><checkbox class="checkbox" value="1" :checked="isagree"/>我已阅读并同意</label></checkbox-group>
+					<text :style="{color:t('color1')}" @tap="showxieyiFun">{{xyname}}</text>
+				</view>
+				<button class="form-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">登录</button>
+				<button class="form-btn2" @tap="goback" v-if="!login_mast">暂不登录</button>
+				<button v-if="platform2 == 'ios' && logintype_4==true" class="ioslogin-btn" @tap="ioslogin" style="width:100%"><image :src="event_rul +'/static/img/static/images/apple.png'"/>通过Apple登录</button>
+			</view>
+			</form>
+			<block v-if="logintype_1 || logintype_3">
+				<view class="othertip">
+					<view class="othertip-line"></view>
+					<view class="othertip-text">
+						<text class="txt">其他方式登录</text>
+					</view>
+					<view class="othertip-line"></view>
+				</view>
+				<view class="othertype">
+					<view class="othertype-item" v-if="logintype_3" @tap="weixinlogin">
+						<image class="img" :src="pre_url+'/static/img/login-'+platformimg+'.png'"/>
+						<text class="txt">{{platformname}}登录</text>
+					</view>
+					<view class="othertype-item" v-if="logintype_1" @tap="changelogintype" data-type="1">
+						<image class="img" :src="event_rul +'/static/img/static/img/reg-tellogin.png'"/>
+						<text class="txt">密码登录</text>
+					</view>
+				</view>
+			</block>
+		</block>
+		<block v-if="logintype==3">
+			<view class="authlogin">
+				<view class="authlogin-logo"><image :src="logo" style="width:100%;height:100%"/></view>
+				<view class="authlogin-name">授权登录{{name}}</view>
+				<button class="authlogin-btn" @tap="authlogin" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">{{platformname}}授权登录</button>
+				<button class="authlogin-btn2" @tap="goback" v-if="!login_mast">暂不登录</button>
+				<button v-if="platform2 == 'ios' && logintype_4==true" class="ioslogin-btn" @tap="ioslogin"><image :src="event_rul +'/static/img/static/images/apple.png'"/>通过Apple登录</button>
+				<view class="xieyi-item" v-if="xystatus==1">
+					<checkbox-group @change="isagreeChange"><label class="flex-y-center"><checkbox class="checkbox" value="1" :checked="isagree"/>我已阅读并同意</label></checkbox-group>
+					<text :style="{color:t('color1')}" @tap="showxieyiFun">{{xyname}}</text>
+				</view>
+			</view>
+		</block>
+		<!-- 绑定手机号 -->
+		<block v-if="logintype==4">
+			<block v-if="platform == 'wx'">
+				<view class="authlogin">
+					<view class="authlogin-logo"><image :src="logo" style="width:100%;height:100%"/></view>
+					<view class="authlogin-name">授权登录{{name}}</view>
+					<button class="authlogin-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">{{platformname}}授权绑定手机号</button>
+					<button class="authlogin-btn2" @tap="nobindregister" v-if="login_bind==1">暂不绑定</button>
+				</view>
+			</block>
+			<block v-else>
+				<form @submit="bindregister" @reset="formReset">
+					<view class="title">绑定手机号</view>
+					<view class="loginform">
+						<view class="form-item">
+							<image :src="event_rul +'/static/img/static/img/reg-tel.png'" class="img"/>
+							<input type="text" class="input" placeholder="请输入手机号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="tel" value="" @input="telinput"/>
+						</view>
+						<view class="form-item">
+							<image :src="event_rul +'/static/img/static/img/reg-code.png'" class="img"/>
+							<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="smscode" value=""/>
+							<view class="code" :style="{color:t('color1')}" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+						</view>
+						<button class="form-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">确定</button>
+						<button class="form-btn2" @tap="nobindregister" v-if="login_bind==1">暂不绑定</button>
+					</view>
+				</form>
+			</block>
+		</block>
+		<view v-if="showxieyi" class="xieyibox">
+			<view class="xieyibox-content">
+				<view style="overflow:scroll;height:100%;">
+					<parse :content="xycontent" @navigate="navigate"></parse>
+				</view>
+				<view style="position:absolute;z-index:9999;bottom:10px;left:0;right:0;margin:0 auto;text-align:center; width: 50%;height: 60rpx; line-height: 60rpx; color: #fff; border-radius: 8rpx;" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}"  @tap="hidexieyi">已阅读并同意</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+		platform2:app.globalData.platform2,
+
+		platform:'',
+		platformname:'',
+		platformimg:'weixin',
+		logintype:0,
+		logintype_1:true,
+		logintype_2:false,
+		logintype_3:false,
+		logintype_4:false,
+		isioslogin:false,
+		needsms:false,
+		logo:'',
+		name:'',
+		xystatus:0,
+		xyname:'',
+		xycontent:'',
+		showxieyi:false,
+		isagree:false,
+		smsdjs: '',
+		tel:'',
+		info:{},
+		hqing: 0,
+		frompage:'/pages/my/usercenter',
+		wxloginclick:false,
+		iosloginclick:false,
+		login_bind:0,
+		login_mast:false,
+		reg_invite_code:0,
+		reg_invite_code_text:'',
+		parent:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt.frompage) this.frompage = decodeURIComponent(this.opt.frompage);
+		if(this.opt.logintype) this.logintype = this.opt.logintype;
+		if(this.opt.login_bind) this.login_bind = this.opt.login_bind;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiIndex/login', {pid:app.globalData.pid}, function (res) {
+				that.loading = false;
+				if(res.status == 0){
+					app.alert(res.mg);return;
+				}
+				that.info =res;
+				that.logintype_1 = res.logintype_1;
+				that.logintype_2 = res.logintype_2;
+				that.logintype_3 = res.logintype_3;
+				// #ifdef APP-PLUS
+				if(that.platform2 == 'ios'){
+					if (plus.runtime.isApplicationExist({ pname: 'com.tencent.mm', action: 'weixin://' })) {
+						console.log('已安装微信')
+					}else{
+						that.logintype_3 = false;
+						console.log('未安装微信')
+					}
+				}
+				// #endif
+				that.logintype_4 = res.logintype_4;
+				that.login_mast = res.login_mast;
+				that.needsms = res.needsms;
+        that.reg_invite_code = res.reg_invite_code;
+        that.reg_invite_code_text = res.reg_invite_code_text;
+        that.parent = res.parent;
+				if(that.logintype==0){
+					if(that.logintype_1){
+						that.logintype = 1;
+					}else if(that.logintype_2){
+						that.logintype = 2;
+					}else if(that.logintype_3){
+						that.logintype = 3;
+					}
+				}
+				that.xystatus = res.xystatus;
+				that.xyname = res.xyname;
+				that.xycontent = res.xycontent;
+				that.logo = res.logo;
+				that.name = res.name;
+				that.platform = res.platform;
+				if(that.platform == 'mp' || that.platform == 'wx' || that.platform == 'app'){
+					that.platformname = '微信';
+					that.platformimg = 'weixin';
+				}
+				if(that.platform == 'toutiao'){
+					that.platformname = '头条';
+					that.platformimg = 'toutiao';
+				}
+				if(that.platform == 'alipay'){
+					that.platformname = '支付宝';
+					that.platformimg = 'alipay';
+				}
+				if(that.platform == 'qq'){
+					that.platformname = 'QQ';
+					that.platformimg = 'qq';
+				}
+				if(that.platform == 'baidu'){
+					that.platformname = '百度';
+					that.platformimg = 'baidu';
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+			var that = this;
+      var formdata = e.detail.value;
+      if (formdata.tel == ''){
+        app.alert('请输入手机号');
+        return;
+      }
+			if(that.logintype == 1){
+				if (formdata.pwd == '') {
+					app.alert('请输入密码');
+					return;
+				}
+			}
+			if(that.logintype == 2){
+				if (formdata.smscode == '') {
+					app.alert('请输入短信验证码');
+					return;
+				}
+				if (that.xystatus == 1 && !that.isagree) {
+					app.error('请先阅读并同意用户注册协议');
+					return false;
+				}
+			}
+			
+			if(that.logintype == 4){
+				if (typeof(formdata.pwd) != 'undefined' && formdata.pwd == '') {
+					app.alert('请输入密码');
+					return;
+				}
+				if (typeof(formdata.smscode) != 'undefined' && formdata.smscode == '') {
+					app.alert('请输入短信验证码');
+					return;
+				}
+			}
+			
+			app.showLoading('提交中');
+      app.post("ApiIndex/loginsub", {tel:formdata.tel,pwd:formdata.pwd,smscode:formdata.smscode,logintype:that.logintype,pid:app.globalData.pid,yqcode:formdata.yqcode}, function (res) {
+				app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+						console.log(that.frompage)
+            app.goto(that.frompage,'redirect');
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    },
+		getPhoneNumber: function (e) {
+			var that = this
+			console.log(e);
+			if(e.detail.errMsg == "getPhoneNumber:fail user deny"){
+				app.error('请同意授权获取手机号');return;
+			}
+			if(!e.detail.iv || !e.detail.encryptedData){
+				app.error('请同意授权获取手机号');return;
+			}
+			wx.login({success (res1){
+				console.log(res1);
+				var code = res1.code;
+				//用户允许授权
+				app.post('ApiIndex/wxRegister',{ iv: e.detail.iv,encryptedData:e.detail.encryptedData,code:code,pid:app.globalData.pid},function(res2){
+					if (res2.status == 1) {
+						app.success(res2.msg);
+						setTimeout(function () {
+							app.goto(that.frompage,'redirect');
+						}, 1000);
+					} else {
+						app.error(res2.msg);
+					}
+					return;
+				})
+			}});
+		},
+		bindregister:function(e){
+			var that = this;
+			var formdata = e.detail.value;
+      if (formdata.tel == ''){
+        app.alert('请输入手机号');
+        return;
+      }
+			if (formdata.smscode == '') {
+				app.alert('请输入短信验证码');
+				return;
+			}
+			that.register(formdata.tel,formdata.smscode);
+		},
+		nobindregister:function(){
+			this.register('','');
+		},
+		register:function(tel,smscode){
+			var that = this;
+			var url = '';
+			if(that.platform == 'app') {
+				url = 'ApiIndex/appwxRegister';
+				if(that.isioslogin){
+					url = 'ApiIndex/iosRegister';
+				}
+			} else if(that.platform=='mp' || that.platform=='h5') {
+				url = 'ApiIndex/shouquanRegister';
+			} else {
+				url = 'ApiIndex/'+that.platform+'Register';
+			}
+			app.post(url,{tel:tel,smscode:smscode,pid:app.globalData.pid},function(res2){
+				if (res2.status == 1) {
+					app.success(res2.msg);
+					setTimeout(function () {
+						app.goto(that.frompage,'redirect');
+					}, 1000);
+				} else {
+					app.error(res2.msg);
+				}
+				return;
+			});
+		},
+		authlogin:function(){
+			var that = this;
+			if (that.xystatus == 1 && !that.isagree) {
+				app.error('请先阅读并同意用户注册协议');
+				return false;
+			}
+			that.weixinlogin();
+		},
+		weixinlogin:function(){
+			var that = this;
+			if ( !that.isagree) {
+				// that.showxieyi = true;
+				// that.wxloginclick = true;
+				uni.showToast({
+					title:'请先阅读并同意协议',
+					icon:'none'
+				})
+				return;
+			}
+			console.log('weixinlogin')
+			that.wxloginclick = false;
+			app.authlogin(function(res){
+				if (res.status == 1) {
+					app.success(res.msg);
+					setTimeout(function () {
+						console.log('frompage')
+						console.log(that.frompage)
+						app.goto(that.frompage,'redirect');
+					}, 1000);
+					that.isLoginStorage();
+				} else if (res.status == 2) {
+					that.logintype = 4;
+					that.login_bind = res.login_bind;
+					that.isioslogin = false;
+					that.isLoginStorage();
+				} else {
+					app.error(res.msg);
+				}
+			},{frompage:that.frompage});
+		},
+		ioslogin:function(){
+			var that = this;
+			if (that.xystatus == 1 && !that.isagree) {
+				that.showxieyi = true;
+				that.iosloginclick = true;
+				return false;
+			}
+			uni.login({  
+				provider: 'apple',  
+				success: function (loginRes) {  
+					console.log(loginRes);
+					// 登录成功  
+					uni.getUserInfo({  
+						provider: 'apple',  
+						success(res) { 
+							// 获取用户信息成功
+							console.log(res)
+							if(res.userInfo && res.userInfo.openId){
+								app.post('ApiIndex/ioslogin',{userInfo:res.userInfo,pid:app.globalData.pid},function(res2){
+									console.log(res2);
+									if (res2.status == 1) {
+										app.success(res2.msg);
+										setTimeout(function () {
+											console.log('frompage')
+											console.log(that.frompage)
+											app.goto(that.frompage,'redirect');
+										}, 1000);
+									} else if (res2.status == 2) {
+										that.logintype = 4;
+										that.isioslogin = true;
+										that.login_bind = res2.login_bind
+									} else {
+										app.error(res2.msg);
+									}
+								});
+							}
+							that.isLoginStorage();
+						}  
+					})  
+				},  
+				fail: function (err) {  
+					console.log(err);
+					app.error('登录失败');
+				}  
+			});  
+		},
+		isLoginStorage() {
+			uni.setStorage({
+              key: "isLogin",
+              data: true,
+            });
+		},
+		changelogintype:function(e){
+			var logintype = e.currentTarget.dataset.type
+			this.logintype = logintype;
+		},
+    isagreeChange: function (e) {
+      var val = e.detail.value;
+      if (val.length > 0) {
+        this.isagree = true;
+      } else {
+        this.isagree = false;
+      }
+      console.log(this.isagree);
+    },
+    showxieyiFun: function (e) {
+		
+		this.xycontent = this.info[e]
+      this.showxieyi = true;
+    },
+    hidexieyi: function () {
+      this.showxieyi = false;
+			this.isagree = true;
+			if(this.wxloginclick){
+				this.weixinlogin();
+			}
+			if(this.iosloginclick){
+				this.ioslogin();
+			}
+    },
+    telinput: function (e) {
+      this.tel = e.detail.value
+    },
+    smscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var tel = that.tel;
+      if (tel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(tel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: tel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);return;
+        }
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    }
+  }
+};
+</script>
+
+<style>
+page{background:#ffffff}
+.container{width:100%;}
+.title{margin:70rpx 50rpx 50rpx 40rpx;height:60rpx;line-height:60rpx;font-size: 48rpx;font-weight: bold;color: #000000;}
+.loginform{ width:100%;padding:0 50rpx;border-radius:5px;background: #FFF;}
+.loginform .form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:88rpx;line-height:88rpx;border-bottom:1px solid #F0F3F6;margin-top:20rpx}
+.loginform .form-item:last-child{border:0}
+.loginform .form-item .img{width:44rpx;height:44rpx;margin-right:30rpx}
+.loginform .form-item .input{flex:1;color: #000;}
+.loginform .form-item .code{font-size:30rpx}
+.xieyi-item{display:flex;align-items:center;margin-top:30rpx;flex-wrap: wrap; position: fixed;bottom: 120rpx; left: 0; right: 0; padding: 0 50rpx;}
+.xieyi-item{font-size:24rpx;color:#B2B5BE}
+.xieyi-item .checkbox{transform: scale(0.6);}
+.loginform .form-btn{margin-top:60rpx;width:100%;height:80rpx;line-height:80rpx;color:#fff;font-size:30rpx;border-radius: 80rpx;}
+.loginform .form-btn2{width:100%;height:80rpx;line-height:80rpx;background:#EEEEEE;border-radius:40rpx;color:#A9A9A9;margin-top:30rpx}
+.regtip{color:#737785;font-size:26rpx;display:flex;width:100%;padding:0 80rpx;margin-top:30rpx}
+
+.othertip{height:auto;overflow: hidden;display:flex;align-items:center;width:580rpx;padding:20rpx 20rpx;margin:0 auto;margin-top:160rpx;}
+.othertip-line{height: auto; padding: 0; overflow: hidden;flex:1;height:0;border-top:1px solid #F2F2F2}
+.othertip-text{padding:0 32rpx;text-align:center;display:flex;align-items:center;justify-content:center}
+.othertip-text .txt{color:#A3A3A3;font-size:22rpx}
+
+.othertype{width:70%;margin:20rpx 15%;display:flex;justify-content:center;}
+.othertype-item{width:50%;display:flex;flex-direction:column;align-items:center;}
+.othertype-item .img{width:88rpx;height:88rpx;margin-bottom:20rpx}
+.othertype-item .txt{color:#A3A3A3;font-size:24rpx}
+
+.authlogin{display:flex;flex-direction:column;align-items:center}
+.authlogin-logo{width:180rpx;height:180rpx;margin-top:120rpx}
+.authlogin-name{color:#999999;font-size:30rpx;margin-top:60rpx;}
+.authlogin-btn{width:580rpx;height:96rpx;line-height:96rpx;background:#51B1F5;border-radius:48rpx;color:#fff;margin-top:100rpx}
+.authlogin-btn2{width:580rpx;height:96rpx;line-height:96rpx;background:#EEEEEE;border-radius:48rpx;color:#A9A9A9;margin-top:20rpx}
+.ioslogin-btn{width:580rpx;height:96rpx;line-height:96rpx;background:#fff;border-radius:48rpx;color:#fff;border:1px solid #555;color:#333;font-weight:bold;margin-top:30rpx;font-size:30rpx;display:flex;justify-content:center;align-items:center}
+.ioslogin-btn image{width:26rpx;height:26rpx;margin-right:16rpx;}
+
+
+.xieyibox{width:100%;height:100%;position:fixed;top:0;left:0;z-index:99;background:rgba(0,0,0,0.7)}
+.xieyibox-content{width:90%;margin:0 auto;height:80%;margin-top:20%;background:#fff;color:#333;padding:5px 10px 50px 10px;position:relative;border-radius:2px}
+
+.text-gray{color: #999;}
+</style>
\ No newline at end of file
diff --git a/pages/index/main.vue b/pages/index/main.vue
new file mode 100644
index 0000000..b1dc399
--- /dev/null
+++ b/pages/index/main.vue
@@ -0,0 +1,120 @@
+<template>
+<view class="container" :style="{backgroundColor:pageinfo.bgcolor}">
+	<dp :pagecontent="pagecontent" :menuindex="menuindex"></dp>
+	<view class="ggdialog" v-if="guanggaopic && hideguanggao==0">
+		<view class="main">
+			<view class="close" @tap="closegg"><image :src="event_rul + '/static/img/static/img/close.png'"></image></view>
+			<image :src="guanggaopic" class="guanggaopic" @tap="goto" :data-url="guanggaourl" mode="widthFix"></image>
+		</view>
+	</view>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+	data() {
+	return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		id: 0,
+		pageinfo: [],
+		pagecontent: [],
+		hideguanggao: 0,
+		title: "",
+		oglist: "", 
+		guanggaopic: "",
+		guanggaourl: "",
+		latitude:'',
+		longitude:'',
+
+		event_rul: app.globalData.event_url,
+		}
+	},
+	onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+	},
+	onPullDownRefresh:function(e){
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.title});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.title});
+		var query = (sharewxdata.path).split('?')[1];
+		console.log(sharewxdata)
+		console.log(query)
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			var opt = this.opt
+			var id = 0;
+			if (opt && opt.id) {
+			  id = opt.id;
+			}
+			that.loading = true;
+			app.get('ApiIndex/index', {id: id,latitude:that.latitude,longitude:that.longitude}, function (data) {
+				that.loading = false;
+				uni.stopPullDownRefresh();
+			  if (data.status == 2) {
+			    //付费查看
+			    app.goto('/pages/pay/pay?id='+data.payorderid, 'redirect');
+			    return;
+			  }
+			  if (data.status == 1) {
+			    var pagecontent = data.pagecontent;
+					that.title = data.pageinfo.title;
+					that.oglist = data.oglist;
+					that.guanggaopic = data.guanggaopic;
+					that.guanggaourl = data.guanggaourl;
+					that.pageinfo = data.pageinfo;
+					that.pagecontent = data.pagecontent;
+			    uni.setNavigationBarTitle({
+			      title: data.pageinfo.title
+			    });
+					that.loaded({title:that.title});
+					if(that.latitude=='' && that.longitude=='' && data.needlocation){
+						app.getLocation(function (res) {
+							that.latitude = res.latitude;
+							that.longitude = res.longitude;
+							that.getdata();
+						});
+					}
+			  } else {
+			    if (data.msg) {
+			      app.alert(data.msg, function () {
+			        if (data.url) app.goto(data.url);
+			      });
+			    } else if (data.url) {
+			      app.goto(data.url);
+			    } else {
+			      app.alert('您无查看权限');
+			    }
+			  }
+			});
+		},
+		closegg: function () {
+			this.hideguanggao = 1;
+		},
+	}
+}
+</script>
+<style>
+.ggdialog{ position:fixed;z-index:99991;width:100%;max-width:640px;height:100%;background:rgba(0,0,0,0.6);display:flex;justify-content:center;align-items:center;top:0;}
+.ggdialog .main{ width:80%;height:70%;position:relative;display:flex;justify-content:center;align-items:center}
+.ggdialog .close{ position:absolute;padding:20rpx;top:-80rpx;right:-40rpx}
+.ggdialog .close image{ width:40rpx;height:40rpx;}
+.ggdialog .guanggaopic{max-width:100%;height:auto;max-height:100%}
+</style>
\ No newline at end of file
diff --git a/pages/index/reg.vue b/pages/index/reg.vue
new file mode 100644
index 0000000..f42bbfb
--- /dev/null
+++ b/pages/index/reg.vue
@@ -0,0 +1,448 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<block v-if="logintype!=4">
+			<form @submit="formSubmit" @reset="formReset">
+			<view class="title">注册账号</view>
+			<view class="regform">
+				<view class="form-item">
+					<image :src="event_rul +'/static/img/static/img/reg-tel.png'" class="img"/>
+					<input type="text" class="input" placeholder="请输入手机号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="tel" value="" @input="telinput"/>
+				</view>
+				<view class="form-item" v-if="needsms">
+					<image :src="event_rul +'/static/img/static/img/reg-code.png'" class="img"/>
+					<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="smscode" value=""/>
+					<view class="code" :style="{color:t('color1')}" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+				</view>
+				<view class="form-item">
+					<image :src="event_rul +'/static/img/static/img/reg-pwd.png'" class="img"/>
+					<input type="text" class="input" placeholder="6-16位字母数字组合密码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="pwd" value="" :password="true"/>
+				</view>
+				<view class="form-item">
+					<image :src="event_rul +'/static/img/static/img/reg-pwd.png'" class="img"/>
+					<input type="text" class="input" placeholder="再次输入登录密码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="repwd" value="" :password="true"/>
+				</view>
+				<view class="form-item" v-if="reg_invite_code && !parent">
+					<image :src="event_rul +'/static/img/static/img/reg-yqcode.png'" class="img"/>
+					<input type="text" class="input" :placeholder="'请输入'+(reg_invite_code_type==0?'邀请人手机号':'邀请码')+(reg_invite_code==2?'(必填)':'(选填)')" placeholder-style="font-size:30rpx;color:#B2B5BE" name="yqcode" value=""/>
+				</view>
+        <view class="form-item" v-if="reg_invite_code && parent" style="color:#666;">
+					<block v-if="reg_invite_code_type == 0 ">
+          邀请人：<image :src="parent.headimg" style="width: 80rpx; height: 80rpx;border-radius: 50%;"></image> {{parent.nickname}} 
+					</block>
+					<block v-else>
+          邀请码：{{parent.yqcode}} 
+					</block>
+        </view>
+				
+				<view class="xieyi-item" v-if="xystatus==1">
+					<checkbox-group @change="isagreeChange"><label class="flex-y-center"><checkbox class="checkbox" value="1" :checked="isagree"/>阅读并同意</label></checkbox-group>
+					<text :style="{color:t('color1')}" @tap="showxieyiFun">{{xyname}}</text>
+				</view>
+
+				<button class="form-btn" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" form-type="submit">注册</button>
+			</view>
+			</form>
+			<view class="tologin" @tap="goto" data-url="login" data-opentype="redirect">已有账号? 前去登录</view>
+			
+			<block v-if="logintype_2 || logintype_3">
+				<view class="othertip">
+					<view class="othertip-line"></view>
+					<view class="othertip-text">
+						<text class="txt">其他方式登录</text>
+					</view>
+					<view class="othertip-line"></view>
+				</view>
+				<view class="othertype">
+					<view class="othertype-item" v-if="logintype_3" @tap="weixinlogin">
+						<image class="img" :src="pre_url+'/static/img/login-'+platformimg+'.png'"/>
+						<text class="txt">{{platformname}}登录</text>
+					</view>
+					<view class="othertype-item" v-if="logintype_2" @tap="goto" data-url="login?logintype=2" data-opentype="redirect">
+						<image class="img" :src="event_rul +'/static/img/static/img/reg-tellogin.png'"/>
+						<text class="txt">手机号登录</text>
+					</view>
+				</view>
+			</block>
+		</block>
+		<!-- 绑定手机号 -->
+		<block v-if="logintype==4">
+			<block v-if="platform == 'wx'">
+				<view class="authlogin">
+					<view class="authlogin-logo"><image :src="logo" style="width:100%;height:100%"/></view>
+					<view class="authlogin-name">授权登录{{name}}</view>
+					<button class="authlogin-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">{{platformname}}授权绑定手机号</button>
+					<button class="authlogin-btn2" @tap="nobindregister" v-if="login_bind==1">暂不绑定</button>
+				</view>
+			</block>
+			<block v-else>
+				<form @submit="bindregister" @reset="formReset">
+					<view class="title">绑定手机号</view>
+					<view class="regform">
+						<view class="form-item">
+							<image :src="event_rul +'/static/img/static/img/reg-tel.png'" class="img"/>
+							<input type="text" class="input" placeholder="请输入手机号" placeholder-style="font-size:30rpx;color:#B2B5BE" name="tel" value="" @input="telinput"/>
+						</view>
+						<view class="form-item">
+							<image :src="event_rul +'/static/img/static/img/reg-code.png'" class="img"/>
+							<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="smscode" value=""/>
+							<view class="code" :style="{color:t('color1')}" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+						</view>
+						<button class="form-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">确定</button>
+						<button class="form-btn2" @tap="nobindregister" v-if="login_bind==1">暂不绑定</button>
+					</view>
+				</form>
+			</block>
+		</block>
+		<view v-if="showxieyi" class="xieyibox">
+			<view class="xieyibox-content">
+				<view style="overflow:scroll;height:100%;">
+					<parse :content="xycontent" @navigate="navigate"></parse>
+				</view>
+				<view style="position:absolute;z-index:9999;bottom:10px;left:0;right:0;margin:0 auto;text-align:center; width: 50%;height: 60rpx; line-height: 60rpx; color: #fff; border-radius: 8rpx;" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}"  @tap="hidexieyi">已阅读并同意</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+		platform2:app.globalData.platform2,
+
+		platform:'',
+		platformname:'',
+		platformimg:'weixin',
+		logintype:0,
+		logintype_1:true,
+		logintype_2:false,
+		logintype_3:false,
+		logo:'',
+		name:'',
+		xystatus:0,
+		xyname:'',
+		xycontent:'',
+		needsms:false,
+		showxieyi:false,
+		isagree:false,
+		smsdjs: '',
+		tel:'',
+		hqing: 0,
+		frompage:'/pages/my/usercenter',
+		wxloginclick:false,
+		login_bind:0,
+		reg_invite_code:0,
+		reg_invite_code_text:'',
+		reg_invite_code_type:0,
+		parent:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt.frompage) this.frompage = decodeURIComponent(this.opt.frompage);
+		if(this.opt.logintype) this.logintype = this.opt.logintype;
+		if(this.opt.login_bind) this.login_bind = this.opt.login_bind;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiIndex/reg', {pid:app.globalData.pid}, function (res) {
+				that.loading = false;
+				if(res.status == 0){
+					app.alert(res.msg);return;
+				}
+				that.logintype_2 = res.logintype_2;
+				that.logintype_3 = res.logintype_3;
+				that.logintype_3 = res.logintype_3;
+				// #ifdef APP-PLUS
+				if(that.platform2 == 'ios'){
+					if (plus.runtime.isApplicationExist({ pname: 'com.tencent.mm', action: 'weixin://' })) {
+						
+					}else{
+						that.logintype_3 = false;
+					}
+				}
+				// #endif
+
+				that.xystatus = res.xystatus;
+				that.xyname = res.xyname;
+				that.xycontent = res.xycontent;
+				that.logo = res.logo;
+				that.name = res.name;
+				that.needsms = res.needsms;
+				that.platform = res.platform;
+        that.reg_invite_code = res.reg_invite_code;
+        that.reg_invite_code_text = res.reg_invite_code_text;
+        that.reg_invite_code_type = res.reg_invite_code_type;
+        that.parent = res.parent;
+				if(that.platform == 'mp' || that.platform == 'wx' || that.platform == 'app'){
+					that.platformname = '微信';
+					that.platformimg = 'weixin';
+				}
+				if(that.platform == 'toutiao'){
+					that.platformname = '头条';
+					that.platformimg = 'toutiao';
+				}
+				if(that.platform == 'alipay'){
+					that.platformname = '支付宝';
+					that.platformimg = 'alipay';
+				}
+				if(that.platform == 'qq'){
+					that.platformname = 'QQ';
+					that.platformimg = 'qq';
+				}
+				if(that.platform == 'baidu'){
+					that.platformname = '百度';
+					that.platformimg = 'baidu';
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+			var that = this;
+      var formdata = e.detail.value;
+      if (formdata.tel == ''){
+        app.alert('请输入手机号');
+        return;
+      }
+      if (formdata.pwd == '') {
+        app.alert('请输入密码');
+        return;
+      }
+      if (formdata.pwd.length < 6) {
+        app.alert('新密码不小于6位');
+        return;
+      }
+      if (formdata.repwd == '') {
+        app.alert('请再次输入新密码');
+        return;
+      }
+      if (formdata.pwd != formdata.repwd) {
+        app.alert('两次密码不一致');
+        return;
+      }
+			if(that.needsms){
+				if (formdata.smscode == '') {
+					app.alert('请输入短信验证码');
+					return;
+				}
+			}else{
+				formdata.smscode = '';
+			}
+			
+      if (that.xystatus == 1 && !that.isagree) {
+        app.error('请先阅读并同意用户注册协议');
+        return false;
+      }
+			app.showLoading('提交中');
+      app.post("ApiIndex/regsub", {tel:formdata.tel,pwd:formdata.pwd,smscode:formdata.smscode,pid:app.globalData.pid,yqcode:formdata.yqcode}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goto('/pages/my/usercenter','redirect');
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+		getPhoneNumber: function (e) {
+			var that = this
+			if(e.detail.errMsg == "getPhoneNumber:fail user deny"){
+				app.error('请同意授权获取手机号');return;
+			}
+			wx.login({success (res1){
+				console.log(res1);
+				var code = res1.code;
+				//用户允许授权
+				app.post('ApiIndex/wxRegister',{ iv: e.detail.iv,encryptedData:e.detail.encryptedData,code:code,pid:app.globalData.pid},function(res2){
+					if (res2.status == 1) {
+						app.success(res2.msg);
+						setTimeout(function () {
+							app.goto(that.frompage,'redirect');
+						}, 1000);
+					} else {
+						app.error(res2.msg);
+					}
+					return;
+				})
+			}});
+		},
+		bindregister:function(e){
+			var that = this;
+			var formdata = e.detail.value;
+      if (formdata.tel == ''){
+        app.alert('请输入手机号');
+        return;
+      }
+			if (formdata.smscode == '') {
+				app.alert('请输入短信验证码');
+				return;
+			}
+			that.register(formdata.tel,formdata.smscode);
+		},
+		nobindregister:function(){
+			this.register('','');
+		},
+		register:function(tel,smscode){
+			var that = this;
+			var url = '';
+			if(that.platform == 'app') {
+				url = 'ApiIndex/appwxRegister';
+			} else if(that.platform=='mp' || that.platform=='h5') {
+				url = 'ApiIndex/shouquanRegister';
+			} else {
+				url = 'ApiIndex/'+that.platform+'Register';
+			}
+			app.post(url,{tel:tel,smscode:smscode,pid:app.globalData.pid},function(res2){
+				if (res2.status == 1) {
+					app.success(res2.msg);
+					setTimeout(function () {
+						app.goto(that.frompage,'redirect');
+					}, 1000);
+				} else {
+					app.error(res2.msg);
+				}
+				return;
+			});
+		},
+		weixinlogin:function(){
+			var that = this;
+			if (that.xystatus == 1 && !that.isagree) {
+				that.showxieyi = true;
+				that.wxloginclick = true;
+				return;
+			}
+			that.wxloginclick = false;
+			app.authlogin(function(res){
+				if (res.status == 1) {
+					app.success(res.msg);
+					setTimeout(function () {
+						app.goto(that.frompage,'redirect');
+					}, 1000);
+				} else if (res.status == 2) {
+					that.logintype = 4;
+					that.login_bind = res.login_bind
+				} else {
+					app.error(res.msg);
+				}
+			});
+		},
+    isagreeChange: function (e) {
+      var val = e.detail.value;
+      if (val.length > 0) {
+        this.isagree = true;
+      } else {
+        this.isagree = false;
+      }
+      console.log(this.isagree);
+    },
+    showxieyiFun: function () {
+      this.showxieyi = true;
+    },
+    hidexieyi: function () {
+      this.showxieyi = false;
+			this.isagree = true;
+			if(this.wxloginclick){
+				this.weixinlogin();
+			}
+    },
+    telinput: function (e) {
+      this.tel = e.detail.value
+    },
+    smscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var tel = that.tel;
+      if (tel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(tel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: tel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);
+        } 
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    }
+  }
+};
+</script>
+
+<style>
+page{background:#ffffff}
+.container{width:100%;}
+.title{margin:70rpx 50rpx 50rpx 40rpx;height:60rpx;line-height:60rpx;font-size: 48rpx;font-weight: bold;color: #000000;}
+.regform{ width:100%;padding:0 50rpx;border-radius:5px;background: #FFF;}
+.regform .form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:88rpx;line-height:88rpx;border-bottom:1px solid #F0F3F6;margin-top:20rpx}
+.regform .form-item:last-child{border:0}
+.regform .form-item .img{width:44rpx;height:44rpx;margin-right:30rpx}
+.regform .form-item .input{flex:1;color: #000;}
+.regform .form-item .code{font-size:30rpx}
+.regform .xieyi-item{display:flex;align-items:center;margin-top:50rpx}
+.regform .xieyi-item{font-size:24rpx;color:#B2B5BE}
+.regform .xieyi-item .checkbox{transform: scale(0.6);}
+.regform .form-btn{margin-top:20rpx;width:100%;height:96rpx;line-height:96rpx;color:#fff;font-size:30rpx;border-radius: 48rpx;}
+.regform .form-btn2{width:100%;height:80rpx;line-height:80rpx;background:#EEEEEE;border-radius:40rpx;color:#A9A9A9;margin-top:30rpx}
+.tologin{color:#737785;font-size:26rpx;display:flex;width:100%;padding:0 80rpx;margin-top:30rpx}
+
+.othertip{height:auto;overflow: hidden;display:flex;align-items:center;width:580rpx;padding:20rpx 20rpx;margin:0 auto;margin-top:60rpx;}
+.othertip-line{height: auto; padding: 0; overflow: hidden;flex:1;height:0;border-top:1px solid #F2F2F2}
+.othertip-text{padding:0 32rpx;text-align:center;display:flex;align-items:center;justify-content:center}
+.othertip-text .txt{color:#A3A3A3;font-size:22rpx}
+
+.othertype{width:70%;margin:20rpx 15%;display:flex;justify-content:center;}
+.othertype-item{width:50%;display:flex;flex-direction:column;align-items:center;}
+.othertype-item .img{width:88rpx;height:88rpx;margin-bottom:20rpx}
+.othertype-item .txt{color:#A3A3A3;font-size:24rpx}
+
+.xieyibox{width:100%;height:100%;position:fixed;top:0;left:0;z-index:99;background:rgba(0,0,0,0.7)}
+.xieyibox-content{width:90%;margin:0 auto;height:80%;margin-top:20%;background:#fff;color:#333;padding:5px 10px 50px 10px;position:relative;border-radius:2px}
+
+
+.authlogin{display:flex;flex-direction:column;align-items:center}
+.authlogin-logo{width:180rpx;height:180rpx;margin-top:120rpx}
+.authlogin-name{color:#999999;font-size:30rpx;margin-top:60rpx;}
+.authlogin-btn{width:580rpx;height:96rpx;line-height:96rpx;background:#51B1F5;border-radius:48rpx;color:#fff;margin-top:100rpx}
+.authlogin-btn2{width:580rpx;height:96rpx;line-height:96rpx;background:#EEEEEE;border-radius:48rpx;color:#A9A9A9;margin-top:20rpx}
+
+</style>
\ No newline at end of file
diff --git a/pages/index/webView.vue b/pages/index/webView.vue
new file mode 100644
index 0000000..68d8f5d
--- /dev/null
+++ b/pages/index/webView.vue
@@ -0,0 +1,26 @@
+<template>
+<view>
+<web-view :src="url"></web-view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      url: ''
+    };
+  },
+
+  onLoad: function (opt) {
+    this.url = decodeURIComponent(opt.url);
+  }
+};
+</script>
diff --git a/pages/index/webView2.vue b/pages/index/webView2.vue
new file mode 100644
index 0000000..91d90e1
--- /dev/null
+++ b/pages/index/webView2.vue
@@ -0,0 +1,54 @@
+<template>
+<view>
+<web-view :src="url" v-if="url!=''"></web-view>
+<view v-if="showBrowserOpen" style="width:100%;height:100vh;overflow:hidden">
+	<image :src="pre_url + '/static/img/showBrowserOpen.jpg'" style="width:100%;" mode="widthFix"/>
+</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      url: '',
+			showBrowserOpen:false,
+			pre_url:app.globalData.pre_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt.tourl) this.tourl = decodeURIComponent(this.opt.tourl);
+		this.getdata();
+  },
+  methods: {
+		getdata: function(){
+			this.orderid = this.opt.orderid;
+			var that = this;
+			if(this.opt.typeid == '23' && app.globalData.platform == 'mp'){
+				that.showBrowserOpen = true;
+				return;
+			}
+			app.globalData.session_id = this.opt.session_id;
+			app.showLoading('提交中');
+			app.post('ApiPay/pay',{op:'submit',orderid: this.orderid,typeid: this.opt.typeid},function(res){
+				app.showLoading(false);
+				console.log(res)
+				if(app.globalData.platform == 'h5'){
+					app.goto(res.url);
+				}else{
+					that.url = res.url;
+				}
+			});
+		}
+  }
+};
+</script>
diff --git a/pages/kefu/index.vue b/pages/kefu/index.vue
new file mode 100644
index 0000000..e88d4a0
--- /dev/null
+++ b/pages/kefu/index.vue
@@ -0,0 +1,328 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="message-list">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="message-time" v-if="item.formatTime">{{item.formatTime}}</view>
+				<view class="message-item" v-if="item.isreply==1">
+					<image class="message-avatar" mode="aspectFill" :src="item.uheadimg"></image>
+					<view class="message-text-left">
+						<view class="arrow-box arrow-left">
+							<image class="arrow-icon" :src="event_rul + '/static/img/static/img/arrow-white.png'"></image>
+						</view>
+						<view class="message-text">
+							<rich-text :nodes="item.content"></rich-text>
+						</view>
+					</view>
+				</view>
+				<view class="message-item" style="justify-content:flex-end" v-else>
+					<view class="message-text-right">
+						<view class="arrow-box arrow-right">
+							<image class="arrow-icon" :src="event_rul + '/static/img/static/img/arrow-green.png'"></image>
+						</view>
+						<view class="message-text">
+							<rich-text :nodes="item.content"></rich-text>
+						</view>
+					</view>
+					<image class="message-avatar" mode="aspectFill" :src="item.headimg"></image>
+				</view>
+			</block>
+		</view>
+		<view class="input-box notabbarbot" id="input-box">
+			<view class="input-form">
+				<image @tap="sendimg" class="pic-icon" :src="event_rul + '/static/img/static/img/msg-pic.png'"></image>
+				<input @confirm="sendMessage" @focus="onInputFocus" @input="messageChange" class="input" confirmHold="true" confirmType="send" cursorSpacing="20" type="text" :value="message" maxlength="-1"/>
+				<image @tap="toggleFaceBox" class="face-icon" :src="event_rul + '/static/img/static/img/face-icon.png'"></image>
+				<!-- <button class="send-button" v-if="!trimMessage" :style="{background:t('color1')}">
+					发送
+				</button> -->
+				<button @tap="sendMessage" class="send-button-active" v-if="trimMessage" :style="{background:t('color1')}">
+					发送
+				</button>
+			</view>
+			<!-- <view>{{sss}}</view> -->
+			<wxface v-if="faceshow" @selectface="selectface"></wxface>
+		</view>
+		<view :class="'anit ' + (msgtipsShow == 1?'show':(msgtipsShow == 2?'hide':''))" @tap="goto" :data-url="'index?bid='+msgtips.bid">{{msgtips.unickname}}：{{msgtips.content}}</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+<script>
+var app = getApp();
+var interval0;
+var interval1;
+var interval2;
+
+
+export default {
+  data() {
+    return {
+		opt:{},
+		isload: false,
+		loading: false,
+
+		msgtipsShow:0,
+		msgtips:{},
+		bid:0,
+		token:'',
+		nowtime:'',
+		pagenum: 1,
+		datalist: [],
+		message: "",
+		trimMessage: "",
+		faceshow: false,
+		nomore: false,
+		sss:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt){
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid || 0;
+		
+		this.getdata();
+  },
+  onUnload: function () {
+    clearInterval(interval0);
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			that.loading = true;
+			app.get('ApiKefu/index',{},function (res) {
+				that.loading = false;
+				that.loading = false;
+				that.token = res.token;
+				that.getdatalist();
+				that.nowtime = res.nowtime;
+				that.loaded();
+				interval0 = setInterval(function () {
+					that.nowtime++;
+				}, 1000);
+			});
+		},
+    updateMessageTime: function () {
+      var that = this;
+      var datalist = this.datalist;
+			for(var i in datalist){
+        var thistime = parseInt(datalist[i].createtime);
+        var prevtime = 0;
+        if (i > 0) {
+          prevtime = parseInt(datalist[i - 1].createtime);
+        }
+        if (thistime - prevtime > 600) {
+          datalist[i].formatTime = that.getTime(thistime);
+        } else {
+          datalist[i].formatTime = '';
+        }
+      }
+      this.datalist = datalist;
+    },
+    getdatalist: function () {
+      var that = this;
+      if (that.loading) return;
+			that.loading = true;
+			app.post('ApiKefu/getmessagelist',{bid:that.bid,pagenum: that.pagenum}, function (res) {
+				that.loading = false;
+				var datalist = res.data;
+				if (datalist.length > 0) {
+					for (var i in datalist) {
+						datalist[i].content = that.transformMsgHtml(datalist[i].msgtype, datalist[i].content);
+					}
+					that.datalist = datalist.concat(that.datalist);
+					that.updateMessageTime();
+					if (that.pagenum == 1) {
+						that.scrollToBottom();
+					} else {
+
+					}
+					that.pagenum = that.pagenum + 1;
+				}else{
+					that.nomore = true;
+				}
+			});
+    },
+    sendMessage: function (e) {
+      var that = this;
+      var message = this.message;
+      if (message.length > 2000) {
+        uni.showToast({
+          title: "单条消息不能超过2000字",
+          icon: "none",
+          duration: 1000
+        });
+      } else {
+        if (message.replace(/^\s*|\s*$/g, "")) {
+          var msgdata = {
+            aid: app.globalData.aid,
+            mid: app.globalData.mid,
+            bid: that.bid,
+            msgtype: 'text',
+            content: message,
+						platform:app.globalData.platform,
+						pre_url:app.globalData.pre_url
+          };
+					console.log(msgdata)
+          app.sendSocketMessage({type: 'tokefu',data:msgdata});
+          that.message = "";
+          that.trimMessage = "";
+          that.faceshow = false
+        }
+      }
+    },
+    sendimg: function () {
+      var that = this;
+      app.chooseImage(function (data) {
+        for (var i = 0; i < data.length; i++) {
+          var message = data[i];
+          var msgdata = {
+            aid: app.globalData.aid,
+            mid: app.globalData.mid,
+            bid: that.bid,
+            msgtype: 'image',
+            content: message,
+						platform:app.globalData.platform,
+						pre_url:app.globalData.pre_url
+          };
+          app.sendSocketMessage({type: 'tokefu',data: msgdata});
+        }
+      }, 3);
+    },
+    receiveMessage: function (data) {
+			var that = this;
+			console.log('zz-**')
+			console.log(data)
+			if((data.type == 'tokehu' || data.type == 'tokefu') && that.bid == data.data.bid ) {
+				var message = data.data
+				message.content = that.transformMsgHtml(message.msgtype, message.content);
+				that.datalist = that.datalist.concat([message]);
+				//that.sss = Math.random();
+				console.log('11-----------')
+				setTimeout(that.updateMessageTime, 100);
+				this.scrollToBottom();
+				return true;
+				if (that.bid != message.bid) { //其他商家发来的信息
+					var content = message.content;
+					if (message.msgtype == 'image') {
+						content = '[图片]';
+					} else if (message.msgtype == 'voice') {
+						content = '[语音]';
+					} else if (message.msgtype == 'video') {
+						content = '[小视频]';
+					} else if (message.msgtype == 'music') {
+						content = '[音乐]';
+					} else if (message.msgtype == 'news') {
+						content = '[图文]';
+					} else if (message.msgtype == 'link') {
+						content = '[链接]';
+					} else if (message.msgtype == 'miniprogrampage') {
+						content = '[小程序]';
+					} else if (message.msgtype == 'location') {
+						content = '[地理位置]';
+					}
+					message.content = content;
+					that.msgtipsShow = 1;
+					that.msgtips = message;
+					setTimeout(function () {
+						that.msgtipsShow = 2;
+					}, 10000);
+				}
+			}
+			return false;
+    },
+    toggleFaceBox: function () {
+      this.faceshow = !this.faceshow
+    },
+    scrollToBottom: function () {
+      var that = this;
+      setTimeout(function () {
+				uni.pageScrollTo({
+					scrollTop: 10000,
+					duration:0
+				});
+      },300);
+    },
+    onInputFocus: function (e) {
+      this.faceshow = false
+    },
+		onPageScroll: function (e) {
+			var that = this;
+			var scrollY = e.scrollTop;     
+			if (scrollY == 0 && !that.nomore) {
+				this.getdatalist();
+			}
+		},
+    messageChange: function (e) {
+      this.message = e.detail.value;
+      this.trimMessage = e.detail.value.trim();
+    },
+    transformMsgHtml: function (msgtype, content) {
+      if (msgtype == 'miniprogrampage') {
+        var contentdata = JSON.parse(content);
+        content = '<div style="font-size:16px;font-weight:bold;height:25px;line-height:25px">' + contentdata.Title + '</div><img src="' + contentdata.ThumbUrl + '" width="200"/>';
+      }
+      if (msgtype == 'image') {
+        content = '<img src="' + content + '" width="200"/>';
+      }
+      return content;
+    },
+    selectface: function (face) {
+      this.message = "" + this.message + face;
+			this.trimMessage = this.message.trim();
+    },
+    getTime: function (createtime) {
+      var t = this.nowtime - createtime;
+      if (t > 0) {
+        var todaystart = new Date(this.date(this.nowtime, "Y-m-d 00:00:00")).getTime();
+        todaystart = todaystart / 1000;
+        var lastdaystart = todaystart - 86400;
+        if (t <= 180) {
+          return '刚刚';
+        }
+        if (createtime > todaystart) {
+          return this.date(createtime, "H:i");
+        }
+        if (createtime > lastdaystart) {
+          return '昨天' + this.date(createtime, "H:i");
+        }
+        return this.date(createtime, 'Y年m月d日 H:i:s');
+      }
+    }
+  }
+};
+</script>
+<style>
+.container{display: block;min-height: 100%;	box-sizing: border-box;	background: #f4f4f4;color: #222;}
+.message-list {	padding-left: 25rpx;	padding-right: 25rpx;	padding-bottom: 20rpx;padding-bottom:100rpx;}
+.message-item {display:flex;padding:20rpx 0}
+.message-time {	width:100%;padding-top: 20rpx;	padding-bottom: 10rpx;	text-align: center;display: inline-block;	color: #999;	font-size: 24rpx;}
+.message-avatar {	width: 90rpx;	height: 90rpx;	border-radius: 50%;}
+.message-text {	max-width: 525rpx;	min-height: 64rpx;	line-height: 50rpx;	font-size: 30rpx;	padding: 20rpx 30rpx;word-break:break-all}
+.message-text-left {	position: relative;	background-color: #fff;	margin-left: 20rpx;	border-radius: 12rpx;	border: 1rpx solid #dddddd;}
+.message-text-right {	position: relative;	background-color: #9AE966;	margin-right: 20rpx;	border-radius: 12rpx;	border: 1rpx solid #6DBF58;}
+.arrow-box {	position: absolute;	width: 16rpx;	height: 24rpx;	top: 35rpx;}
+.arrow-left {left: -14rpx;}
+.arrow-right {right: -14rpx;}
+.arrow-icon {	display: block;	width: 100%;	height: 100%;}
+
+.input-box {	position: fixed;	z-index: 100;	bottom: 0;	width: 96%;	min-height: 100rpx;	padding: 15rpx 2%;	background-color: #fff;box-sizing:content-box}
+.input-form {	width: 100%;	height: 100%;	display: flex;	flex-direction: row;	align-items: center;}
+.input {	flex: 1;	height: 66rpx;	border: 1rpx solid #ddd;	padding: 5rpx 10rpx;	background-color: #fff;	font-size: 30rpx;	border-radius: 12rpx;}
+.pic-icon {	width: 54rpx;	height: 54rpx;	margin-right: 18rpx;}
+.face-icon {	width: 60rpx;	height: 60rpx;	margin-left: 18rpx;}
+.faces-box {	width: 100%;	height: 500rpx;}
+.single-face {	width: 48rpx;	height: 48rpx;	margin: 10rpx;}
+.send-button {	width: 100rpx;	height: 62rpx;	margin-left: 18rpx;	border-radius: 8rpx;	text-align: center;	line-height: 62rpx;	font-size: 28rpx;	border: 1rpx solid #dddddd;	color: #fff;}
+.send-button-active {	width: 100rpx;	height: 62rpx;	margin-left: 20rpx;	border-radius: 8rpx;	text-align: center;	line-height: 62rpx;	font-size: 28rpx;	border: 1rpx solid #dddddd;	color: #fff;}
+.send-icon {	width: 56rpx;	height: 56rpx;}
+
+.anit{width: 100%;height: 70rpx;background:#555;position: absolute;color:#fff;font-size: 30rpx;line-height: 70rpx;top: -70rpx;text-align: left;padding:0 20rpx;overflow:hidden}
+.show{top: 0rpx;animation: show 0.2s;animation-timing-function:ease;}
+@keyframes show{from {top:-70rpx;}to {top:0rpx;}}
+.hide{top: -70rpx;animation: hide 0.2s;animation-timing-function:ease;}
+@keyframes hide{from {top:0rpx;}to {top:-70rpx;}}
+</style>
\ No newline at end of file
diff --git a/pages/lipin/dhlog.vue b/pages/lipin/dhlog.vue
new file mode 100644
index 0000000..dff582f
--- /dev/null
+++ b/pages/lipin/dhlog.vue
@@ -0,0 +1,118 @@
+<template>
+<view class="container" v-if="isload==1">
+	<view class="content" id="datalist">
+		<block v-for="(item, index) in datalist" :key="index"> 
+			<view class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t1">兑换码：{{item.code}}</text>
+						<text class="t2">兑换时间：{{item.createtime}}</text>
+				</view>
+			</view>
+		</block>
+		<nodata v-if="nodata"></nodata>
+	</view>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+      myscore: 0,
+      nomore: false
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+    this.pagenum = 1;
+    this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1
+      this.getdata();
+    }
+  },
+  methods: {
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.pagenum = 1;
+      this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+      app.post('ApiLipin/dhlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          that.myscore = res.myscore;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.nav{display:flex;width: 100%;padding:20rpx;}
+.nav .item{flex:1;width: 50%;line-height:70rpx;height:70rpx;text-align:center;background:#fff;border-top:1px solid #ccc;border-bottom:1px solid #ccc;}
+.nav .item:first-child{border:1px solid #ccc;border-radius:10rpx 0 0 10rpx;}
+.nav .item:last-child{border:1px solid #ccc;border-radius:0 10rpx 10rpx 0}
+.nav .on{background: #ff6801;color: #fff;}
+
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{flex:1;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/pages/lipin/index.vue b/pages/lipin/index.vue
new file mode 100644
index 0000000..29ed486
--- /dev/null
+++ b/pages/lipin/index.vue
@@ -0,0 +1,87 @@
+<template>
+<view class="container">
+	<form report-submit="true" @submit="subconfirm" style="width:100%">
+		<div class="title">请输入兑换码进行兑换</div>
+		<div class="inputdiv"><input id="dhcode" type="text" name="dhcode" value="" placeholder-style="color:#666;" placeholder="请输入您的兑换码"></input></div>
+
+		<button class="btn" form-type="submit">立即兑换</button>
+		<view class="f0" @tap="goto" data-url="/pages/lipin/dhlog"><text>查看兑换记录</text></view>
+	</form>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      userinfo: [],
+      money: '',
+      moneyduan: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onLoad: function (opt) {
+    var that = this;
+  },
+  methods: {
+		getdata:function(){
+			
+		},
+    subconfirm: function (e) {
+      var that = this;
+      var dhcode = e.detail.value.dhcode;
+			that.loading = true;
+      app.post('ApiLipin/index', {dhcode: dhcode}, function (res) {
+				that.loading = false;
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        }
+        if (res.status == 1) {
+          app.alert(res.msg, function () {
+            app.goto('/pages/my/usercenter');
+          });
+        }
+        if (res.status == 2) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goto('/pages/lipin/prodh?dhcode=' + dhcode);
+          }, 1000);
+        }
+				if (res.status == 3) {
+				  app.alert(res.msg, function () {
+				    app.goto('/pages/coupon/mycoupon');
+				  });
+				}
+				that.loaded();
+      });
+    }
+  }
+}
+</script>
+<style>
+.container{display:flex;flex-direction:column;}
+.container .title{display:flex;justify-content:center;width:100%;color:#555;font-size:40rpx;text-align:center;height:100rpx;line-height:100rpx;margin-top:60rpx}
+.container .inputdiv{display:flex;width:90%;margin:0 auto;margin-top:40rpx;margin-bottom:40rpx;}
+.container .inputdiv input{background:#fff;width:100%;height:120rpx;line-height:120rpx;padding:0 40rpx;font-size:40rpx;border:1px solid #f5f5f5;border-radius:20rpx}
+.container .btn{ height: 88rpx;line-height: 88rpx;background: #FC4343;width:90%;margin:0 auto;border-radius:8rpx;margin-top:60rpx;color: #fff;font-size: 36rpx;}
+.container .f0{width:100%;margin-top:40rpx;height:60rpx;line-height:60rpx;color:#FC4343;font-size:30rpx;display:flex;align-items:center;justify-content:center}
+
+</style>
\ No newline at end of file
diff --git a/pages/lipin/prodh.vue b/pages/lipin/prodh.vue
new file mode 100644
index 0000000..45e80b9
--- /dev/null
+++ b/pages/lipin/prodh.vue
@@ -0,0 +1,640 @@
+<template>
+  <view class="container">
+    <block v-if="isload">
+			<form @submit="topay">
+				<view v-if="needaddress==0" class="address-add">
+					<view class="linkitem">
+						<text class="f1">联 系 人：</text>
+						<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx"/>
+					</view>
+					<view class="linkitem">
+						<text class="f1">联系电话：</text>
+						<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx"/>
+					</view>
+				</view>
+				<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/'+(address.id ? 'address' : 'addressadd')+'?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+					<view class="f1"><image class="img" :src="event_rul +'/static/img/static/img/address.png'"/></view>
+					<view class="f2 flex1" v-if="address.id">
+						<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+						<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+					</view>
+					<view v-else class="f2 flex1">请选择收货地址</view>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"></image>
+				</view>
+				<view v-for="(buydata, index) in allbuydata" :key="index" class="buydata">
+					<view class="btitle"><image class="img" :src="event_rul +'/static/img/static/img/ico-shop.png'"/>{{buydata.business.name}}</view>
+					<view class="bcontent">
+						<view class="product">
+							<view v-for="(item, index2) in buydata.prodata" :key="index2" class="item flex">
+								<view class="img" @tap="goto" :data-url="'/pages/shop/product?id=' + item.product.id"><image :src="item.product.pic"></image></view>
+								<view class="info flex1">
+									<view class="f1">{{item.product.name}}</view>
+									<view class="f2">规格：{{item.guige.name}}</view>
+									<view class="f3"><text style="font-weight:bold;">￥{{item.guige.sell_price}}</text><text style="padding-left:20rpx"> × {{item.num}}</text></view>
+								</view>
+							</view>
+						</view>
+						<view class="freight">
+							<view class="f1">配送方式</view>
+							<view class="freight-ul">
+								<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+									<block v-for="(item, idx2) in buydata.freightList" :key="idx2">
+										<view class="freight-li" :style="buydata.freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-bid="buydata.bid" :data-index="idx2">{{item.name}}</view>
+									</block>
+								</view>
+							</view>
+							<view class="freighttips" v-if="buydata.freightList[buydata.freightkey].minpriceset==1 && buydata.freightList[buydata.freightkey].minprice > 0 && buydata.freightList[buydata.freightkey].minprice > buydata.product_price">满{{buydata.freightList[buydata.freightkey].minprice}}元起送，还差{{buydata.freightList[buydata.freightkey].minprice - buydata.product_price}}元</view>
+							<view class="freighttips" v-if="buydata.freightList[buydata.freightkey].isoutjuli==1">超出配送范围</view>
+						</view>
+
+						<view class="price" v-if="buydata.freightList[buydata.freightkey].pstimeset==1">
+							<view class="f1">{{buydata.freightList[buydata.freightkey].pstype==1?'取货':'配送'}}时间</view>
+							<view class="f2" @tap="choosePstime" :data-bid="buydata.bid">{{buydata.pstimetext==''?'请选择时间':buydata.pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+						</view>
+						<view class="storeitem" v-if="buydata.freightList[buydata.freightkey].pstype==1">
+							<view class="panel">
+								<view class="f1">取货地点</view>
+								<view class="f2" @tap="openLocation" :data-bid="buydata.bid" :data-freightkey="buydata.freightkey" :data-storekey="buydata.freightList[buydata.freightkey].storekey"><text class="iconfont icondingwei"></text>{{buydata.freightList[buydata.freightkey].storedata[buydata.freightList[buydata.freightkey].storekey].name}}</view>
+							</view>
+							<block v-for="(item, idx) in buydata.freightList[buydata.freightkey].storedata" :key="idx">
+								<view class="radio-item" @tap.stop="choosestore" :data-bid="buydata.bid" :data-index="idx">
+									<view class="f1">{{item.name}} </view>
+									<text style="color:#f50;">{{item.juli}}</text>
+									<view class="radio" :style="buydata.freightList[buydata.freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+								</view>
+							</block>
+						</view>
+
+						<view class="price">
+							<text class="f1">商品金额</text>
+							<text class="f2">¥{{buydata.product_price}}</text>
+						</view>
+
+						<view style="display:none">{{test}}</view>
+						<view class="form-item" v-for="(item,idx) in buydata.freightList[buydata.freightkey].formdata" :key="item.id">
+							<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+							<block v-if="item.key=='input'">
+								<input type="text" :name="'form'+buydata.bid+'_'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+							</block>
+							<block v-if="item.key=='textarea'">
+								<textarea :name="'form'+buydata.bid+'_'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+							</block>
+							<block v-if="item.key=='radio'">
+								<radio-group class="radio-group" :name="'form'+buydata.bid+'_'+idx">
+									<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+										<radio class="radio" :value="item1"/>{{item1}}
+									</label>
+								</radio-group>
+							</block>
+							<block v-if="item.key=='checkbox'">
+								<checkbox-group :name="'form'+buydata.bid+'_'+idx" class="checkbox-group">
+									<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+										<checkbox class="checkbox" :value="item1"/>{{item1}}
+									</label>
+								</checkbox-group>
+							</block>
+							<block v-if="item.key=='selector'">
+								<picker class="picker" mode="selector" :name="'form'+buydata.bid+'_'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx] || buydata.editorFormdata[idx]===0"> {{item.val2[buydata.editorFormdata[idx]]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='time'">
+								<picker class="picker" mode="time" :name="'form'+buydata.bid+'_'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx]">{{buydata.editorFormdata[idx]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='date'">
+								<picker class="picker" mode="date" :name="'form'+buydata.bid+'_'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx]">{{buydata.editorFormdata[idx]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='upload'">
+								<input type="text" style="display:none" :name="'form'+buydata.bid+'_'+idx" :value="buydata.editorFormdata[idx]"/>
+								<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+									<view class="form-imgbox" v-if="buydata.editorFormdata[idx]">
+										<view class="form-imgbox-img"><image class="image" :src="buydata.editorFormdata[idx]" @click="previewImage" :data-url="buydata.editorFormdata[idx]" mode="widthFix"/></view>
+									</view>
+									<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-bid="buydata.bid" :data-idx="idx"></view>
+								</view>
+							</block>
+						</view>
+
+					</view>
+				</view>
+
+				<view style="width: 100%; height:110rpx;"></view>
+				<view class="footer flex">
+					<view class="text1 flex1">总计：
+						<text style="font-weight:bold;font-size:36rpx">￥0.00</text>
+					</view>
+					<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">
+						确定兑换</button>
+				</view>
+			</form>
+
+			<view v-if="pstimeDialogShow" class="popup__container">
+				<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+				<view class="popup__modal">
+					<view class="popup__title">
+						<text
+							class="popup__title-text">请选择{{allbuydata[nowbid].freightList[allbuydata[nowbid].freightkey].pstype==1?'取货':'配送'}}时间</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+							@tap.stop="hidePstimeDialog" />
+					</view>
+					<view class="popup__content">
+						<view class="pstime-item"
+							v-for="(item, index) in allbuydata[nowbid].freightList[allbuydata[nowbid].freightkey].pstimeArr"
+							:key="index" @tap="pstimeRadioChange" :data-index="index">
+							<view class="flex1">{{item.title}}</view>
+							<view class="radio"
+								:style="allbuydata[nowbid].freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''">
+								<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+    </block>
+    <loading v-if="loading"></loading>
+    <dp-tabbar :opt="opt"></dp-tabbar>
+		<popmsg ref="popmsg"></popmsg>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		test:'test',
+		havetongcheng:0,
+		address: [],
+		usescore: 0,
+		scoredk_money: 0,
+		totalprice: '0.00',
+		bid: 0,
+		nowbid: 0,
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		userinfo:{},
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		manjian_money: 0,
+		cxid: 0,
+		latitude: "",
+		longitude: "",
+		allbuydata: "",
+		alltotalprice: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+    this.opt = app.getopts(opt);
+    this.getdata();
+  },
+  onPullDownRefresh: function () {
+    this.getdata();
+  },
+  methods: {
+    getdata: function () {
+      var that = this;
+      app.get('ApiLipin/prodh', {dhcode: that.opt.dhcode}, function (res) {
+        if (res.status == 0) {
+          if (res.msg) {
+            app.alert(res.msg, function () {
+              if (res.url) {
+                app.goto(res.url);
+              } else {
+                app.goback();
+              }
+            });
+          } else if (res.url) {
+            app.goto(res.url);
+          } else {
+            app.alert('您没有权限购买该商品');
+          }
+          return;
+        }
+        that.havetongcheng = res.havetongcheng;
+        that.address = res.address;
+        that.linkman = res.linkman;
+        that.tel = res.tel;
+        that.userinfo = res.userinfo;
+        that.allbuydata = res.allbuydata;
+        that.needLocation = res.needLocation;
+        that.calculatePrice();
+        that.loaded();
+
+        if (res.needLocation == 1) {
+          app.getLocation(function (res) {
+            var latitude = res.latitude;
+            var longitude = res.longitude;
+            that.latitude = latitude;
+            that.longitude = longitude;
+            var allbuydata = that.allbuydata;
+            for (var i in allbuydata) {
+              var freightList = allbuydata[i].freightList;
+              for (var j in freightList) {
+                if (freightList[j].pstype == 1) {
+                  var storedata = freightList[j].storedata;
+                  if (storedata) {
+                    for (var x in storedata) {
+                      if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+                        var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+                        storedata[x].juli = juli;
+                      }
+                    }
+                    storedata.sort(function (a, b) {
+                      return a["juli"] - b["juli"];
+                    });
+                    for (var x in storedata) {
+                      if (storedata[x].juli) {
+                        storedata[x].juli = storedata[x].juli + '千米';
+                      }
+                    }
+                    allbuydata[i].freightList[j].storedata = storedata;
+                  }
+                }
+              }
+            }
+            that.allbuydata = allbuydata;
+          });
+        }
+      });
+    },
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value;
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value;
+    },
+    inputfield: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+      var field = e.currentTarget.dataset.field;
+      allbuydata[bid][field] = e.detail.value;
+      this.allbuydata = allbuydata;
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var address = that.address;
+      var allbuydata = that.allbuydata;
+      var alltotalprice = 0;
+      var allfreight_price = 0;
+      var needaddress = 0;
+
+      for (var k in allbuydata) {
+        var product_price = parseFloat(allbuydata[k].product_price);
+        // var leveldk_money = parseFloat(allbuydata[k].leveldk_money); //会员折扣
+        var manjian_money = parseFloat(allbuydata[k].manjian_money); //满减活动
+        var coupon_money = parseFloat(allbuydata[k].coupon_money); //-优惠券抵扣
+        // var cuxiao_money = parseFloat(allbuydata[k].cuxiao_money); //+促销活动
+        //算运费
+        var freightdata = allbuydata[k].freightList[allbuydata[k].freightkey];
+        var freight_price = freightdata['freight_price'];
+        if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+          needaddress = 1;
+        }
+        if (allbuydata[k].coupontype == 4) {
+          freight_price = 0;
+          coupon_money = 0;
+        }
+        var totalprice = product_price;
+        if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+        totalprice = totalprice + freight_price;
+        allbuydata[k].freight_price = freight_price.toFixed(2);
+        allbuydata[k].totalprice = totalprice.toFixed(2);
+        alltotalprice += totalprice;
+        allfreight_price += freight_price;
+      }
+      that.needaddress = needaddress;
+
+      if (alltotalprice < 0) alltotalprice = 0;
+      alltotalprice = alltotalprice.toFixed(2);
+      that.alltotalprice = alltotalprice;
+      that.allbuydata = allbuydata;
+    },
+    changeFreight: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+      var index = e.currentTarget.dataset.index;
+      var freightList = allbuydata[bid].freightList;
+      allbuydata[bid].freightkey = index;
+      that.allbuydata = allbuydata;
+      that.calculatePrice();
+			that.allbuydata[bid].editorFormdata = [];
+    },
+    chooseFreight: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+      console.log(bid);
+      console.log(allbuydata);
+      var freightList = allbuydata[bid].freightList;
+      var itemlist = [];
+
+      for (var i = 0; i < freightList.length; i++) {
+        itemlist.push(freightList[i].name);
+      }
+
+      uni.showActionSheet({
+        itemList: itemlist,
+        success: function (res) {
+          if(res.tapIndex >= 0){
+            allbuydata[bid].freightkey = res.tapIndex;
+            that.allbuydata = allbuydata;
+            that.calculatePrice();
+          }
+        }
+      });
+    },
+    choosePstime: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+      var freightkey = allbuydata[bid].freightkey;
+      var freightList = allbuydata[bid].freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      that.nowbid = bid;
+      that.pstimeDialogShow = true;
+      that.pstimeIndex = -1;
+    },
+    pstimeRadioChange: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var pstimeIndex = e.currentTarget.dataset.index;
+      console.log(pstimeIndex)
+      var nowbid = that.nowbid;
+      var freightkey = allbuydata[nowbid].freightkey;
+      var freightList = allbuydata[nowbid].freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var choosepstime = pstimeArr[pstimeIndex];
+      allbuydata[nowbid].pstimetext = choosepstime.title;
+      allbuydata[nowbid].freight_time = choosepstime.value;
+      that.allbuydata = allbuydata
+      that.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false;
+    },
+    choosestore: function (e) {
+      var bid = e.currentTarget.dataset.bid;
+      var storekey = e.currentTarget.dataset.index;
+      var allbuydata = this.allbuydata;
+      var buydata = allbuydata[bid];
+      var freightkey = buydata.freightkey
+      allbuydata[bid].freightList[freightkey].storekey = storekey
+      this.allbuydata = allbuydata;
+    },
+    //提交并支付
+    topay: function (e) {
+      var that = this;
+      var needaddress = that.needaddress;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+      var usescore = this.usescore;
+      var frompage = that.opt.frompage ? that.opt.frompage : '';
+      var allbuydata = that.allbuydata;
+      if (needaddress == 0) addressid = 0;
+
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+      var buydata = [];
+      for (var i in allbuydata) {
+        var freightkey = allbuydata[i].freightkey;
+        if (allbuydata[i].freightList[freightkey].pstimeset == 1 && allbuydata[i].freight_time == '') {
+          app.error('请选择' + (allbuydata[i].freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间');
+          return;
+        }
+        if(allbuydata[i].freightList[freightkey].pstype==1){
+          var storekey = allbuydata[i].freightList[freightkey].storekey;
+          var storeid = allbuydata[i].freightList[freightkey].storedata[storekey].id;
+        }else{
+          var storeid = 0;
+        }
+				
+				var formdata_fields = allbuydata[i].freightList[freightkey].formdata;
+				var formdata = e.detail.value;
+				var newformdata = {};
+				for (var j = 0; j < formdata_fields.length;j++){
+					var thisfield = 'form'+allbuydata[i].bid + '_' + j;
+					if (formdata_fields[j].val3 == 1 && (formdata[thisfield] === '' || formdata[thisfield] === undefined || formdata[thisfield].length==0)){
+							app.alert(formdata_fields[j].val1+' 必填');return;
+					}
+					if (formdata_fields[j].key == 'selector') {
+							formdata[thisfield] = formdata_fields[j].val2[formdata[thisfield]]
+					}
+					newformdata['form'+j] = formdata[thisfield];
+				}
+
+        buydata.push({
+          bid: allbuydata[i].bid,
+          prodata: allbuydata[i].prodatastr,
+          cuxiaoid: allbuydata[i].cuxiaoid,
+          couponrid: allbuydata[i].couponrid,
+          freight_id: allbuydata[i].freightList[freightkey].id,
+          freight_time: allbuydata[i].freight_time,
+          storeid: storeid,
+					formdata:newformdata,
+        });
+      }
+      app.showLoading('提交中');
+      app.post('ApiLipin/createOrder', {dhcode:that.opt.dhcode,frompage: frompage,buydata: buydata,addressid: addressid,linkman: linkman,tel: tel,usescore: usescore}, function (res) {
+        app.showLoading(false);
+        if (res.status == 0) {
+          //that.showsuccess(res.data.msg);
+          app.error(res.msg);
+          return;
+        }else{
+          app.alert(res.msg,function(){
+            app.goto('/pages/my/usercenter','reLaunch');
+          })
+        }
+      });
+    },
+    handleClickMask: function () {
+    },
+    openLocation:function(e){
+      var allbuydata = this.allbuydata
+      var bid = e.currentTarget.dataset.bid;
+      var freightkey = e.currentTarget.dataset.freightkey;
+      var storekey = e.currentTarget.dataset.storekey;
+      var frightinfo = allbuydata[bid].freightList[freightkey]
+      var storeinfo = frightinfo.storedata[storekey];
+      console.log(storeinfo)
+      var latitude = parseFloat(storeinfo.latitude);
+      var longitude = parseFloat(storeinfo.longitude);
+      var address = storeinfo.name;
+      uni.openLocation({
+        latitude:latitude,
+        longitude:longitude,
+        name:address,
+        scale: 13
+      })
+    },
+		editorChooseImage: function (e) {
+			var that = this;
+			var bid = e.currentTarget.dataset.bid;
+			var idx = e.currentTarget.dataset.idx;
+			var editorFormdata = that.allbuydata[bid].editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			app.chooseImage(function(data){
+				editorFormdata[idx] = data[0];
+				console.log(editorFormdata)
+				that.allbuydata[bid].editorFormdata = editorFormdata
+				that.test = Math.random();
+			})
+		},
+		editorBindPickerChange:function(e){
+			var that = this;
+			var bid = e.currentTarget.dataset.bid;
+			var idx = e.currentTarget.dataset.idx;
+			var val = e.detail.value;
+			var editorFormdata = that.allbuydata[bid].editorFormdata;
+			if(!editorFormdata) editorFormdata = [];
+			editorFormdata[idx] = val;
+			console.log(editorFormdata)
+			that.allbuydata[bid].editorFormdata = editorFormdata;
+			that.test = Math.random();
+		},
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4}
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding:0 20rpx;display:flex;align-items:center;z-index:8}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+</style>
\ No newline at end of file
diff --git a/pages/live/index.vue b/pages/live/index.vue
new file mode 100644
index 0000000..e487de6
--- /dev/null
+++ b/pages/live/index.vue
@@ -0,0 +1,322 @@
+<template>
+    <app-layout>
+        <view class="box">
+            <view v-if="list.length" class="list-box">
+                <view class="item" v-for="(item, index) in list" :key="index" @click="liveClick(item)">
+                    <view class="anchor-img-box">
+                        <image mode="aspectFill" class="anchor-img" :src="item.anchor_img"></image>
+                        <image v-if="item.live_status === 103" class="play-icon" :src="env_img_url+'/front/static/image/video-play.png'"></image>
+                    </view>
+                    <view class="room-info-box">
+                        <view class="name">{{item.name}}</view>
+                        <view class="user-info-box">
+                            <image mode="aspectFill" class="anchor-img" :src="item.anchor_img"></image>
+                            <span class="anchor-name">{{item.anchor_name}}</span>
+                        </view>
+                    </view>
+                    <view v-if="item.live_status === 101" class="tag-box tag-box-3">
+                        <view class="text">
+                            <image class="live-icon" :src="env_img_url+'/front/static/image/icon/liveing.png'"></image>
+                            <span>{{item.status_text}}</span>
+                        </view>
+                    </view>
+                    <!--预告-->
+                    <view v-else-if="item.live_status === 102" class="tag-box tag-box-1">
+                        <view class="text">
+                            <view class="round"></view>
+                            <span>{{item.status_text}}</span>
+                        </view>
+                        <view class="text-time">{{item.text_time}}</view>
+                    </view>
+                    <view v-else-if="item.live_status === 103" class="tag-box tag-box-2">
+                        <view class="text">
+                            <view class="round"></view>
+                            <span>{{item.status_text}}</span>
+                        </view>
+                    </view>
+                    <view v-else class="tag-box tag-box-3">
+                        <view class="text">
+                            <view class="round"></view>
+                            <span>{{item.status_text}}</span>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else class="empty-box">
+                <image :src="env_img_url+'/front/static/image/order-empty.png'"></image>
+                <span>暂无任何内容</span>
+            </view>
+            <app-load-text v-if="is_show_load"></app-load-text>
+            <view v-if="is_show_hint" class="hint">没有更多内容了哦</view>
+        </view>
+    </app-layout>
+</template>
+<script>
+import { mapState } from "vuex";
+
+export default {
+    name: 'index',
+   data() {
+        return {
+              env_img_url:this.$siteInfo.siteroot,
+            list: [],
+            page: 1,
+            is_show_load: false,
+            is_show_hint: false,
+        }
+    },
+    computed: {
+        ...mapState({
+            userInfo: state => state.user.info
+        })
+    },
+    methods: {
+         // #ifdef MP
+        liveClick(live) {
+            let userId = this.userInfo ? this.userInfo.options.user_id : 0;
+            let customParams = { user_id: userId }; // 开发者在直播间页面路径上携带自定义参数
+           
+            uni.navigateTo({
+                url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${live.roomid}&custom_params=${encodeURIComponent(JSON.stringify(customParams))}`
+            });
+        },
+        // #endif
+        getList() {
+            let self = this;
+            if (!self.is_show_load) {
+                self.$showLoading({
+                    text: '加载中...'
+                });
+            }
+            self.$request({
+                url: self.$api.live.index,
+                data: {
+                    page: self.page
+                }
+            }).then(response => {
+                self.$hideLoading();
+                self.is_show_load = false;
+                if (response.code === 0) {
+                    let { list } = response.data;
+                    if (self.page != 1) {
+                        self.list = self.list.concat(list);
+                    } else {
+                        self.list = list;
+                    }
+                    self.page = list.length ? self.page + 1 : self.page;
+                    if (list.length === 0 && self.list.length !== 0) {
+                        self.is_show_hint = true;
+                    }
+                } else {
+                    uni.showToast({
+                        title: response.msg,
+                        icon: 'none',
+                        duration: 1000,
+                    });
+                }
+            }).catch(() => {
+                self.is_show_load = false;
+                self.$hideLoading();
+            });
+        }
+    },
+    onLoad() { this.$commonLoad.onload();
+        this.getList();
+    },
+    onReachBottom() {
+        this.is_show_load = true;
+        this.is_show_hint = false;
+        this.getList()
+    },
+    // #ifdef MP
+    onShareAppMessage() {
+        return this.$shareAppMessage({
+            title: '直播列表',
+            path: '/pages/live/index',
+            params: {
+                user_id: this.userInfo ? this.userInfo.options.user_id : 0
+            }
+        });
+    }
+    // #endif
+}
+</script>
+<style scoped lang="scss">
+.list-box {
+    padding: 20#{rpx};
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .item {
+        width: 346#{rpx};
+        border-radius: 16#{rpx};
+        box-shadow: 0 0 10#{rpx} 1#{rpx} rgba(0, 0, 0, 0.1);
+        margin-bottom: 20#{rpx};
+        position: relative;
+        background: #ffffff;
+
+        .tag-box {
+            position: absolute;
+            top: 0;
+            left: 0;
+            display: flex;
+        }
+
+        .tag-box-1 {
+            .text {
+                background: #22ac38;
+            }
+
+            .text-time {
+                padding: 12#{rpx} 20#{rpx};
+                font-size: 24#{rpx};
+                color: #fff;
+                background: rgba(0, 0, 0, 0.5);
+                margin-left: -20rpx;
+                border-bottom-right-radius: 30#{rpx};
+                border-top-right-radius: 30#{rpx};
+                padding-left: 30#{rpx};
+            }
+        }
+
+        .tag-box-2 {
+            .text {
+                background: #777777;
+            }
+        }
+
+        .tag-box-3 {
+            .text {
+                background: #ff4544;
+            }
+
+            .live-icon {
+                width: 24#{rpx};
+                height: 24#{rpx};
+                margin-right: 12#{rpx};
+            }
+        }
+
+        .round {
+            width: 15#{rpx};
+            height: 15#{rpx};
+            background: #fff;
+            border-radius: 50%;
+            margin-right: 12#{rpx};
+
+        }
+
+        .text {
+            padding: 12#{rpx} 20#{rpx};
+            font-size: 26#{rpx};
+            border-top-left-radius: 16#{rpx};
+            border-top-right-radius: 30#{rpx};
+            border-bottom-right-radius: 30#{rpx};
+            z-index: 10;
+            color: #fff;
+            display: flex;
+            align-items: center;
+
+        }
+
+        .anchor-img-box {
+            width: 346#{rpx};
+            height: 346#{rpx};
+            border-radius: 16#{rpx};
+            position: relative;
+            overflow: hidden;
+
+            .anchor-img {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+            }
+
+            .play-icon {
+                width: 100#{rpx};
+                height: 100#{rpx};
+                position: absolute;
+                top: 123#{rpx};
+                left: 123#{rpx};
+
+            }
+
+            .subscribe-box {
+                position: absolute;
+                top: 153#{rpx};
+                left: 53#{rpx};
+            }
+        }
+
+        .room-info-box {
+            padding: 15#{rpx} 28#{rpx};
+
+            .name {
+                font-size: 28#{rpx};
+                color: #353535;
+                white-space: nowrap;
+                -ms-text-overflow: ellipsis;
+                text-overflow: ellipsis;
+                overflow: hidden;
+            }
+
+            .user-info-box {
+                display: flex;
+                align-items: center;
+                margin-top: 12#{rpx};
+
+                .anchor-img {
+                    width: 40#{rpx};
+                    height: 40#{rpx};
+                    -webkit-border-radius: 50%;
+                    -moz-border-radius: 50%;
+                    border-radius: 50%;
+                }
+
+                .anchor-name {
+                    width: 200#{rpx};
+                    font-size: 24#{rpx};
+                    color: #999999;
+                    margin-left: 12#{rpx};
+                    white-space: nowrap;
+                    -ms-text-overflow: ellipsis;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                }
+            }
+        }
+    }
+}
+
+.empty-box {
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+
+    image {
+        width: 280#{rpx};
+        height: 280#{rpx};
+    }
+
+    span {
+        margin-top: 15#{rpx};
+        color: #999;
+        font-size: 28#{rpx};
+    }
+}
+
+.hint {
+    font-size: 24#{rpx};
+    color: #999999;
+    text-align: center;
+    width: 100%;
+    margin-bottom: 15#{rpx};
+
+}
+</style>
\ No newline at end of file
diff --git a/pages/maidan/maidandetail.vue b/pages/maidan/maidandetail.vue
new file mode 100644
index 0000000..ac67fc6
--- /dev/null
+++ b/pages/maidan/maidandetail.vue
@@ -0,0 +1,104 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2">{{detail.ordernum}}</text>
+			</view>
+			<view class="item" v-if="mendian">
+				<text class="t1">付款门店</text>
+				<text class="t2">{{mendian.name}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款金额</text>
+				<text class="t2">￥{{detail.money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付金额</text>
+				<text class="t2" style="font-size:32rpx;color:#e94745">￥{{detail.paymoney}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">付款方式</text>
+				<text class="t2">{{detail.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">状态</text>
+				<text class="t2" v-if="detail.status==1" style="color:green">已付款</text>
+				<text class="t2" v-else style="color:red">未付款</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">付款时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice>0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2">-￥{{detail.disprice}}</text>
+			</view>
+			<view class="item" v-if="detail.scoredk>0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2">-￥{{detail.scoredk}}</text>
+			</view>
+			<view class="item" v-if="detail.couponrid">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2">-￥{{detail.couponmoney}}</text>
+			</view>
+			<view class="item" v-if="couponrecord">
+				<text class="t1">{{t('优惠券')}}名称</text>
+				<text class="t2">{{couponrecord.couponname}}</text>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			textset:{},
+      prodata: ''
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function (option) {
+			var that = this;
+			that.loading= true;
+			app.get('ApiMaidan/maidandetail', {id: that.opt.id}, function (res) {
+				that.loading= false;
+				that.textset = app.globalData.textset;
+				that.detail = res.detail;
+				that.couponrecord = res.couponrecord;
+				that.mendian = res.mendian;
+				that.loaded();
+			});
+		},
+  }
+};
+</script>
+<style>
+.orderinfo{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+</style>
\ No newline at end of file
diff --git a/pages/maidan/maidanlog.vue b/pages/maidan/maidanlog.vue
new file mode 100644
index 0000000..9801b35
--- /dev/null
+++ b/pages/maidan/maidanlog.vue
@@ -0,0 +1,117 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content" id="datalist">
+			<block v-for="(item, index) in datalist" :key="index"> 
+			<view class="item" @tap="goto" :data-url="'maidandetail?id=' + item.id">
+				<view class="f1">
+						<text class="t1">{{item.ordernum}}</text>
+						<text class="t2">支付时间：{{item.paytime}}</text>
+						<text class="t2">支付方式：{{item.paytype}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1">-￥{{item.money}}</text>
+				</view>
+			</view>
+			</block>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+			nodata:false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			this.nodata = false;
+			this.nomore = false;
+			this.loading = true;
+      app.post('ApiMaidan/maidanlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{flex:1;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+</style>
\ No newline at end of file
diff --git a/pages/maidan/pay.vue b/pages/maidan/pay.vue
new file mode 100644
index 0000000..7dde5a0
--- /dev/null
+++ b/pages/maidan/pay.vue
@@ -0,0 +1,324 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container">
+			<view class="info-box">
+				<view class="info-item">
+					<text class="t1">商户名称:</text>
+					<text class="t2">{{name}}</text>
+				</view>
+				<view class="info-item" v-if="mdlist.length>0">
+					<text class="t1">选择门店:</text>
+					<text class="t2" @tap="selectmd">{{mdlist[mdkey].name}}</text>
+				</view>
+				<view class="info-item">
+					<text class="t1">支付金额:</text>
+					<view class="t2 flex-y-center" style="justify-content:flex-end"><input type="digit" @input="inputMoney" value="" placeholder="请输入金额"></input> 元</view>
+				</view>
+			</view>
+			<view class="info-box">
+				<view class="dkdiv-item flex" v-if="userinfo.discount>0 && userinfo.discount<10">
+					<text class="f1">{{t('会员')}}折扣({{userinfo.discount*100/100}}折)</text>
+					<text class="f2" style="color: #e94745;">-￥{{disprice}}</text>
+				</view>
+				<view class="dkdiv-item flex">
+					<text class="f1">{{t('优惠券')}}</text>
+					<text class="f2" @tap="showCouponList" style="color:#e94745">{{couponrid!=0?couponList[couponkey].couponname:'请选择'+t('优惠券')}}</text>
+					<image class="f3" :src="event_rul + '/static/img/static/img/arrowright.png'"></image>
+				</view>
+				<view class="dkdiv-item flex">
+					<checkbox-group @change="scoredk" class="flex" style="width:100%">
+						<text class="f1">{{userinfo.score*1}} {{t('积分')}}可抵扣 <text style="color:#e94745">{{userinfo.dkmoney*1}}</text> 元</text>
+						<view class="f2">使用{{t('积分')}}抵扣
+							<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+						</view>
+					</checkbox-group>
+				</view>
+			</view>
+			<view class="info-box">
+				<view class="info-item">
+					<text class="t1">实付金额:</text>
+					<text class="t2">￥{{paymoney}}</text>
+				</view>
+			</view>
+			<view class="op">
+				<view class="btn" @tap="topay" :style="{background:t('color1')}">去支付</view>
+			</view>
+		</view>
+		<view v-if="couponvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+					<image :src="event_rul + '/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<couponlist :couponlist="couponList" :choosecoupon="true" :selectedrid="couponrid" @chooseCoupon="chooseCoupon"></couponlist>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		bid:0,
+		hiddenmodalput: true,
+		wxpayst:'',
+		alipay:'',
+		paypwd: '',
+		moneypay: '',
+		mdlist: "",
+		name: "",
+		userinfo: "",
+		couponList: [],
+		couponrid: 0,
+		coupontype: 1,
+		usescore: 0,
+		money: 0,
+		disprice: 0,
+		dkmoney: 0,
+		couponmoney: 0,
+		paymoney: 0,
+		mdkey: 0,
+		couponvisible: false,
+		couponkey: 0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+			
+		getdata: function () {
+			var that = this; //获取产品信息
+			that.loading = true;
+			app.get('ApiMaidan/maidan', {bid:that.bid}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg, function () {
+						app.goback();
+					});
+					return;
+				}
+				var userinfo = res.userinfo;
+				var couponList = res.couponList;
+				var mdlist = res.mdlist;
+				that.wxpayst = res.wxpayst;
+				that.alipay = res.alipay;
+				that.couponList = res.couponList;
+				that.mdlist = res.mdlist;
+				that.moneypay = res.moneypay;
+				that.name = res.name;
+				that.userinfo = res.userinfo;
+				that.loaded();
+
+				if (mdlist.length > 0) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						var speed = res.speed;
+						var accuracy = res.accuracy;
+
+						for (var i in mdlist) {
+							mdlist[i].juli = that.GetDistance(latitude, longitude, mdlist[i].latitude, mdlist[i].longitude);
+						}
+
+						mdlist = mdlist.sort(that.compare('juli'));
+						console.log(mdlist);
+						that.mdlist = mdlist;
+					});
+				}
+			});
+		},
+    modalinput: function () {
+      this.$refs.dialogInput.open()
+    },
+    //选择门店
+    selectmd: function (e) {
+      var that = this;
+      var itemlist = [];
+      var mdlist = this.mdlist;
+      for (var i = 0; i < mdlist.length; i++) {
+        itemlist.push(mdlist[i].name + (mdlist[i].juli ? ' 距离:' + mdlist[i].juli + '千米' : ''));
+      }
+      uni.showActionSheet({
+        itemList: itemlist,
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						that.mdkey = res.tapIndex;
+					}
+        }
+      });
+    },
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    inputMoney: function (e) {
+      console.log(e);
+      var money = e.detail.value;
+      if (!money) money = 0;
+      var money = parseFloat(money);
+      if (money <= 0) money = 0;
+      this.money = money;
+      this.calculatePrice();
+    },
+    cancel: function () {
+      this.hiddenmodalput = true;
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var money = parseFloat(that.money); //+商品总价
+      if (that.userinfo.discount > 0 && that.userinfo.discount < 10) {
+        var disprice = Math.round(money * (1 - 0.1 * that.userinfo.discount) * 100) / 100; //-会员折扣
+      } else {
+        var disprice = 0;
+      }
+      if (that.usescore) {
+        var dkmoney = parseFloat(that.userinfo.dkmoney); //-积分抵扣
+      } else {
+        var dkmoney = 0;
+      }
+      var couponmoney = parseFloat(that.couponmoney); //-优惠券抵扣 
+      var paymoney = money - disprice - couponmoney - dkmoney; // 商品金额 - 会员折扣 - 优惠券抵扣 - 积分抵扣
+      if (paymoney < 0) paymoney = 0;
+      paymoney = paymoney.toFixed(2);
+      that.paymoney = paymoney;
+      that.disprice = disprice;
+    },
+    chooseCoupon: function (e) {
+			var couponrid = e.rid;
+      var couponkey = e.key;
+
+      if (couponrid == this.couponrid) {
+        this.couponkey = 0;
+        this.couponrid = 0;
+        this.coupontype = 1;
+        this.couponmoney = 0;
+        this.couponvisible = false;
+      } else {
+        var couponList = this.couponList;
+        var couponmoney = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        if (coupontype == 4) {
+          couponmoney = this.freightprice;
+        }
+        this.couponkey = couponkey;
+        this.couponrid = couponrid;
+        this.coupontype = coupontype;
+        this.couponmoney = couponmoney;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+    },
+    topay: function (e) {
+      var that = this;
+      var money = that.money;
+      var couponrid = that.couponrid;
+      var usescore = that.usescore;
+
+      if (that.mdlist.length > 0) {
+        var mdid = that.mdlist[that.mdkey].id;
+      } else {
+        var mdid = 0;
+      }
+			app.post('ApiMaidan/maidan', {bid:that.bid,money: money,couponrid: couponrid,usescore: usescore,mdid: mdid}, function (res) {
+				if (res.status == 0) {
+					app.error(res.msg);
+					return;
+				}
+				app.goto('/pages/pay/pay?id='+res.payorderid);
+			});
+    },
+    showCouponList: function () {
+      this.couponvisible = true;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+    },
+    GetDistance: function (lat1, lng1, lat2, lng2) {
+      var radLat1 = lat1 * Math.PI / 180.0;
+      var radLat2 = lat2 * Math.PI / 180.0;
+      var a = radLat1 - radLat2;
+      var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+      var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+      s = s * 6378.137; // EARTH_RADIUS;
+      s = Math.round(s * 100) / 100;
+      return s;
+    },
+    compare: function (property) {
+      return function (a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value1 - value2;
+      };
+    }
+  }
+}
+</script>
+<style>
+.info-box{width:94%;margin:0 3%;margin-top:30rpx;border-radius:16rpx;overflow:hidden;padding:0 20rpx;background: #fff;}
+.info-item{ display:flex;align-items:center;width: 100%; padding: 0 3%;  border-bottom: 1px #f3f3f3 solid;}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx; height: 120rpx; line-height: 120rpx; color: #000; }
+.info-item .t2{ height: 120rpx;line-height: 120rpx; color: #000;text-align:right;flex:1;font-size:30rpx}
+.info-item .t2 input{height:80rpx;line-height:80rpx;border:1px solid #f5f5f5;padding:0 5px;width:240rpx;font-size:32rpx;margin-right:10rpx}
+
+.dkdiv{margin-top:20rpx}
+.dkdiv-item{ width: 100%; padding:30rpx 3%; background: #fff;border-top:1px #ededed dashed;}
+.dkdiv-item:first-child{border-top:0}
+.dkdiv-item .f1{ }
+.dkdiv-item .f2{ text-align:right;flex:1}
+.dkdiv-item .f3{ width: 40rpx; height: 40rpx;}
+
+.fpay-btn{ width: 90%; margin: 0 5%; height: 80rpx; line-height: 80rpx; margin-top: 40rpx; float: left; border-radius: 10rpx; color: #fff; background: #1aac19; border: none; font-size: 30rpx; }
+.fpay-btn2{ width: 90%; margin: 0 5%; height: 80rpx; line-height: 80rpx; margin-top: 20rpx; float: left; border-radius: 10rpx; color: #fff; background: #e2cc05; border: none; font-size: 30rpx; }
+
+.mendian{width:90%; line-height: 60rpx;border-radius: 10rpx;padding:30rpx 5%;height:800rpx;overflow-y: scroll;border: none;border-radius:5px; -webkit-animation-duration: .5s; animation-duration: .5s;}
+.mendian label{display: flex;align-items: center;border-bottom: 1px solid #f5f5f5;padding: 20rpx 0;color:#333}
+.mendian input{margin-right: 10rpx}
+.submit{ text-align: center}
+.mendian button{ padding: 20rpx 60rpx;border-radius:40rpx;border: 0;margin-top:20rpx;color: #fff; background: #31C88E }
+
+.i-as{position:fixed;width:100%;box-sizing:border-box;left:0;right:0;bottom:0;background:#f7f7f8;transform:translate3d(0,100%,0);transform-origin:center;transition:all .2s ease-in-out;z-index:900;visibility:hidden}
+.i-as-show{transform:translate3d(0,0,0);visibility:visible}
+.i-as-mask{position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.7);z-index:900;transition:all .2s ease-in-out;opacity:0;visibility:hidden}
+.i-as-mask-show{opacity:1;visibility:visible}
+.i-as-header{background:#fff;text-align:center;position:relative;font-size:30rpx;color:#555;height:80rpx;line-height:80rpx}
+.i-as-header::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;transform:scale(.5);transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e9eaec;border-bottom-width:1px}
+.i-as-cancel{margin-top:20rpx}
+.i-as-cancel button{ border:0}
+.i-as-cancel button::after {border: 0;} 
+.i-as-content{ height:700rpx;width:710rpx;margin:20rpx;}
+
+
+.op{width:96%;margin:20rpx 2%;display:flex;align-items:center;margin-top:40rpx}
+.op .btn{flex:1;height:100rpx;line-height:100rpx;background:#07C160;width:90%;margin:0 10rpx;border-radius:10rpx;color: #fff;font-size:28rpx;font-weight:bold;display:flex;align-items:center;justify-content:center}
+.op .btn .img{width:48rpx;height:48rpx;margin-right:20rpx}
+</style>
\ No newline at end of file
diff --git a/pages/my/about.vue b/pages/my/about.vue
new file mode 100644
index 0000000..2c64085
--- /dev/null
+++ b/pages/my/about.vue
@@ -0,0 +1,34 @@
+<template>
+	<view style="text-align: center;margin-top: 25%;font-size: 30rpx;">
+		{{info.address}}
+	</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+	data() {
+	return {
+			info: [],
+		}
+	},
+	onLoad: function (opt) {
+		this.getdata(); 
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			app.get('ApiMy/getWebinfo',{},function (data){
+				if(data){
+					that.info=data
+				}
+			});
+		},
+
+	}
+	
+}
+</script>
+
+<style>
+</style>
diff --git a/pages/my/favorite.vue b/pages/my/favorite.vue
new file mode 100644
index 0000000..99e7e35
--- /dev/null
+++ b/pages/my/favorite.vue
@@ -0,0 +1,130 @@
+<template>
+<view class="container">
+	<view v-for="(item, index) in datalist" :key="index" class="item">
+		<view :data-url="(item.type=='shop'?'/pages/':'/activity/')+ item.type + '/product?id=' + item.proid" @tap="goto" class="product-item2">
+			<view class="product-pic">
+					<image :src="item.product.pic" mode="widthFix"></image>
+			</view> 
+			<view class="product-info" v-if="item.type == 'scoreshop'">
+				<view class="p1">{{item.product.name}}</view>
+					<view class="p2">
+								<text class="t1" :style="{color:t('color1')}">{{item.product.score_price}}{{t('积分')}}</text>
+								<text class="t2">市场价￥{{item.product.sell_price}}</text>
+					</view>
+					<view class="p3">
+							<text class="t1" v-if="item.product.sales>0">已兑换<text style="font-size:24rpx;color:#f40;padding:0 2rpx;">{{item.product.sales}}</text>件</text>
+							<text class="t2" v-else-if="item.product.sellpoint">{{item.product.sellpoint}}</text>
+					</view>
+			</view>
+			<view class="product-info" v-else>
+					<view class="p1">{{item.product.name}}</view>
+					<view class="p2">
+								<text class="t1" :style="{color:t('color1')}"><text style="font-size:22rpx">￥</text>{{item.type=='kecheng'?item.product.price:item.product.sell_price}}</text>
+								<text class="t2" v-if="item.product.market_price*1 > item.product.sell_price*1">￥{{item.product.market_price}}</text>
+					</view>
+					<view class="p3">
+							<text class="t1" v-if="item.product.sales>0">已售<text style="font-size:24rpx;color:#f40;padding:0 2rpx;">{{item.product.sales}}</text>件</text>
+							<text class="t2" v-else-if="item.product.sellpoint">{{item.product.sellpoint}}</text>
+					</view>
+			</view>
+		</view>
+		<view class="foot">
+			<text class="flex1">收藏时间：{{item.createtime}}</text>
+			<text class="btn" @tap="favoritedel" :data-id="item.id">取消收藏</text>
+		</view>
+	</view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      datalist: [],
+      pagenum: 1,
+			nodata:false,
+      nomore: false
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.pagenum = 1;
+		this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+    getdata: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nomore = false;
+			that.nodata = false;
+      app.post('ApiMy/favorite', {pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    favoritedel: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.post('ApiMy/favoritedel', {id: id}, function (data) {
+        app.success(data.msg);
+        setTimeout(function () {
+          that.onLoad();
+        }, 1000);
+      });
+    }
+  }
+};
+</script>
+<style>
+.item{ width:94%;margin:0 3%;padding:0 20rpx;background:#fff;margin-top:20rpx;border-radius:20rpx}
+.product-item2 {display:flex;padding: 20rpx 0;border-bottom:1px solid #E6E6E6}
+.product-item2 .product-pic {width: 180rpx;height: 180rpx; background: #ffffff;overflow:hidden}
+.product-item2 .product-pic image{width: 100%;height:100%;}
+.product-item2 .product-info {flex:1;padding: 5rpx 10rpx;}
+.product-item2 .product-info .p1 {word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: block;height: 80rpx;line-height: 40rpx;font-size: 30rpx;color:#111111}
+.product-item2 .product-info .p2{font-size: 32rpx;height:40rpx;line-height: 40rpx}
+.product-item2 .product-info .p2 .t2 {margin-left: 10rpx;font-size: 26rpx;color: #888;text-decoration: line-through;}
+.product-item2 .product-info .p3{font-size: 24rpx;height:50rpx;line-height:50rpx;overflow:hidden}
+.product-item2 .product-info .p3 .t1{color:#aaa;font-size:24rpx}
+.product-item2 .product-info .p3 .t2{color:#888;font-size:24rpx;}
+.foot{ display:flex;align-items:center;width:100%;height:100rpx;line-height:100rpx;color:#999999;font-size:24rpx;}
+.foot .btn{ padding:2rpx 10rpx;height:50rpx;line-height:50rpx;color:#FF4C4C}
+</style>
\ No newline at end of file
diff --git a/pages/my/history.vue b/pages/my/history.vue
new file mode 100644
index 0000000..7a691ee
--- /dev/null
+++ b/pages/my/history.vue
@@ -0,0 +1,655 @@
+<template>
+	<view class="container">
+		<view class="sizer flex al-item-center" @click="showTimSe = !showTimSe">
+			<text class="iconfont icon-xia"></text>
+			<text :style="{color: t('color1')}" style="font-size: 24rpx;">{{timeTex}}</text>
+		</view>
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view :data-url="(item.type=='shop'?'/pages/':'/activity/')+ item.type + '/product?id=' + item.proid"
+				@tap="goto" class="product-item2">
+				<view class="product-pic">
+					<image :src="item.product.pic" mode="widthFix"></image>
+				</view>
+				<view class="product-info" v-if="item.type == 'scoreshop'">
+					<view class="p1">{{item.product.name}}</view>
+					<view class="p3">
+						<text class="t1" v-if="item.product.sales>0">已兑换{{item.product.sales}}件</text>
+						<text class="t2" v-else-if="item.product.sellpoint">{{item.product.sellpoint}}</text>
+					</view>
+					<view class="p2">
+						<text class="t1" :style="{color:t('color1')}">{{item.product.score_price}}{{t('积分')}}</text>
+						<text class="t2">市场价￥{{item.product.sell_price}}</text>
+					</view>
+				</view>
+				<view class="product-info" v-else>
+					<view class="p1">{{item.product.name}}</view>
+					<view class="p3">
+						<text class="t1" v-if="item.product.sales>0">已售{{item.product.sales}}件</text>
+						<text class="t2" v-else-if="item.product.sellpoint">{{item.product.sellpoint}}</text>
+					</view>
+					<view class="p2">
+						<text class="t1" :style="{color:t('color1')}"><text
+								style="font-size:24rpx">￥</text>{{item.product.sell_price}}</text>
+						<text class="t2"
+							v-if="item.product.market_price*1 > item.product.sell_price*1">￥{{item.product.market_price}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="foot">
+				<text class="flex1">浏览时间：{{item.createtime}}</text>
+				<text class="btn" @tap="favoritedel" :data-id="item.proid" :data-type="item.type">删除</text>
+			</view>
+		</view>
+		<view class="selTim-box bg-color-white border-rius-5" v-show="showTimSe">
+			<view class="conm-time-slt ">
+				<view class="flex flex-w j-between">
+					<block v-for="(item, ndx) in timeTexList" :key="ndx">
+						<view  :style="timeTexIndx == ndx ? (item.name == '重置'?'':'background: #E2F7EF;color:' + t('color1')) :''" class="tet-l border-rius-5" @click="selcTimTxe(item, ndx)">{{item.name}}</view>
+					</block>
+				</view>
+					<uni-section
+							:title="'日期范围用法：' + '[' + range + ']'"
+							type="line"
+						></uni-section>
+					<view class="example-body" style="margin-top: 30rpx;">
+							<uni-datetime-picker
+							@chang="submit"
+								v-model="range"
+								type="daterange"
+								rangeSeparator="-"
+							/>
+						</view>
+			</view>
+		</view>
+		
+
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata" text="暂无足迹"></nodata>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+		<popmsg ref="popmsg"></popmsg>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+
+</template>
+
+<script>
+	var app = getApp();
+	// import mrCalendar from '@/components/mr-calendar/mr-calendar';
+	export default {
+		components: {
+			// mrCalendar
+		},
+		data() {
+			return {
+				range:'',
+                timeTex:'',
+				timeTexIndx: 0,
+				stime: '',
+				etime: '',
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+				timeTexList: [],
+				datalist: [],
+				pagenum: 1,
+				nomore: false,
+				nodata: false,
+
+				showTimSe: false, // 选项弹框
+				timeDate: false,
+				drawer: true,
+				show: false,
+			};
+		},
+
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+			this.setTime();
+			this.timeTex = this.timeTexList[0].stime.substr(0,10) +" 至 "+ this.timeTexList[0].etime.substr(0,10)
+			this.stime = this.timeTexList[0].stime.substr(0,10)
+			this.etime = this.timeTexList[0].etime.substr(0,10)
+			this.range = [this.stime,this.etime]
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		onReachBottom: function() {
+			if (!this.nodata && !this.nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getdata(true);
+			}
+		},
+			watch: {
+					datetimesingle(newval) {
+						console.log("单选:", this.datetimesingle);
+					},
+					range(newval) {
+						console.log("范围选1:", this.range);
+						this.submit(this.range)
+					},
+					datetimerange(newval) {
+						console.log("范围选:2", this.datetimerange);
+					},
+				},
+		methods: {
+
+			setTime() {
+		        let arr = []
+				let year = new Date().getFullYear();
+				let month = new Date().getMonth() + 1;
+
+				arr.push(this.timeHandle(year,month));
+				arr[0].name = "本月";
+				
+				var pre_month;
+				var pre_year;
+				if((month-1) == 0) {
+					pre_month = 12;
+					pre_year = year - 1;
+				} else {
+					pre_month = month - 1;
+					pre_year = year;
+				}
+				arr.push(this.timeHandle(pre_year,pre_month));
+				arr[1].name = "上月";
+
+				arr.push({name:'今年',stime: year + '-01-01',etime: year + '-12-31' });
+				arr.push({name:'去年',stime: (year-1) + '-01-01',etime: (year-1) + '-12-31' });
+					arr.push({name:'重置',stime:'',etime:'' })
+					this.timeTexList = arr
+			},
+			timeHandle(year,month) {
+				let day = new Date(year,month,0).getDate(); // 最后一天
+				month = month < 10 ? '0' + month : month;
+
+				let stime = [year,month,'01'].join('-')
+				let etime = [year,month,day].join('-')
+
+				let time = {name: '',stime: stime,etime: etime};
+				return time;
+			},
+
+			reset() {
+				this.stime = '';
+				this.etime = '';
+				this.pagenum = 1;
+				this.getdata()
+			},
+			submit(e) {
+				if(e.length < 2 && e.length > 0) {
+					uni.showModal({
+							title: '提示',
+							content: '请选择结束时间',
+							showCancel: false
+					})
+				 setTimeout(()=>{
+					 this.timeDate = true
+					 this.show = true
+				 },100)
+					return
+				}
+				this.timeTex = e[0] + ' 至 ' + e[1]
+				this.stime = e[0]+' 00:00:00'
+				this.etime = e[1]+' 23:59:59'
+				this.showTimSe = false;
+				this.pagenum = 1;
+				this.getdata()
+			},
+			calclick(e) {
+				console.log(e, 'calclick')
+			},
+
+			selcTimTxe(item, num) {
+				if(item.name == '重置') {
+					this.timeTexIndx = 0
+					this.timeTex = this.timeTexList[0].stime.substr(0,10) +" 至 "+ this.timeTexList[0].etime.substr(0,10);
+					this.stime = this.timeTexList[0].stime.substr(0,10)
+					this.etime = this.timeTexList[0].etime.substr(0,10);
+					this.range = [this.timeTexList[0].stime.substr(0,10),this.timeTexList[0].etime.substr(0,10)]
+				}else {
+					this.timeTexIndx = num
+					this.timeTex = item.stime.substr(0,10) +" 至 "+ item.etime.substr(0,10);
+					this.stime = item.stime;
+					this.etime = item.etime;
+					this.range = [item.stime.substr(0,10),item.etime.substr(0,10)]
+				}
+				this.pagenum = 1;
+				this.datalist = [];
+				this.showTimSe = false
+				this.pagenum = 1;
+				// this.getdata()
+			},
+			disabledDate() {
+				return false
+			},
+			dateShow() {
+				this.timeDate = true
+				this.show = true
+			},
+			getdata: function(loadmore) {
+				if (!loadmore) {
+					this.pagenum = 1;
+					this.datalist = [];
+				}
+				var that = this;
+				var pagenum = that.pagenum;
+				var st = that.st;
+				that.nodata = false;
+				that.nomore = false;
+				that.loading = true;
+				app.post('ApiMy/history', {
+					st: st,
+					endTime: this.etime,
+					startTime: this.stime,
+					pagenum: pagenum
+				}, function(res) {
+					that.loading = false;
+					var data = res.data;
+					if (pagenum == 1) {
+						that.datalist = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+						that.loaded();
+					} else {
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var datalist = that.datalist;
+							var newdata = datalist.concat(data);
+							that.datalist = newdata;
+						}
+					}
+				});
+			},
+			favoritedel: function(e) {
+				var that = this;
+				var proid = e.currentTarget.dataset.id;
+				var type = e.currentTarget.dataset.type;
+				uni.showActionSheet({
+					itemList: ['删除该项', '清空全部'],
+					success: function(res) {
+						if (res.tapIndex >= 0) {
+							if (res.tapIndex == 1) {
+								proid = 'all';
+							}
+							app.post('ApiMy/historydel', {
+								proid: proid,
+								type: type
+							}, function(data) {
+								app.success(data.msg);
+								setTimeout(function() {
+									that.getdata();
+								}, 1000);
+							});
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+<style lang="scss">
+.container {
+	background: #F5F5F5;
+	padding-top: 86rpx;
+}
+	.btn_box {
+		width: 100%;
+		margin-top: 20rpx;
+		display: flex;
+
+		// flex-direction: row-reverse;
+		// justify-content: space-between;
+		.btn {
+			// display: inline-block;
+			background-color: #efbe70;
+			color: #ffff;
+			height: 50rpx;
+			width: 116rpx;
+			border-radius: 8rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			// margin: 0;
+		}
+	}
+
+	.sizer {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		padding: 28rpx 24rpx 24rpx;
+		display: flex;
+		align-items: center;
+		color: #999;
+		background: #F5F5F5;
+		display: flex;
+		flex-direction: row-reverse;
+		.icon-xia {
+			font-size: 26rpx;
+			color: #333333;
+			position: static;
+		}
+
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.flex1 {
+		flex: 1;
+	}
+
+	.j-center {
+		justify-content: center;
+	}
+
+	.j-between {
+		justify-content: space-between;
+	}
+
+	.j-around {
+		justify-content: space-around;
+	}
+
+	.j-evenly {
+		justify-content: space-evenly;
+	}
+
+	.flex-colum {
+		flex-direction: column;
+	}
+
+	.flex-w {
+		flex-wrap: wrap;
+	}
+
+	.al-item-center {
+		align-items: center;
+	}
+
+	.font-w {
+		font-weight: bold;
+	}
+
+	.fs12 {
+		font-size: 24rpx;
+	}
+
+	.color-gray {
+		color: #999;
+	}
+
+	.color-white {
+		color: #fff;
+	}
+
+	.bg-color-white {
+		background-color: #fff;
+	}
+
+	.border-rius-r {
+		border-radius: 800rpx;
+	}
+
+	.border-rius-5 {
+		border-radius: 10rpx;
+	}
+
+	.border-rius-10 {
+		border-radius: 20rpx;
+	}
+
+	.overflow-hd {
+		overflow: hidden;
+	}
+
+	.text-overflow-tx {
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+	}
+
+	.text-overflow-line {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		word-wrap: break-word;
+		word-break: break-all;
+	}
+
+	.myBalance-contx-h-title {
+		height: 80rpx;
+		padding: 20rpx 0;
+
+		.my-interest-h-title-tx {
+			padding: 0 10rpx;
+			position: relative;
+		}
+
+		.actives {
+			width: 100%;
+			height: 6rpx;
+			display: block;
+			position: absolute;
+			border-radius: 2rpx;
+			bottom: -10rpx;
+			left: 0;
+			// background-color: #EFBD6F;
+		}
+	}
+
+	.myBalance-contx-box {
+		padding: 0 20rpx 20rpx;
+		width: 100%;
+		height: calc(100vh - 80rpx);
+		position: relative;
+
+		.myBalance-contx-box-h {
+			padding: 20rpx;
+			width: 100%;
+			height: 170rpx;
+			position: fixed;
+			left: 0;
+			background-color: #f6f6f6;
+			z-index: 22;
+
+			.box-h-t:first-child {
+				margin-left: 0;
+			}
+
+			.box-h-t {
+				width: 130rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				margin-left: 26rpx;
+			}
+		}
+
+		.contx-h-2 {
+			height: 80rpx;
+		}
+
+		.myBalance-contx-box-t {
+			padding: 20rpx;
+			box-shadow: 0 0 10rpx 0 #efefef;
+			margin-top: 30rpx;
+		}
+
+		.myBalance-contx-box-t:first-child {
+			margin-top: 0;
+		}
+
+		.myBalance-contx-tx {
+			padding: 20rpx;
+			box-shadow: 0 0 10rpx 0 #efefef;
+			margin-top: 30rpx;
+
+			.cosu-img {
+				width: 120rpx;
+				height: 120rpx;
+			}
+
+			.pt-txt {
+				padding-top: 6rpx;
+			}
+		}
+	}
+
+	// 弹框
+	.conm-time-slt {
+		padding: 40rpx 24rpx 32rpx;
+
+		.tet-l {
+			width: 158rpx;
+			height: 56rpx;
+			line-height: 56rpx;
+			text-align: center;
+			background-color: #F7F7F7;
+			margin-bottom: 24rpx;
+			color: #666666;
+			font-size: 28rpx;
+		}
+
+		.cus-time {
+			width: 190rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			margin-top: 40rpx;
+		}
+	}
+
+	.selTim-box {
+		position: fixed;
+		top: 86rpx;
+		left: 0;
+		right: 0;
+		z-index: 3;
+		border-radius: 0 0 12rpx 12rpx;
+
+		.he-t {
+			width: 16rpx;
+			height: 2rpx;
+			margin-top: 30rpx;
+			background-color: #ccc;
+		}
+	}
+
+	.teitDate {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background-color: rgba(0, 0, 0, .4);
+		z-index: 888;
+	}
+
+	.item {
+		margin: 0 24rpx 24rpx;
+		padding: 0 24rpx;
+		background: #fff;
+		border-radius: 12rpx;
+	}
+
+	.product-item2 {
+		display: flex;
+		padding: 28rpx 0 36rpx;
+		border-bottom: 1px solid #F4F4F4;
+	}
+
+	.product-item2 .product-pic {
+		width: 168rpx;
+		height: 168rpx;
+		border-radius: 12rpx;
+		overflow: hidden;
+		flex-shrink: 0;
+	}
+
+	.product-item2 .product-pic image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.product-item2 .product-info {
+		flex: 1;
+		margin-left: 24rpx;
+	}
+
+	.product-item2 .product-info .p1 {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		/* autoprefixer: ignore next */
+		-webkit-box-orient: vertical;
+		text-align: justify;
+		white-space: pre-wrap;
+		word-break: break-all;
+		height: 72rpx;
+		line-height: 36rpx;
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	.product-item2 .product-info .p2 {
+		font-size: 36rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		margin-top: 4rpx;
+	}
+
+	.product-item2 .product-info .p2 .t2 {
+		margin-left: 10rpx;
+		font-size: 26rpx;
+		color: #888;
+		text-decoration: line-through;
+	}
+
+	.product-item2 .product-info .p3 {
+		font-size: 24rpx;
+		height: 34rpx;
+		line-height: 34rpx;
+		margin-top: 10rpx;
+	}
+
+	.product-item2 .product-info .p3 .t1 {
+		color: #aaa;
+		font-size: 24rpx
+	}
+
+	.product-item2 .product-info .p3 .t2 {
+		color: #888;
+		font-size: 24rpx;
+	}
+
+	.foot {
+		display: flex;
+		align-items: center;
+		color: #999999;
+		font-size: 24rpx;
+		line-height: 34rpx;
+		padding: 20rpx 0 24rpx;
+	}
+	.foot .btn {
+		min-width: 84rpx;
+		box-sizing: border-box;
+		color: #FFFFFF;
+		text-align: center;
+		padding: 0 10rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: #EB5330;
+		border-radius: 8rpx;
+	}
+</style>
diff --git a/pages/my/levelinfo.vue b/pages/my/levelinfo.vue
new file mode 100644
index 0000000..251912e
--- /dev/null
+++ b/pages/my/levelinfo.vue
@@ -0,0 +1,99 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topbg" :style="'background:url(' + pre_url + '/static/img/lv-topbg.png) no-repeat;background-size:100%'">
+			<view class="topinfo" :style="'background:url(' + pre_url + '/static/img/lv-top.png);background-size:100%'">
+				<image :src="userinfo.headimg" background-size="cover" class="headimg"></image>
+				<view class="info">
+					<view class="nickname">{{userinfo.nickname}}</view>
+					<view class="flex">
+						<view class="user-level">
+							<image class="level-img" :src="userlevel.icon" v-if="userlevel.icon"></image>
+							<view class="level-name">{{userlevel.name}}</view>
+						</view>
+					</view>
+					<view class="endtime" v-if="userinfo.levelendtime > 0">到期时间：{{date(userinfo.levelendtime,'Y年m月d日')}}</view>
+					<view class="endtime" v-if="userlevel.areafenhong == 1 && userinfo.province">代理区域：{{userinfo.province}}</view>
+					<view class="endtime" v-if="userlevel.areafenhong == 2 && userinfo.province && userinfo.city">代理区域：{{userinfo.province}},{{userinfo.city}}</view>
+					<view class="endtime" v-if="userlevel.areafenhong == 3 && userinfo.province && userinfo.city && userinfo.area">代理区域：{{userinfo.province}},{{userinfo.city}},{{userinfo.area}}</view>
+				</view>
+				<view class="set" @tap="goto" data-url="set"><text class="fa fa-cog"></text></view>
+			</view>
+			<view class="upbtn" :style="'background:url(' + pre_url + '/static/img/lv-upbtn.png) no-repeat;background-size:100%'" @tap="goto" :data-url="opt.id ? 'levelup?id='+opt.id : 'levelup'">我要升级</view>
+		</view>
+		<view style="width:100%;height:20rpx;background-color:#f6f6f6"></view>
+
+		<view class="explain">
+			<view class="f1"> — 等级特权 — </view>
+			<view class="f2">
+				<parse :content="userlevel.explain" />
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      userinfo: [],
+      userlevel: [],
+      sysset: [],
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiMy/levelinfo', {id:that.opt.id}, function (res) {
+				that.loading = false;
+				if (res.userinfo) {
+					that.userinfo = res.userinfo;
+					that.userlevel = res.userlevel;
+					that.show = true;
+				}
+				that.loaded();
+			});
+		},
+  }
+};
+</script>
+<style>
+page{background:#fff}
+.topbg{width:100%;display:flex;flex-direction:column;align-items:center;padding-bottom:30rpx}
+.topinfo{margin-top:70rpx;width:670rpx;height:270rpx;padding:60rpx 50rpx;display:flex;justify-content:center;position:relative}
+.topinfo .headimg{width:120rpx;height:120rpx;border-radius:50%;}
+.topinfo .info{display:flex;flex:auto;flex-direction:column;padding-left:20rpx;height:120rpx;}
+.topinfo .info .nickname{font-size:36rpx;font-weight:bold;color:#fff;margin-bottom:10rpx}
+.topinfo .info .endtime{color:#fff;font-size:24rpx;margin-top:20rpx}
+.topinfo .set{position:absolute;top:30rpx;right:40rpx;width:70rpx;height:70rpx;line-height:70rpx;font-size:50rpx;text-align:center;color:#fff}
+
+.topbg .upbtn{margin-top:10rpx;width:660rpx;height:110rpx;line-height:90rpx;text-align:center;color:#fff;font-size:32rpx;}
+
+.user-level{color:#b48b36;background-color:#ffefd4;margin-top:4rpx;width:auto;height:36rpx;border-radius:18rpx;padding:0 20rpx;display:flex;align-items:center}
+.user-level .level-img {width:32rpx;height:32rpx;margin-right:6rpx;margin-left:-14rpx;border-radius:50%}
+.user-level .level-name {font-size:24rpx;}
+
+.explain{ width:100%;margin:20rpx 0;}
+.explain .f1{width:100%;text-align:center;font-size:30rpx;color:#333;font-weight:bold;height:50rpx;line-height:50rpx}
+.explain .f2{padding:20rpx;background-color:#fff}
+
+</style>
\ No newline at end of file
diff --git a/pages/my/levelup.vue b/pages/my/levelup.vue
new file mode 100644
index 0000000..230f13d
--- /dev/null
+++ b/pages/my/levelup.vue
@@ -0,0 +1,457 @@
+<template>
+<view class="container">
+	<block v-if="errmsg=='' && isload">
+		<image :src="pre_url + '/static/img/lv-upbanner.png'" class="banner" mode="widthFix"></image>
+		
+		<view class="contentbox">
+			<view class="title">欢迎加入{{sysset.name}}</view>
+			<view class="title">您的当前等级：<text style="font-weight:bold">{{userlevel.name}}</text></view>
+		</view>
+		<form @submit="formSubmit">
+		<view class="contentbox">
+			<view class="form-item1" v-if="aglevelCount>0">
+				 <view class="panel">请选择升级等级：</view>
+				 <radio-group @change="changelevel" name="levelid">
+				 <block v-for="(item, idx) in aglevelList" :key="idx">
+				 <label class="radio-item">
+						<view class="flex1"><text style="font-weight:bold">{{item.name}}</text></view>
+						<!-- <text>{{item.apply_paymoney>0 ? '加盟费'+item.apply_paymoney+'元':''}}</text> -->
+						<radio :value="item.id+''"></radio>
+				 </label>
+				 </block>
+				 </radio-group>
+			</view>
+			<view v-else class="noup"><text class="fa fa-check"></text> 您已达到最高可升级级别</view>
+		</view>
+		<view class="contentbox" v-if="selectedLevel.can_apply==1 && selectedLevel.id!=userinfo.levelid">
+			<view class="applytj">
+				<view class="f1">
+					<text>{{selectedLevel.name}}</text>
+					<text class="t2">申请条件：</text>
+				</view>
+				<view class="f2">
+					<view class="t1" v-if="selectedLevel.applytj!=''">{{selectedLevel.applytj}}</view>
+					<view class="t2" v-if="selectedLevel.apply_paymoney>0">{{selectedLevel.apply_paytxt}}：￥{{selectedLevel.apply_paymoney}}</view>
+					<view class="t3" v-if="selectedLevel.applytj_reach==0">您暂未达到申请条件，请继续努力！</view>
+					<view class="t4" v-if="selectedLevel.applytj_reach==1"><text v-if="selectedLevel.applytj!=''">您已达到申请条件，</text>请填写申请资料</view>
+				</view>
+			</view>
+			<view class="applydata" v-if="selectedLevel.applytj_reach==1">
+				<view style="display:none">{{test}}</view>
+				<view class="form-item" v-for="(item,idx) in selectedLevel.apply_formdata" :key="item.id">
+					<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+					<block v-if="item.key=='input'">
+						<input type="text" :name="'form'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='textarea'">
+						<textarea :name="'form'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+					</block>
+					<block v-if="item.key=='radio'">
+						<radio-group class="flex" :name="'form'+idx" style="flex-wrap:wrap">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+									<radio class="radio" :value="item1"/>{{item1}}
+							</label>
+						</radio-group>
+					</block>
+					<block v-if="item.key=='checkbox'">
+						<checkbox-group :name="'form'+idx" class="flex" style="flex-wrap:wrap">
+							<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+								<checkbox class="checkbox" :value="item1"/>{{item1}}
+							</label>
+						</checkbox-group>
+					</block>
+					<block v-if="item.key=='selector'">
+						<picker class="picker" mode="selector" :name="'form'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx] || editorFormdata[idx]===0"> {{item.val2[editorFormdata[idx]]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+					</block>
+					<block v-if="item.key=='time'">
+						<picker class="picker" mode="time" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+					</block>
+					<block v-if="item.key=='date'">
+						<picker class="picker" mode="date" :name="'form'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view>
+							<view v-else>请选择</view>
+						</picker>
+					</block>
+
+					<block v-if="item.key=='region'">
+						<uni-data-picker :localdata="items" popup-title="请选择省市区" @change="onchange" styleData="width:100%"></uni-data-picker>
+						<!-- <picker class="picker" mode="region" :name="'form'+idx" value="" @change="editorBindPickerChange" :data-idx="idx">
+							<view v-if="editorFormdata[idx]">{{editorFormdata[idx]}}</view> 
+							<view v-else>请选择省市区</view>
+						</picker> -->
+						<input type="text" style="display:none" :name="'form'+idx" :value="regiondata"/>
+					</block>
+					<block v-if="item.key=='upload'">
+						<input type="text" style="display:none" :name="'form'+idx" :value="editorFormdata[idx]"/>
+						<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+							<view class="form-imgbox" v-if="editorFormdata[idx]">
+								<view class="form-imgbox-img"><image class="image" :src="editorFormdata[idx]" @click="previewImage" :data-url="editorFormdata[idx]" mode="widthFix" :data-idx="idx"/></view>
+							</view>
+							<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-idx="idx"></view>
+						</view>
+					</block>
+				</view>
+				<view class="form-item" v-if="selectedLevel.areafenhong == 1">
+					<view class="label">代理区域<text style="color:red"> *</text></view>
+					<uni-data-picker :localdata="provincedata" popup-title="请选择代理区域" :placeholder="areafenhong_province || '请选择代理区域'" @change="onchange1" styleData="width:100%"></uni-data-picker>
+				</view>
+				<view class="form-item" v-if="selectedLevel.areafenhong == 2">
+					<view class="label">代理区域<text style="color:red"> *</text></view>
+					<uni-data-picker :localdata="citydata" popup-title="请选择代理区域" :placeholder="areafenhong_city ? areafenhong_province + '/' + areafenhong_city : '请选择代理区域'" @change="onchange2" styleData="width:100%"></uni-data-picker>
+				</view>
+				<view class="form-item" v-if="selectedLevel.areafenhong == 3">
+					<view class="label">代理区域<text style="color:red"> *</text></view>
+					<uni-data-picker :localdata="items" popup-title="请选择代理区域" :placeholder="areafenhong_area ? areafenhong_province + '/' + areafenhong_city + '/' + areafenhong_area : '请选择代理区域'" @change="onchange3" styleData="width:100%"></uni-data-picker>
+				</view>
+			</view>
+			<button class="form-btn" form-type="submit" v-if="selectedLevel.applytj_reach==1">申请成为{{selectedLevel.name}}</button>
+		</view>
+		</form>
+
+		<view class="contentbox" v-if="selectedLevel.can_up==1 && selectedLevel.up_condition_show == 1 && selectedLevel.id!=userinfo.levelid">
+			<view class="uplvtj">
+				<view class="f1">
+                    
+					<text>{{selectedLevel.name}}</text>
+					<text class="t2">升级条件：</text>
+				</view>
+				<view class="f2">
+          <rich-text :nodes="selectedLevel.autouptj"></rich-text>
+					<view class="t3">您达到升级条件后将自动升级为{{selectedLevel.name}}，请继续努力！</view>
+				</view>
+			</view>
+		</view>
+		<view class="contentbox">
+			<view class="explain">
+				<view class="f1">
+					<text>{{selectedLevel.name}}</text>
+					<text class="t2">等级特权：</text>
+				</view>
+				<view class="f2">
+					<parse :content="userlevel.explain" v-if="userlevel.id==selectedLevel.id"/>
+					<block v-for="(item,index) in aglevelList">
+					<parse :content="item.explain" v-if="item.id==selectedLevel.id"/>
+					</block>
+				</view>
+			</view>
+		</view>
+	</block>
+
+	<block v-if="errmsg!='' && isload">
+	<view class="zan-box">
+			<image :src="event_rul + '/static/img/static/img/zan.png'" class="zan-img"></image>
+			<view class="zan-text">{{errmsg}}</view>
+	</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		editorFormdata:[],
+		regiondata:'',
+		items: [],
+		provincedata:[],
+		citydata:[],
+		test:'test',
+
+		sysset: [],
+		userinfo: [],
+		aglevelList: [],
+		aglevelCount: 0,
+		applytj_reach: 0,
+		errmsg: '',
+		userlevel: "",
+		selectedLevel: "",
+		explain: "",
+		applytj_info: "",
+		autouptj_info: "",
+		areafenhong_province:'',
+		areafenhong_city:'',
+		areafenhong_area:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		var that = this;
+		app.get('ApiIndex/getCustom',{}, function (customs) {
+			var url = app.globalData.pre_url+'/static/area.json';
+			if(customs.data.includes('plug_zhiming')) {
+				url = app.globalData.pre_url+'/static/area_gaoxin.json';
+			}
+			uni.request({
+				url: url,
+				data: {},
+				method: 'GET',
+				header: { 'content-type': 'application/json' },
+				success: function(res2) {
+					that.items = res2.data
+					var provincedata = [];
+					for(var i in res2.data){
+						provincedata.push({text:res2.data[i].text,value:res2.data[i].value})
+					}
+					that.provincedata = provincedata;
+					var citydata = [];
+					for(var i in res2.data){
+						var citys = [];
+						for(var j in res2.data[i].children){
+							citys.push({text:res2.data[i].children[j].text,value:res2.data[i].children[j].value});
+						}
+						citydata.push({text:res2.data[i].text,value:res2.data[i].value,children:citys});
+					}
+					that.citydata = citydata;
+				}
+			});
+		});
+		
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata(true);
+	},
+  onPullDownRefresh: function () {
+    this.getdata(true);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/levelup', {id:that.opt.id,cid:that.opt.cid}, function (res) {
+				that.loading = false;
+				uni.setNavigationBarTitle({
+					title: that.t('会员') + '升级'
+				});
+				if (res.status == 0) {
+					that.errmsg = res.msg;
+				} else if (res.status == 2) {
+					that.errmsg = res.msg;
+					setTimeout(function () {
+						app.goto('index');
+					}, 1000);
+				} else {
+					that.userinfo = res.userinfo;
+					that.bankname = res.userinfo.bankname;
+					that.userlevel = res.userlevel;
+					that.selectedLevel = res.userlevel;
+					that.sysset = res.sysset;
+					that.aglevelList = res.aglevelList;
+					that.aglevelCount = res.aglevelList.length;
+					that.explain = res.userlevel.explain;
+				}
+				that.loaded();
+			});
+		},
+    cannotapply: function () {
+      app.alert('不满足申请条件');
+    },
+    bindBanknameChange: function (e) {
+      this.bankname = this.banklist[e.detail.value];
+    },
+    formSubmit: function (e) {
+        var that = this;
+        var apply_formdata = this.selectedLevel.apply_formdata;
+        var formdata = e.detail.value;
+        for (var i = 0; i < apply_formdata.length;i++){
+            //console.log(formdata['form' + i]);
+            if (apply_formdata[i].val3 == 1 && (formdata['form' + i] === '' || formdata['form' + i] === undefined || formdata['form' + i].length==0)){
+                    app.alert(apply_formdata[i].val1+' 必填');return;
+            }
+            if (apply_formdata[i].key == 'selector') {
+                    formdata['form' + i] = apply_formdata[i].val2[formdata['form' + i]]
+            }
+        }
+        if(this.selectedLevel.areafenhong==1 && this.areafenhong_province==''){
+            app.alert('请选择代理区域');return;
+        }
+        if(this.selectedLevel.areafenhong==2 && this.areafenhong_city==''){
+            app.alert('请选择代理区域');return;
+        }
+        if(this.selectedLevel.areafenhong==3 && this.areafenhong_area==''){
+            app.alert('请选择代理区域');return;
+        }
+        if (formdata.levelid == '') {
+            app.alert('请选择等级');
+            return;
+        }
+        formdata.areafenhong_province = this.areafenhong_province;
+        formdata.areafenhong_city = this.areafenhong_city;
+        formdata.areafenhong_area = this.areafenhong_area;
+        app.showLoading('提交中');
+        app.post('ApiMy/levelup', formdata, function (res) {
+            app.showLoading(false);
+            if (res.status == 0) {
+              app.alert(res.msg);
+              return;
+            }
+            app.success(res.msg);
+            setTimeout(function () {
+              app.goto(res.url);
+            }, 1000);
+        });
+    },
+    changelevel: function (e) {
+      var levelid = e.detail.value;
+      var aglevelList = this.aglevelList;
+      var agleveldata;
+
+      for (var i in aglevelList) {
+        if (aglevelList[i].id == levelid) {
+          agleveldata = aglevelList[i];
+          break;
+        }
+      }
+      var applytj = [];
+      var applytj_reach = 0;
+      var member = this.userinfo;
+
+      // var applytj_info = applytj.join(' 或 ');
+      var autouptj = [];
+
+      // var autouptj_info = autouptj.join(' 或 ');
+      // this.applytj_info = applytj_info;
+      // this.applytj_reach = applytj_reach;
+      // this.autouptj_info = autouptj_info;
+      this.selectedLevel = agleveldata;
+      this.explain = agleveldata.explain;
+	  this.editorFormdata = [];
+    },
+    editorChooseImage: function (e) {
+        var that = this;
+        var idx = e.currentTarget.dataset.idx;
+        var tplindex = e.currentTarget.dataset.tplindex;
+        var editorFormdata = this.editorFormdata;
+        if(!editorFormdata) editorFormdata = [];
+        app.chooseImage(function(data){
+            editorFormdata[idx] = data[0];
+            console.log(editorFormdata)
+            that.editorFormdata = editorFormdata
+            that.test = Math.random();
+        })
+    },
+    editorBindPickerChange:function(e){
+        var idx = e.currentTarget.dataset.idx;
+        var tplindex = e.currentTarget.dataset.tplindex;
+        var val = e.detail.value;
+        var editorFormdata = this.editorFormdata;
+        if(!editorFormdata) editorFormdata = [];
+        editorFormdata[idx] = val;
+        console.log(editorFormdata)
+        this.editorFormdata = editorFormdata
+        this.test = Math.random();
+    },
+    onchange(e) {
+        const value = e.detail.value
+        console.log(value[0].text + ',' + value[1].text + ',' + value[2].text)
+        this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text
+    },
+    onchange1(e) {
+        const value = e.detail.value
+        console.log(value[0].text)
+        this.areafenhong_province = value[0].text;
+    },
+    onchange2(e) {
+        const value = e.detail.value
+        console.log(value[0].text + ',' + value[1].text)
+        this.areafenhong_province = value[0].text;
+        this.areafenhong_city = value[1].text
+    },
+    onchange3(e) {
+        const value = e.detail.value
+        this.areafenhong_province = value[0].text;
+        this.areafenhong_city = value[1].text;
+        this.areafenhong_area = value[2].text;
+    },
+  }
+};
+</script>
+<style>
+page{background:#F2D8B2;padding-bottom:10rpx}
+.banner{ width:100%;background:#fff;height:400rpx;display:table}
+
+.contentbox{width:94%;margin: 0 3%;padding:20rpx 40rpx;border-radius:20rpx;background:#fff;color:#B17D2D;margin-bottom:30rpx;display:flex;flex-direction:column;margin-bottom:10px}
+.title{height:50rpx;line-height:50rpx}
+
+.user-level {margin-left:10rpx;display:flex;}
+.user-level image {width: 44rpx;height: 44rpx;margin-right: 10rpx;margin-left: -4rpx;}
+.level-name {height: 36rpx;border-radius: 18rpx;font-size: 24rpx;color: #fff;background-color: #5c5652;padding: 0 16rpx 0 0;display:flex;align-items: flex-end;}
+.level-name .name{display:flex;align-items:center;height:100%}
+
+.noup{ width:100%;text-align:center;font-size:32rpx;color:green}
+
+.form-item1{width: 100%;display:flex;flex-direction:column;color:#333}
+.form-item1 .panel{width: 100%;font-size:32rpx;color:#B17D2D;}
+.form-item1 radio-group{width: 100%;background:#fff;padding-left:10rpx;}
+.form-item1 .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;padding:12rpx 0;}
+.form-item1 .radio-item:last-child{border:0}
+.radio-item .user-level{flex:1}
+.form-item1 radio{ transform: scale(0.8);}
+
+.applytj{width:100%;}
+.applytj .f1{color:#000;font-size:30rpx;height:60rpx;line-height:60rpx;font-size:30rpx;padding-left:20rpx;display:flex;align-items:center}
+.applytj .f1 .t2{padding-left:10rpx}
+.applytj .f2{padding:20rpx;background-color:#fff;color:#f56060}
+.applytj .f2 .t2{padding-top:10rpx;color:#88e}
+.applytj .f2 .t3{padding-top:10rpx}
+.applytj .f2 .t4{padding-top:10rpx;color:green;font-size:30rpx}
+.uplvtj{width:100%;margin-top:20rpx;}
+.uplvtj .f1{color:#000;font-size:30rpx;height:60rpx;line-height:60rpx;font-size:30rpx;padding-left:20rpx;display:flex;align-items:center}
+.uplvtj .f1 .t2{padding-left:10rpx}
+.uplvtj .f2{padding:20rpx;background-color:#fff;color:#f56060}
+.uplvtj .f2 .t3{padding-top:10rpx;color:green}
+
+.explain{ width:100%;margin:20rpx 0;}
+.explain .f1{color:#000;font-size:30rpx;height:60rpx;line-height:60rpx;font-size:30rpx;padding-left:20rpx;display:flex;align-items:center}
+.explain .f1 .t2{padding-left:10rpx}
+.explain .f2{padding:20rpx;background-color:#fff;color:#999999}
+
+
+.applydata{width: 100%;background: #fff;padding: 0 20rpx;color:#333}
+
+.form-btn{width:100%;height: 88rpx;line-height: 88rpx;border-radius:8rpx;background: #FC4343;color: #fff;margin-top: 40rpx;margin-bottom: 20rpx;}
+
+.applydata .radio{transform:scale(.7);}
+.applydata .checkbox{transform:scale(.7);}
+.form-item{width: 100%;border-bottom: 1px #ededed solid;padding:10rpx 0px;display:flex;align-items: center;}
+.form-item:last-child{border:0}
+.form-item .label{height:70rpx;line-height: 70rpx;width:160rpx;margin-right: 10px;flex-shrink:0}
+.form-item .input{height: 70rpx;line-height: 70rpx;overflow: hidden;flex:1;border:1px solid #eee;padding:0 8rpx;border-radius:2px;}
+.form-item .textarea{height:180rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .layui-form-switch{}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+</style>
\ No newline at end of file
diff --git a/pages/my/leveluppay.vue b/pages/my/leveluppay.vue
new file mode 100644
index 0000000..1e714be
--- /dev/null
+++ b/pages/my/leveluppay.vue
@@ -0,0 +1,177 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view class="info-item">
+				<text class="t1">订单名称:</text>
+				<text class="t2">{{orderinfo.title}}</text>
+			</view>
+			<view class="info-item">
+				<text class="t1">订单编号:</text>
+				<text class="t2">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="info-item">
+				<text class="t1">支付金额:</text>
+				<text class="t2" style="color:#e94745">￥{{orderinfo.totalprice}}</text>
+			</view>
+		</view>
+		<button class="fpay-btn" @tap="topay" data-typeid="1" v-if="wxpayst==1">微信支付</button>
+		<button class='fpay-btn' @tap="topay" data-typeid="10" v-if="alipay==1" style="background:#108EE9;margin-top:20rpx">支付宝支付</button>
+		<block v-if="moneypay==1">
+			<button class="fpay-btn2" @tap="modalinput" v-if="userinfo.haspwd">{{t('余额')}}支付（当前余额¥{{userinfo.money}}）</button>
+			<button class="fpay-btn2" @tap="topay" data-typeid="2" v-else>{{t('余额')}}支付（当前余额¥{{userinfo.money}}）</button>
+		</block>
+
+		<view v-if="userinfo.haspwd" :class="'weui-demo-dialog ' + (!hiddenmodalput ? 'weui-demo-dialog_show' : '')">
+			<view class="weui-mask" @tap="cancel"></view>
+			<view class="weui-dialog__wrp">
+				<view class="weui-dialog">
+					<view class="weui-dialog__hd">
+						<view class="weui-dialog__title">支付密码</view>
+					</view>
+					<view class="weui-dialog__bd">
+						<view class="flex-y-center flex-x-center" style="margin:20rpx 130rpx;">
+							<text style="font-size:40rpx;color:#000"></text><input type="digit" placeholder="请输入支付密码" @input="getpwd"></input>
+						</view> 
+					</view>
+					<view class="weui-dialog__ft">
+						<view class="weui-dialog__btn weui-dialog__btn_default" @tap="cancel">取消</view>
+						<view class="weui-dialog__btn" @tap="topay" data-typeid="2">确定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			wxpayst:0,
+			alipay:0,
+			moneypay:0,
+			userinfo:{},
+      paypwd: '',
+      hiddenmodalput: true,
+      orderinfo: []
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiWxpay/uppay', {orderid: that.opt.orderid}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.error(res.msg);
+				} else {
+					that.wxpayst = res.wxpayst;
+					that.alipay = res.alipay;
+					that.moneypay = res.moneypay;
+					that.orderinfo = res.orderinfo;
+					that.userinfo = res.userinfo;
+				}
+				that.loaded();
+			});
+		},
+    getpwd: function (e) {
+      var paypwd = e.detail.value;
+      this.paypwd = paypwd
+    },
+    cancel: function () {
+      this.hiddenmodalput = true
+    },
+    modalinput: function () {
+      this.hiddenmodalput = !this.hiddenmodalput
+    },
+    topay: function (e) {
+      var that = this;
+      var typeid = e.currentTarget.dataset.typeid;
+      var orderid = this.orderinfo.id;
+      if (typeid == 2) {
+        that.hiddenmodalput = true;
+        app.confirm('确定用' + that.t('余额') + '支付吗?', function () {
+          app.post('ApiWxpay/uppay', {orderid: orderid,typeid: typeid,paypwd: that.paypwd}, function (data) {
+            if (data.status == 0) {
+              app.error(data.msg);
+              return;
+            }
+            if (data.status == 2) {
+              //无需付款
+              app.success(data.msg);
+              setTimeout(function () {
+                app.goto('/pages/my/usercenter');
+              }, 1000);
+              return;
+            }
+          });
+        });
+      } else {
+        app.post('ApiWxpay/uppay', {orderid: orderid,typeid: typeid}, function (data) {
+          if (data.status == 0) {
+            app.error(data.msg);
+            return;
+          }
+          if (data.status == 2) {
+            //无需付款
+            app.success(data.msg);
+            setTimeout(function () {
+              app.goto('/pages/my/usercenter');
+            }, 1000);
+            return;
+          }
+          var opt = data.data;
+					uni.requestPayment({
+						'timeStamp': opt.timeStamp,
+						'nonceStr': opt.nonceStr,
+						'package': opt.package,
+						'signType': 'MD5',
+						'paySign': opt.paySign,
+						'success': function (res) {
+							app.success('付款完成');
+							setTimeout(function () {
+								app.goto('/pages/my/usercenter');
+							}, 1000);
+						},
+						'fail': function (res) {}
+					});
+				})
+			}
+    }
+  }
+}
+</script>
+<style>
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:20rpx 20rpx;}
+.info-item2{ display:flex;width: 100%; background: #fff;padding: 0 3%;padding:20rpx 20rpx; margin-bottom:20rpx;}
+.info-item2 .t1{ width:70rpx; }
+.info-item2 .t2{ color: #000;}
+.info-item2 .x2{ color: #888;}
+
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding: 0 3%;  border-bottom: 1px #f3f3f3 solid;}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx; height: 80rpx; line-height: 80rpx; color: #000; }
+.info-item .t2{ height: 80rpx;line-height: 80rpx; color: #000;text-align:right;flex:1}
+

+.fpay-btn{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; margin-top: 20px; float: left; border-radius: 5px; color: #fff; background: #1aac19; border: none; font-size: 15px; }
+.fpay-btn2{ width: 90%; margin: 0 5%; height: 40px; line-height: 40px; margin-top: 10px; float: left; border-radius: 5px; color: #fff; background: #e2cc05; border: none; font-size: 15px; }
+</style>
\ No newline at end of file
diff --git a/pages/my/linktel.vue b/pages/my/linktel.vue
new file mode 100644
index 0000000..e6ceb6b
--- /dev/null
+++ b/pages/my/linktel.vue
@@ -0,0 +1,52 @@
+<template>
+	<view style="text-align: center;margin-top: 30%;font-size: 30rpx;">
+		<view v-if="info.name_o || info.tel_o">
+			<text>{{info.name_o}} </text>
+			<text class="tel" @tap="calltel" :data-tel="info.tel" > {{info.tel_o}}</text>
+		</view>
+		<view style="margin-top: 40rpx;" v-if="!info.name_t || info.tel_t">
+			<text>{{info.name_t}} </text>
+			<text  class="tel" @tap="calltel" :data-tel="info.tel"> {{info.tel_t}}</text>
+		</view>
+		<view style="margin-top: 40rpx;" v-if="!info.name_th || info.tel_th">
+			<text>{{info.name_th}} </text>
+			<text  class="tel" @tap="calltel" :data-tel="info.tel"> {{info.tel_th}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+	data() {
+	return {
+			info: [],
+		}
+	},
+	onLoad: function (opt) {
+		this.getdata(); 
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			app.get('ApiMy/getWebinfo',{},function (data){
+				if(data){
+					that.info=data
+				}
+			});
+		},
+		//打电话
+		calltel: function (e) {
+			var tel = e.currentTarget.dataset.tel;
+			wx.makePhoneCall({
+			      phoneNumber: tel
+			})
+		},
+	}
+}
+</script>
+
+<style>
+page{backgroud:#fff}
+.tel{display:inline-block;padding: 10rpx 6rpx;margin-left: 40rpx;}
+</style>
diff --git a/pages/my/paypwd.vue b/pages/my/paypwd.vue
new file mode 100644
index 0000000..255aace
--- /dev/null
+++ b/pages/my/paypwd.vue
@@ -0,0 +1,110 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item" v-if="haspwd==1">
+				<text class="label">原密码</text>
+				<input type="text" class="input" placeholder="输入您的原密码" placeholder-style="font-size:28rpx;color:#BBBBBB" name="oldpaypwd" value="" password="true"></input>
+			</view>
+			<view class="form-item">
+				<text class="label">新密码</text>
+				<input type="text" class="input" placeholder="输入您的新密码" placeholder-style="font-size:28rpx;color:#BBBBBB" name="paypwd" value="" password="true"></input>
+			</view>
+			<view class="form-item">
+				<text class="label">确认新密码</text>
+				<input type="text" class="input" placeholder="再次输入新密码" placeholder-style="font-size:28rpx;color:#BBBBBB" name="repaypwd" value="" password="true"></input>
+			</view>
+		</view>
+		<view style="width:94%;margin:0 3%;padding:20rpx;color:#BBBBBB">注：用于{{t('余额')}}支付等敏感操作时输入，请妥善保管</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">确 认</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/paypwd', {}, function (data) {
+				that.loading = false;
+				that.haspwd = data.haspwd;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+      if (this.haspwd == 1) {
+        if (formdata.oldpaypwd == '') {
+          app.alert('请输入原密码');
+          return;
+        }
+      } else {
+        formdata.oldpaypwd = '';
+      }
+      if (formdata.paypwd == '') {
+        app.alert('请输入新密码');
+        return;
+      }
+      if (formdata.paypwd.length < 6) {
+        app.alert('新密码不小于6位');
+        return;
+      }
+      if (formdata.repaypwd == '') {
+        app.alert('请再次输入新密码');
+        return;
+      }
+      if (formdata.paypwd != formdata.repaypwd) {
+        app.alert('两次密码不一致');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/paypwd", {oldpaypwd: formdata.oldpaypwd,paypwd: formdata.paypwd}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback();
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 14rpx 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:100rpx;line-height:100rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color:#8B8B8B;font-weight:bold;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/scoreTransfer.vue b/pages/my/scoreTransfer.vue
new file mode 100644
index 0000000..d42cd3c
--- /dev/null
+++ b/pages/my/scoreTransfer.vue
@@ -0,0 +1,154 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		
+		<view class="content2">
+			<!-- <view class="item2"><view class="f1">接收人手机号</view></view>
+			<view class="item3"><view class="f2"><input class="input" type="number" name="mobile" value="" placeholder="请输入接收人手机号" placeholder-style="color:#999;font-size:36rpx" @input="mobileinput"></input></view></view>
+			<view class="item4" style="height: 1rpx;">
+			</view> -->
+			<view class="item2"><view class="f1">接收人ID</view></view>
+			<view class="item3"><view class="f2"><input class="input" type="number" name="mid" value="" placeholder="请输入接收人ID" placeholder-style="color:#999;font-size:36rpx"></input></view></view>
+			<view class="item4" style="height: 1rpx;">
+			</view>
+			<view class="item2"><view class="f1">转赠数量</view></view>
+			<view class="item3"><view class="f2"><input class="input" type="number" name="integral" value="" placeholder="请输入转赠数量" placeholder-style="color:#999;font-size:36rpx" @input="moneyinput"></input></view></view>
+			<view class="item4">
+				<text style="margin-right:10rpx">您的当前{{t('积分')}}：{{myscore}}，转赠后不可退回 </text>
+			</view>
+		</view>
+		<button class="btn" :style="{background:t('color1')}" form-type="submit">转赠</button>
+		<view class='text-center' @tap="goto" data-url='/pages/my/usercenter'><text>返回{{t('会员')}}中心</text></view>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      userinfo: [],
+      myscore: 0,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+
+		var that = this;
+		// app.checkLogin();
+		uni.setNavigationBarTitle({
+			title: that.t('积分') + '转赠'
+		});
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			app.get('ApiMy/scoreTransfer', {}, function (res) {
+				if(res.status == 0) {
+					app.alert(res.msg);return;
+				}
+				if(res.status == 1) {
+					that.myscore = res.myscore;
+				}
+				that.loaded();
+			});
+		},
+		
+		mobileinput: function (e) {
+		  var value = parseFloat(e.detail.value);
+		},
+		
+    moneyinput: function (e) {
+      var money = parseFloat(e.detail.value);
+      
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function (e) {
+      var that = this;
+      var money = parseFloat(e.detail.value.integral);
+			var mid = parseInt(e.detail.value.mid);
+			var mobile = e.detail.value.mobile;
+			if (typeof(mobile) != 'undefined' && !/^1[3456789]\d{9}$/.test(mobile)) {
+			  app.error("手机号码有误，请重填");
+			  return false;
+			}
+			if (typeof(mid) != 'undefined' && (mid == '' || isNaN(mid))) {
+				app.error("请输入接收人ID");
+				return false;
+			}
+			if(typeof(mid) != 'undefined' && mid == app.globalData.mid) {
+				app.error("不能转赠给自己");
+				return false;
+			}
+      if (isNaN(money) || money <= 0) {
+        app.error('数量必须大于0');
+        return;
+      }
+			
+			if (money < 0) {
+        app.error('数量必须大于0');return;
+      } else if (money > that.myscore) {
+        app.error(this.t('积分') + '不足');return;
+      }
+
+			app.confirm('确定要赠送吗？', function(){
+				app.showLoading();
+				app.post('ApiMy/scoreTransfer', {integral: money,mobile: mobile,mid:mid}, function (data) {
+					app.showLoading(false);
+				  if (data.status == 0) {
+				    app.error(data.msg);
+				    return;
+				  } else {
+				    app.success(data.msg);
+				    that.subscribeMessage(function () {
+				      setTimeout(function () {
+				        app.goto('/pages/my/usercenter');
+				      }, 1000);
+				    });
+				  }
+				}, '提交中');
+			})
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:36rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:36rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.text-center {text-align: center; margin-top: 20rpx;}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/pages/my/scoreWithdraw.vue b/pages/my/scoreWithdraw.vue
new file mode 100644
index 0000000..94c927b
--- /dev/null
+++ b/pages/my/scoreWithdraw.vue
@@ -0,0 +1,131 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		<view class="myscore" :style="{background:t('color1')}">
+			<view class="f1">允提{{t('积分')}}</view>
+			<view class="f2">{{myscore}}</view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">提现数量</view></view>
+			<view class="item3"><view class="f2"><input class="input" type="number" name="integral" value="" placeholder="请输入提现数量" placeholder-style="color:#999;font-size:36rpx" @input="moneyinput"></input></view></view>
+			<view class="item4">
+				<text style="margin-right:10rpx">{{t('积分')}}提现到{{t('余额')}}比例为：1：{{score_to_money_percent}}</text>
+			</view>
+		</view>
+		<button class="btn" :style="{background:t('color1')}" form-type="submit">提现到{{t('余额')}}</button>
+		<view class='text-center' @tap="goto" data-url='/pages/my/usercenter'><text>返回{{t('会员')}}中心</text></view>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      userinfo: [],
+      myscore: 0,
+			score_to_money_percent:0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+
+		var that = this;
+		// app.checkLogin();
+		uni.setNavigationBarTitle({
+			title: that.t('积分') + '提现'
+		});
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			app.get('ApiMy/scoreWithdraw', {}, function (res) {
+				if(res.status == 0) {
+					app.alert(res.msg);return;
+				}
+				if(res.status == 1) {
+					that.myscore = res.myscore;
+					that.score_to_money_percent = res.score_to_money_percent;
+				}
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var money = parseInt(e.detail.value);
+      
+    },
+    formSubmit: function (e) {
+      var that = this;
+      var money = parseInt(e.detail.value.integral);
+      if (isNaN(money) || money <= 0) {
+        app.error('数量必须大于0');
+        return;
+      }
+			
+			if (money < 0) {
+        app.error('数量必须大于0');return;
+      } else if (money > that.myscore) {
+        app.error(this.t('积分') + '不足');return;
+      }
+
+			app.confirm('确定要提现吗？', function(){
+				app.showLoading();
+				app.post('ApiMy/scoreWithdraw', {integral: money}, function (data) {
+					app.showLoading(false);
+				  if (data.status == 0) {
+				    app.error(data.msg);
+				    return;
+				  } else {
+				    app.success(data.msg);
+				    that.subscribeMessage(function () {
+				      setTimeout(function () {
+				        app.goto('/pages/my/usercenter');
+				      }, 1000);
+				    });
+				  }
+				}, '提交中');
+			})
+    }
+  }
+};
+</script>
+<style>
+	.myscore{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+	.myscore .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+	.myscore .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold; position: relative;}
+	
+.container{display:flex;flex-direction:column}
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:36rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:36rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.text-center {text-align: center; margin-top: 20rpx;}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/pages/my/scorelog.vue b/pages/my/scorelog.vue
new file mode 100644
index 0000000..09f9928
--- /dev/null
+++ b/pages/my/scorelog.vue
@@ -0,0 +1,147 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="myscore" :style="{background:t('color1')}">
+			<view class="f1">我的{{t('积分')}}</view>
+			<view class="f2">{{myscore}}<view v-if="scoreTransfer" class="btn-mini" @tap="goto" data-url="/pages/my/scoreTransfer">转赠</view></view>
+		</view>
+		<view class="myscore" :style="{background:t('color1')}" v-if="scoreWithdraw">
+			<view class="f1">允提{{t('积分')}}</view>
+			<view class="f2">{{myscore2}}<view class="btn-mini" @tap="goto" data-url="/pages/my/scoreWithdraw">提现</view></view>
+		</view>
+		<view class="content" id="datalist">
+			<block v-for="(item, index) in datalist" :key="index"> 
+			<view class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{item.createtime}}</text>
+				</view>
+				<view class="f2">
+					<block v-if="item.score>0">
+						<text class="t1">+{{item.score}}</text>
+					</block>
+					<block v-else>
+						<text class="t2">{{item.score}}</text>
+					</block>
+				</view>
+			</view>
+		</block>
+		<nodata v-if="nodata"></nodata>
+		</view>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+      myscore: 0,
+      myscore2: 0,
+      nodata: false,
+      nomore: false,
+			scoreTransfer:false,
+			scoreWithdraw:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiMy/scorelog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					uni.setNavigationBarTitle({
+						title: that.t('积分') + '明细'
+					});
+					that.myscore = res.myscore;
+					that.myscore2 = res.score_withdraw;
+					that.scoreTransfer = res.scoreTransfer;
+					that.scoreWithdraw = res.scoreWithdraw;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.myscore{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.myscore .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.myscore .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold; position: relative;}
+
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item .f1{flex:1;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+.btn-mini {right: 32rpx;top: 28rpx;width: 100rpx;height: 50rpx;text-align: center;border: 1px solid #e6e6e6;border-radius: 10rpx;color: #fff;font-size: 24rpx;font-weight: bold;display: inline-flex;align-items: center;justify-content: center;position: absolute;}
+</style>
\ No newline at end of file
diff --git a/pages/my/set.vue b/pages/my/set.vue
new file mode 100644
index 0000000..2299055
--- /dev/null
+++ b/pages/my/set.vue
@@ -0,0 +1,143 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<!-- 	<view class="content">
+			<view class="info-item" style="height:136rpx;line-height:136rpx">
+				<view class="t1" style="flex:1;">头像</view>
+				<image :src="userinfo.headimg" style="width:88rpx;height:88rpx;" @tap="uploadHeadimg"/>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="setnickname">
+				<view class="t1">昵称</view>
+				<view class="t2">{{userinfo.nickname}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view> -->
+		<view class="content">
+			<view class="info-item" @tap="goto" data-url="setrealname">
+				<view class="t1">姓名</view>
+				<view class="t2">{{userinfo.realname}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="settel">
+				<view class="t1">手机号</view>
+				<view class="t2">{{userinfo.tel}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="setsex">
+				<text class="t1">性别</text>
+				<text class="t2" v-if="userinfo.sex==1">男</text>
+				<text class="t2" v-else-if="userinfo.sex==2">女</text>
+				<text class="t2" v-else>未知</text>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="setbirthday">
+				<text class="t1">生日</text>
+				<text class="t2">{{userinfo.birthday}}</text>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+		
+		<!-- <view class="content">
+			<view class="info-item" @tap="goto" data-url="setweixin">
+				<view class="t1">微信号</view>
+				<view class="t2">{{userinfo.weixin}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="setaliaccount">
+				<view class="t1">支付宝账号</view>
+				<view class="t2">{{userinfo.aliaccount}}</view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+			<view class="info-item" @tap="goto" data-url="setbankinfo">
+				<text class="t1">银行卡</text>
+				<text class="t2">{{userinfo.bankname ? '已设置' : ''}}</text>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view> -->
+		
+		<view class="content">
+			<view class="info-item" @tap="goto" data-url="/pages/address/address">
+				<view class="t1">收货地址</view>
+				<view class="t2"></view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+		<view class="content" v-if="userinfo.haspwd==1">
+			<view class="info-item" @tap="goto" data-url="/pages/my/setpwd">
+				<view class="t1">修改密码</view>
+				<view class="t2"></view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+		<view class="content">
+			<view class="info-item" @tap="goto" data-url="/pages/index/login">
+				<view class="t1">切换账号</view>
+				<view class="t2"></view>
+				<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/set', {}, function (data) {
+				that.loading = false;
+				that.userinfo = data.userinfo;
+				that.loaded();
+			});
+		},
+		uploadHeadimg:function(){
+			var that = this;
+			app.chooseImage(function(urls){
+				var headimg = urls[0];
+				that.userinfo.headimg = headimg;
+				app.post('ApiMy/setfield',{headimg:headimg});
+			},1)
+		}
+  }
+};
+</script>
+<style>
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:0 20rpx;}
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid;height:96rpx;line-height:96rpx}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx;color: #8B8B8B;font-weight:bold;height:96rpx;line-height:96rpx}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+
+
+</style>
\ No newline at end of file
diff --git a/pages/my/setaliaccount.vue b/pages/my/setaliaccount.vue
new file mode 100644
index 0000000..44822d9
--- /dev/null
+++ b/pages/my/setaliaccount.vue
@@ -0,0 +1,89 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入真实姓名" placeholder-style="color:#BBBBBB;font-size:28rpx" name="aliaccountname" :value="userinfo.aliaccountname"></input>
+			</view>
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入支付宝账号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="aliaccount" :value="userinfo.aliaccount"></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      userinfo: {},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/set', {}, function (data) {
+				that.loading = false;
+				that.userinfo = data.userinfo;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var aliaccount = formdata.aliaccount
+			var aliaccountname = formdata.aliaccountname
+      if (aliaccountname == '') {
+        app.alert('请输入真实姓名');return;
+      }
+      if (aliaccount == '') {
+        app.alert('请输入支付宝账号');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {aliaccount:aliaccount,aliaccountname:aliaccountname}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/setbankinfo.vue b/pages/my/setbankinfo.vue
new file mode 100644
index 0000000..0ab4ec8
--- /dev/null
+++ b/pages/my/setbankinfo.vue
@@ -0,0 +1,108 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+					<text class="label">开户行</text>
+					<picker class="picker" mode="selector" name="bankname" value="0" :range="banklist" @change="bindBanknameChange">
+						<view v-if="bankname">{{bankname}}</view>
+						<view v-else>请选择开户行</view>
+					</picker>
+			</view>
+			<view class="form-item">
+					<text class="label">所属分支行</text>
+					<input type="text" class="input" placeholder="请输入分支行" name="bankaddress" :value="userinfo.bankaddress" placeholder-style="color:#BBBBBB;font-size:28rpx"></input>
+			</view>
+			<view class="form-item">
+					<text class="label">持卡人姓名</text>
+					<input type="text" class="input" placeholder="请输入持卡人姓名" name="bankcarduser" :value="userinfo.bankcarduser" placeholder-style="color:#BBBBBB;font-size:28rpx"></input>
+			</view>
+			<view class="form-item">
+					<text class="label">银行卡号</text>
+					<input type="text" class="input" placeholder="请输入银行卡号" name="bankcardnum" :value="userinfo.bankcardnum" placeholder-style="color:#BBBBBB;font-size:28rpx"></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+      banklist: ['工商银行', '农业银行', '中国银行', '建设银行', '招商银行', '邮储银行', '交通银行', '浦发银行', '民生银行', '兴业银行', '平安银行', '中信银行', '华夏银行', '广发银行', '光大银行', '北京银行', '宁波银行'],
+      bankname: '',
+			userinfo:{},
+			textset:{},
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.isload = true
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/set', {}, function (data) {
+				that.loading = false;
+				that.userinfo = data.userinfo;
+				that.bankname = data.userinfo.bankname;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var bankname = this.bankname
+			var bankcarduser = formdata.bankcarduser
+			var bankcardnum = formdata.bankcardnum
+			var bankaddress = formdata.bankaddress
+      if (bankname == '') {
+        app.alert('请选择开户行');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {bankname:bankname,bankaddress:bankaddress,bankcarduser:bankcarduser,bankcardnum:bankcardnum}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    bindBanknameChange: function (e) {
+      this.bankname = this.banklist[e.detail.value];
+    },
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 0;flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/setbirthday.vue b/pages/my/setbirthday.vue
new file mode 100644
index 0000000..bbff086
--- /dev/null
+++ b/pages/my/setbirthday.vue
@@ -0,0 +1,82 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+					<text class="label">生日</text>
+					<picker class="picker" mode="date" value="" start="1900-01-01" :end="date('','Y-m-d')" @change="bindDateChange">
+						<view v-if="birthday">{{birthday}}</view>
+						<view v-else>请选择生日</view>
+					</picker>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      birthday: '',
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var birthday = this.birthday
+      if (birthday == '') {
+        app.alert('请选择生日');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {birthday:birthday}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    bindDateChange: function (e) {
+      this.birthday = e.detail.value;
+    },
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 20rpx;flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/setnickname.vue b/pages/my/setnickname.vue
new file mode 100644
index 0000000..def0276
--- /dev/null
+++ b/pages/my/setnickname.vue
@@ -0,0 +1,72 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入昵称" placeholder-style="color:#BBBBBB;font-size:28rpx" name="nickname" value=""></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var nickname = formdata.nickname
+      if (nickname == '') {
+        app.alert('请输入昵称');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {nickname:nickname}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/setpwd.vue b/pages/my/setpwd.vue
new file mode 100644
index 0000000..d8dc527
--- /dev/null
+++ b/pages/my/setpwd.vue
@@ -0,0 +1,111 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item" v-if="haspwd==1">
+				<text class="label">原密码</text>
+				<input type="text" class="input" placeholder="输入您的原密码" placeholder-style="font-size:28rpx;color:#BBBBBB" name="oldpwd" value="" password="true"></input>
+			</view>
+			<view class="form-item">
+				<text class="label">新密码</text>
+				<input type="text" class="input" placeholder="输入您的新密码" placeholder-style="font-size:28rpx;color:#BBBBBB" name="pwd" value="" password="true"></input>
+			</view>
+			<view class="form-item">
+				<text class="label">确认新密码</text>
+				<input type="text" class="input" placeholder="再次输入新密码" placeholder-style="font-size:28rpx;color:#BBBBBB" name="repwd" value="" password="true"></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">确 认</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/setpwd', {}, function (data) {
+				that.loading = false;
+				that.haspwd = data.haspwd;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+      if (this.haspwd == 1) {
+        if (formdata.oldpwd == '') {
+          app.alert('请输入原密码');
+          return;
+        }
+      } else {
+        formdata.oldpwd = '';
+      }
+      if (formdata.pwd == '') {
+        app.alert('请输入新密码');
+        return;
+      }
+      if (formdata.pwd.length < 6) {
+        app.alert('新密码不小于6位');
+        return;
+      }
+      if (formdata.repwd == '') {
+        app.alert('请再次输入新密码');
+        return;
+      }
+      if (formdata.pwd != formdata.repwd) {
+        app.alert('两次密码不一致');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setpwd", {oldpwd: formdata.oldpwd,pwd: formdata.pwd}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback();
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 14rpx 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:100rpx;line-height:100rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color:#8B8B8B;font-weight:bold;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/setrealname.vue b/pages/my/setrealname.vue
new file mode 100644
index 0000000..47b41cb
--- /dev/null
+++ b/pages/my/setrealname.vue
@@ -0,0 +1,74 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入姓名" placeholder-style="color:#BBBBBB;font-size:28rpx" name="realname" value=""></input>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var realname = formdata.realname
+      if (realname == '') {
+        app.alert('请输入姓名');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {realname:realname}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/setsex.vue b/pages/my/setsex.vue
new file mode 100644
index 0000000..a0cef09
--- /dev/null
+++ b/pages/my/setsex.vue
@@ -0,0 +1,84 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+					<text class="label">性别</text>
+					<radio-group class="radio-group" name="sex">
+					<label class="radio">
+						<radio value="1"></radio>男
+					</label>
+					<label class="radio">
+						<radio value="2"></radio>女
+					</label>
+					</radio-group>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+      haspwd: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.loaded();
+  },
+	onPullDownRefresh: function () {
+		//this.getdata();
+	},
+  methods: {
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var sex = formdata.sex
+      if (sex == '') {
+        app.alert('请选择性别');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/setfield", {sex:sex}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.form-item .radio{height: 60rpx;line-height: 60rpx;color: #666;margin-right:30rpx}
+.form-item .radio radio{transform: scale(0.8);}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/settel.vue b/pages/my/settel.vue
new file mode 100644
index 0000000..549a25b
--- /dev/null
+++ b/pages/my/settel.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset">
+		<view class="form">
+			<view class="form-item">
+				<input type="text" class="input" placeholder="请输入手机号" placeholder-style="color:#BBBBBB;font-size:28rpx" name="tel" value="" @input="telinput"></input>
+			</view>
+			<view class="form-item" v-if="needsms">
+				<input type="text" class="input" placeholder="请输入验证码" placeholder-style="font-size:30rpx;color:#B2B5BE" name="smscode" value=""/>
+				<view class="code" @tap="smscode">{{smsdjs||'获取验证码'}}</view>
+			</view>
+		</view>
+		<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+		
+			textset:{},
+			smsdjs: '',
+			tel:'',
+      hqing: 0,
+      needsms: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			this.loading = true
+			app.get('ApiMy/settel',{},function(res){
+				that.loading = false;
+				that.needsms = res.needsms;
+				that.loaded();
+			})
+		},
+    formSubmit: function (e) {
+      var formdata = e.detail.value;
+			var tel = formdata.tel
+			var smscode = formdata.smscode
+      if (tel == '') {
+        app.alert('请输入手机号');return;
+      }
+			app.showLoading('提交中');
+      app.post("ApiMy/settelsub", {tel:tel,smscode:smscode}, function (data) {
+				app.showLoading(false);
+        if (data.status == 1) {
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+    telinput: function (e) {
+      this.tel = e.detail.value
+    },
+    smscode: function () {
+      var that = this;
+      if (that.hqing == 1) return;
+      that.hqing = 1;
+      var tel = that.tel;
+      if (tel == '') {
+        app.alert('请输入手机号码');
+        that.hqing = 0;
+        return false;
+      }
+      if (!/^1[3456789]\d{9}$/.test(tel)) {
+        app.alert("手机号码有误，请重填");
+        that.hqing = 0;
+        return false;
+      }
+      app.post("ApiIndex/sendsms", {tel: tel}, function (data) {
+        if (data.status != 1) {
+          app.alert(data.msg);
+        }
+      });
+      var time = 120;
+      var interval1 = setInterval(function () {
+        time--;
+        if (time < 0) {
+          that.smsdjs = '重新获取';
+          that.hqing = 0;
+          clearInterval(interval1);
+        } else if (time >= 0) {
+          that.smsdjs = time + '秒';
+        }
+      }, 1000);
+    }
+  }
+};
+</script>
+<style>
+.form{ width:94%;margin:20rpx 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;}
+.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+</style>
\ No newline at end of file
diff --git a/pages/my/setvita.vue b/pages/my/setvita.vue
new file mode 100644
index 0000000..7c7a77f
--- /dev/null
+++ b/pages/my/setvita.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="my-vita">
+		<form @submit="formSubmit" >
+			<view class="flex j-center" style="position: relative;">
+				<textarea class="tex" v-model="vitas"  placeholder="请输入个人简介" />
+				<text class="reset-tx" :style="{'color': t('color1')}"  @click="reset">重置</text>
+			</view>
+			<button class="set-btn" form-type="submit" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">保 存</button>
+		</form>
+		
+		<loading v-if="loading"></loading>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp()
+	export default {
+		data() {
+			
+			return {
+				vitas: '',
+				pages: 1,
+				loading:false,
+			}
+		},
+		onLoad() {
+			this.getdata()
+		},
+
+		methods: {
+			formSubmit(e) {
+				var formdata = e.detail.value;
+				// console.log(this.vitas, e, 'tijiano-----')
+				app.showLoading('提交中');
+				app.post("ApiMy/setfield", {autograph:this.vitas}, data => {
+				app.showLoading(false)
+					if (data.status == 1) {
+					  app.success(data.msg)
+					  setTimeout(function () {
+						app.goback(true)
+					  }, 1000)
+					} else {
+					  app.error(data.msg)
+					}
+				})
+			},
+			getdata() {
+				var that = this;
+				that.loading = true;
+				app.get('ApiMy/set', {}, data => {
+					that.loading = false;
+					that.vitas = data.userinfo.autograph;
+					// that.loaded();
+				});
+			},
+			
+			reset() {
+				this.vitas = ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex {display: flex;}
+	.flex1 {flex: 1;}
+	.j-center {justify-content: center;}
+	.j-between {justify-content: space-between;}
+	.j-around {justify-content: space-around;}
+	.j-evenly {justify-content: space-evenly;}
+	.flex-colum{flex-direction: column;}
+	.al-item-center {align-items: center;}
+	.fs12 {font-size: 24rpx;}
+
+	.set-btn{width: 90%;margin:60rpx 5%;height:96rpx;line-height:96rpx;border-radius:48rpx;color:#FFFFFF;font-weight:bold;}
+	.my-vita {
+		padding: 20rpx;
+		
+		.tex {
+			width: 100%;
+			height: 230rpx;
+			padding: 20rpx;
+			border-radius: 10rpx;
+			background-color: #FFF;
+		}
+		
+		.reset-tx {
+			position: absolute;
+			bottom: 10rpx;
+			right: 10rpx;
+			z-index: 33;
+		}
+	}
+
+</style>
+
diff --git a/pages/my/usercenter.vue b/pages/my/usercenter.vue
new file mode 100644
index 0000000..d60e372
--- /dev/null
+++ b/pages/my/usercenter.vue
@@ -0,0 +1,53 @@
+<template>
+<view class="container" :style="{backgroundColor:pageinfo.bgcolor}">
+	<dp :pagecontent="pagecontent"></dp>
+	<view v-if="copyright!=''" class="copyright">{{copyright}}</view>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+	data() {
+	return {
+			opt:{},
+			loading:false,
+      isload: false,
+			pageinfo: [],
+			pagecontent: [],
+			copyright:'',
+		}
+	},
+	onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata(); 
+	},
+	onPullDownRefresh:function(e){
+		this.getdata();
+	},
+	methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/usercenter',{},function (data){
+				that.loading = false;
+			  var pagecontent = data.pagecontent;
+				that.pageinfo = data.pageinfo;
+				that.pagecontent = data.pagecontent;
+				that.copyright = data.copyright;
+				uni.setNavigationBarTitle({
+					title: data.pageinfo.title
+				});
+				that.loaded();
+			});
+		}
+	}
+}
+</script>
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/order/comment.vue b/pages/order/comment.vue
new file mode 100644
index 0000000..6702f20
--- /dev/null
+++ b/pages/order/comment.vue
@@ -0,0 +1,210 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form-content">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.pic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.name}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx" >
+					<view class="" style="display: flex;flex-wrap: wrap;" v-if="content_pic.length > 0">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox" >
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id">
+								<image :src="event_rul + '/static/img/static/img/ico-del.png'"></image>
+							</view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+					</view>
+					<view v-if="content_pic.length <= 0 && comment.id" class="layui-imgbox-img no-img">无图片</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var ogid = that.opt.ogid;
+			that.loading = true;
+			app.get('ApiOrder/comment', {ogid: ogid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					if(content_pic != '') {
+						that.content_pic = content_pic.split(',');
+					}
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var ogid = that.opt.ogid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiOrder/comment', {ogid: ogid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.no-img {line-height: 200rpx;text-align: center;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/pages/order/commentdp.vue b/pages/order/commentdp.vue
new file mode 100644
index 0000000..049718c
--- /dev/null
+++ b/pages/order/commentdp.vue
@@ -0,0 +1,186 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价店铺</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiOrder/commentdp', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiOrder/commentdp', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/pages/order/commentps.vue b/pages/order/commentps.vue
new file mode 100644
index 0000000..60eab61
--- /dev/null
+++ b/pages/order/commentps.vue
@@ -0,0 +1,186 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价配送员</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiOrder/commentps', {id: id}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var id = that.opt.id;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiOrder/commentps', {id: id,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
new file mode 100644
index 0000000..b2b9b08
--- /dev/null
+++ b/pages/order/detail.vue
@@ -0,0 +1,723 @@
+<template>
+<view class="container order-detail">
+	<block v-if="isload">
+		<view class="order-detail__hd" :style="detail.refund_status > 0 ? 'background:url(' + pre_url + '/static/img/static/icon/order-errbg.png);background-size:100%' : 'background:url(' + pre_url + '/static/img/static/icon/order-bg.png);background-size:100%'">
+			<view class="order-detail__hd-title" v-if="detail.status==1">{{detail.paytype=='货到付款' ? '已选择'+codtxt : '已成功付款'}}</view>
+			<view class="order-detail__hd-title" v-if="detail.status==0||detail.status==2||detail.status==3||detail.status==4">{{detail.status==0?'等待买家付款':(detail.status==2?'订单已发货':(detail.status==3?'订单已完成':(detail.status==4?'订单已取消':'')))}}</view>
+
+			<view class="order-detail__hd-subtitle" v-if="detail.status==0||detail.status==1">{{detail.status==0 ? (djs?'剩余时间：'+djs : (detail.paytypeid == 5?'转账汇款后请上传付款凭证':'')) : (detail.status==1?(detail.freight_type==1?'请尽快前往自提地点取货':'我们会尽快为您发货'):'')}}</view>
+			<view class="order-detail__hd-subtitle" v-if="detail.status==2 && detail.freight_type!=3" user-select="true" selectable="true">发货信息：{{detail.express_com}} {{detail.express_no}}</view>
+			
+			<block v-if="detail.refund_status">
+				<view class="order-detail__hd-title">{{detail.refund_status===1?'订单已取消':(detail.refund_status===2?'已退款':(detail.refund_status===3?'已驳回':''))}}</view>
+			</block>
+		</view>
+		<view class="order-detail__bd">
+			<view class="order-detail__userinfo common-module">
+				<view class="order-detail__userinfo-top flex al-item-center" user-select="true" selectable="true">
+					<view class="order-detail__userinfo-name">{{detail.linkman}}</view>
+					<view class="order-detail__userinfo-tel">{{detail.tel}}</view>
+				</view>
+				<view class="order-detail__userinfo-bot flex">
+					<view class="icon-box flex al-item-center j-center">
+						<text class="iconfont icon-icon-location"></text>
+					</view>
+					<view class="order-detail__userinfo-address" v-if="detail.freight_type!=1 && detail.freight_type!=3" user-select="true" selectable="true">{{detail.area}}{{detail.address}}</view>
+					<view class="order-detail__userinfo-address" v-if="detail.freight_type==1" @tap="openMendian" :data-storeinfo="storeinfo" user-select="true" selectable="true">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</view>
+				</view>
+			</view>
+			<view class="order-detail__list common-module">
+				<view class="order-detail__shop flex al-item-center"  v-if="detail.bid>0" @tap="goto" :data-url="'/pagesA/shop/index?id=' + detail.bid">
+					<image class="order-detail__shop-logo" :src="detail.binfo.logo"></image>
+					<view class="order-detail__shop-name" decode="true" space="true">{{detail.binfo.name}}</view>
+				</view>
+				<view class="product-item" v-for="(item, idx) in prolist" :key="idx">
+					<view class="product-item__con flex">
+						<view class="product-item__hd" @tap="goto" :data-url="'/pages/shop/product?id=' + item.proid">
+							<image class="product-item__img" :src="item.pic"></image>
+						</view>
+						<view class="product-item__bd">
+							<view class="product-item__info flex">
+								<view class="product-item__name">{{item.name}}</view>
+								<view class="product-item__price">￥{{item.sell_price}}</view>
+							</view>
+							<view class="product-item__size">规格：{{item.ggname}}</view>
+							<view class="product-item__num">数量：×{{item.num}}</view>
+						</view>
+					</view>
+					<view class="product-item__ft flex">
+						<view class="product-item__ft-btn" @tap.stop="shopCar(item)">加入购物车</view>
+						<view class="product-item__ft-btn" v-if="detail.status==3 && item.iscomment==0 && shopset.comment==1" @tap.stop="goto" :data-url="'comment?ogid=' + item.id">去评价</view>
+						<view class="product-item__ft-btn" v-if="detail.status==3 && item.iscomment==1" @tap.stop="goto" :data-url="'comment?ogid=' + item.id">查看评价</view>
+					</view>
+				</view>
+			</view>
+			<view class="order-detail__form common-module" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+				<view class="form-item flex">
+					<text class="form-item__hd">发货信息</text>
+					<text class="form-item__bd" user-select="true" selectable="true">{{detail.freight_content}}</text>
+				</view>
+			</view>
+			
+			<view class="order-detail__form common-module">
+				<view class="form-item flex">
+					<text class="form-item__hd">订单编号</text>
+					<text class="form-item__bd" user-select="true" selectable="true">{{detail.ordernum}}</text>
+				</view>
+				<view class="form-item flex">
+					<text class="form-item__hd">下单时间</text>
+					<text class="form-item__bd">{{detail.createtime}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.status>0 && detail.paytypeid!='4' && detail.paytime">
+					<text class="form-item__hd">支付时间</text>
+					<text class="form-item__bd">{{detail.paytime}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.paytypeid">
+					<text class="form-item__hd">支付方式</text>
+					<text class="form-item__bd">{{detail.paytypeid == '4' ? codtxt : detail.paytype}}</text>
+				</view>
+				<block v-if="detail.paytypeid == '5'">
+					<view class="form-item flex" v-if="pay_transfer_info.pay_transfer_account_name">
+						<text class="form-item__hd">户名</text>
+						<text class="form-item__bd">{{pay_transfer_info.pay_transfer_account_name}}</text>
+					</view>
+					<view class="form-item flex" v-if="pay_transfer_info.pay_transfer_account">
+						<text class="form-item__hd">账户</text>
+						<text class="form-item__bd">{{pay_transfer_info.pay_transfer_account}}</text>
+					</view>
+					<view class="form-item flex" v-if="pay_transfer_info.pay_transfer_bank">
+						<text class="form-item__hd">开户行</text>
+						<text class="form-item__bd">{{pay_transfer_info.pay_transfer_bank}}</text>
+					</view>
+					<view class="form-item flex" v-if="pay_transfer_info.pay_transfer_desc">
+						<text class="form-item__bd dark sub">{{pay_transfer_info.pay_transfer_desc}}</text>
+					</view>
+					<view class="form-item flex">
+						<text class="form-item__hd">付款凭证审核</text>
+						<text class="form-item__bd">{{payorder.check_status_label}}</text>
+					</view>
+					<view class="form-item flex" v-if="payorder.check_remark">
+						<text class="form-item__hd">审核备注</text>
+						<text class="form-item__bd">{{payorder.check_remark}}</text>
+					</view>
+				</block>
+				<view class="form-item flex" v-if="detail.status>1 && detail.send_time">
+					<text class="form-item__hd">发货时间</text>
+					<text class="form-item__bd">{{detail.send_time}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.status==3 && detail.collect_time">
+					<text class="form-item__hd">收货时间</text>
+					<text class="form-item__bd">{{detail.collect_time}}</text>
+				</view>
+			</view>
+			<view class="order-detail__form common-module">
+				<view class="form-item flex">
+					<text class="form-item__hd">商品金额</text>
+					<text class="form-item__bd">¥{{detail.product_price}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.disprice > 0">
+					<text class="form-item__hd">{{t('会员')}}折扣</text>
+					<text class="form-item__bd light"><text class="sub">减</text>¥{{detail.leveldk_money}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.manjian_money > 0">
+					<text class="form-item__hd">满减活动</text>
+					<text class="form-item__bd light"><text class="sub">减</text>¥{{detail.manjian_money}}</text>
+				</view>
+				<view class="form-item flex">
+					<text class="form-item__hd">配送方式</text>
+					<text class="form-item__bd dark">{{detail.freight_text}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.freight_type==1 && detail.freightprice > 0">
+					<text class="form-item__hd">服务费</text>
+					<text class="form-item__bd light"><text class="sub">加</text>¥{{detail.freight_price}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.freight_time">
+					<text class="form-item__hd">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+					<text class="form-item__bd">{{detail.freight_time}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.coupon_money > 0">
+					<text class="form-item__hd">{{t('优惠券')}}抵扣</text>
+					<text class="form-item__bd light"><text class="sub">减</text>¥{{detail.coupon_money}}</text>
+				</view>
+				
+				<view class="form-item flex" v-if="detail.scoredk > 0">
+					<text class="form-item__hd">{{t('积分')}}抵扣</text>
+					<text class="form-item__bd light"><text class="sub">减</text>¥{{detail.scoredk_money}}</text>
+				</view>
+				<view class="form-item flex">
+					<text class="form-item__hd">实付款</text>
+					<text class="form-item__bd">¥{{detail.totalprice}}</text>
+				</view>
+
+				<view class="form-item flex">
+					<text class="form-item__hd">订单状态</text>
+					<text class="form-item__bd" v-if="detail.status">{{detail.status==0?'未付款':(detail.status==1?'已付款':(detail.status==2?'已发货':(detail.status==3?'已收货':(detail.status==4?'已关闭':''))))}}</text>
+					<text v-if="detail.refundCount" style="margin-left: 8rpx;">有退款({{detail.refundCount}})</text>
+				</view>
+				<view class="form-item flex" v-if="detail.refundingMoneyTotal>0">
+					<text class="form-item__hd">退款中</text>
+					<text class="form-item__bd light arrow-right" @tap="goto" :data-url="'refundlist?orderid='+ detail.id">¥{{detail.refundingMoneyTotal}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.refundedMoneyTotal>0">
+					<text class="form-item__hd">已退款</text>
+					<text class="form-item__bd light arrow-right" @tap="goto" :data-url="'refundlist?orderid='+ detail.id">¥{{detail.refundedMoneyTotal}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.refund_status>0">
+					<text class="form-item__hd">退款状态</text>
+					<text class="form-item__bd light" v-if="detail.refund_status==1">审核中</text>
+					<text class="form-item__bd light" v-if="detail.refund_status==2">已退款</text>
+					<text class="form-item__bd light" v-if="detail.refund_status==3">已驳回</text>
+				</view>
+				
+				<view class="form-item flex" v-if="detail.balance_price>0">
+					<text class="form-item__hd">尾款</text>
+					<text class="form-item__bd light">¥{{detail.balance_price}}</text>
+				</view>
+				<view class="form-item flex" v-if="detail.balance_price>0">
+					<text class="form-item__hd">尾款状态</text>
+					<text class="form-item__bd" v-if="detail.balance_pay_status==1">已支付</text>
+					<text class="form-item__bd" v-if="detail.balance_pay_status==0">未支付</text>
+				</view>
+			</view>
+			<view class="order-detail__form common-module" v-if="detail.checkmemid">
+				<view class="form-item flex">
+					<text class="form-item__hd">所选会员</text>
+					<view class="form-item__bd flex al-item-center">
+						<image class="form-item__bd-headimg" :src="detail.checkmember.headimg"></image>
+						<text class="form-item__bd-nickname">{{detail.checkmember.nickname}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="order-detail__form common-module" v-if="(detail.formdata).length > 0">
+				<view class="form-item flex" v-for="(item,index) in detail.formdata" :key="index">
+					<text class="form-item__hd">{{item[0]}}</text>
+					<view class="form-item__bd" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+					<text class="form-item__bd" v-else user-select="true" selectable="true">{{item[1]}}</text>
+				</view>
+			</view>
+			<view class="order-detail__form common-module" v-if="detail.freight_type==11">
+				<view class="form-item flex">
+					<text class="form-item__hd">发货地址</text>
+					<text class="form-item__bd">¥{{detail.freight_content.send_address}} - {{detail.freight_content.send_tel}}</text>
+				</view>
+				<view class="form-item flex">
+					<text class="form-item__hd">收货地址</text>
+					<text class="form-item__bd">¥{{detail.freight_content.receive_address}} - {{detail.freight_content.receive_tel}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="order-detail__ft flex">
+			<block v-if="detail.payaftertourl && detail.payafterbtntext">
+				<view style="position:relative">
+					<block v-if="detail.payafter_username">
+						<view class="order-detail__ft-btn">{{detail.payafterbtntext}}</view>
+						<!-- #ifdef H5 -->
+						<wx-open-launch-weapp :username="detail.payafter_username" :path="detail.payafter_path" style="position:absolute;top:0;left:0;right:0;bottom:0;z-index:8">
+							<script type="text/wxtag-template">
+								<div style="width:100%;height:40px;"></div>
+							</script>
+						</wx-open-launch-weapp>
+						<!-- #endif -->
+					</block>
+					<block v-else>
+						<view class="order-detail__ft-btn" @tap="goto" :data-url="detail.payaftertourl">{{detail.payafterbtntext}}</view>
+					</block>
+				</view>
+			</block>
+			<block v-if="detail.isworkorder==1">
+					<view class="order-detail__ft-btn" @tap="goto" :data-url="'/activity/workorder/index?type=1&id='+detail.id" :data-id="detail.id">发起工单</view>
+			</block>
+			<block v-if="detail.status==0">
+				<view class="order-detail__ft-btn" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="order-detail__ft-btn btn-light" v-if="detail.paytypeid != 5" :style="'color:'+t('color1')" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+				<view class="order-detail__ft-btn btn-light" v-if="detail.paytypeid == 5" :style="'color:'+t('color1')" @tap="goto" :data-url="'/pages/pay/transfer?id=' + detail.payorderid">上传付款凭证</view>
+			</block>
+			<block v-if="detail.status==1">
+				<block v-if="detail.paytypeid!='4'">
+					<view class="order-detail__ft-btn" @tap="goto" :data-url="'refundSelect?orderid=' + detail.id" v-if="shopset.canrefund==1">退款</view>
+				</block>
+				<block v-else>
+					<view class="order-detail__ft-btn">{{codtxt}}</view>
+				</block>
+			</block>
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="order-detail__ft-btn" @tap="logistics" :data-express_com="detail.express_com" :data-express_no="detail.express_no" :data-express_content="detail.express_content" v-if="detail.freight_type!=3 && detail.freight_type!=4">查看物流</view>
+			</block>
+			<block v-if="([1,2,3]).includes(detail.status) && invoice">
+				<view class="order-detail__ft-btn" @tap="goto" :data-url="'invoice?type=shop&orderid=' + detail.id">发票</view>
+			</block>
+			<block v-if="detail.status==2">
+				<block v-if="detail.paytypeid!='4'">
+					<view class="order-detail__ft-btn" @tap="goto" :data-url="'refundSelect?orderid=' + detail.id" v-if="shopset.canrefund==1">退款</view>
+				</block>
+				<view class="order-detail__ft-btn btn-light" :style="'color:'+t('color1')" @tap="orderCollect" :data-id="detail.id" v-if="detail.paytypeid!='4' && (detail.balance_pay_status==1 || detail.balance_price==0)">确认收货</view>
+				<view class="order-detail__ft-btn" v-if="detail.paytypeid=='4'">{{codtxt}}</view>
+				<view v-if="detail.balance_pay_status == 0 && detail.balance_price > 0" class="order-detail__ft-btn btn-light" :style="'color:'+t('color1')" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + detail.balance_pay_orderid">支付尾款</view>
+			</block>
+			<block v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="order-detail__ft-btn" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3 || detail.status==4">
+				<view class="order-detail__ft-btn" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+			<block v-if="detail.bid>0 && detail.status==3">
+				<view v-if="iscommentdp==0" class="order-detail__ft-btn btn-light" :style="'color:'+t('color1')" @tap="goto" :data-url="'/pages/order/commentdp?orderid=' + detail.id">评价店铺</view>
+				<view v-if="iscommentdp==1" class="order-detail__ft-btn" @tap="goto" :data-url="'/pages/order/commentdp?orderid=' + detail.id">查看评价</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogSelectExpress" ref="dialogSelectExpress" type="dialog">
+			<view style="background:#fff;padding:20rpx 30rpx;border-radius:10rpx;width:600rpx">
+				<view class="sendexpress-item" v-for="(item, index) in express_content" :key="index" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" style="display: flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 0;">
+					<view class="flex1">{{item.express_com}} - {{item.express_no}}</view>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		prodata: '',
+		djs: '',
+		iscommentdp: "",
+		detail: "",
+		payorder:{},
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+		pay_transfer_info:{},
+		invoice:0,
+		selectExpressShow:false,
+		express_content:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+	  shopCar(data) {
+		 app.post('ApiShop/addcart', {proid: data.proid,ggid: data.ggid,num: data.num}, res => {
+		 	if (res.status == 1) {
+		 		app.success('添加成功');
+		 	} else {
+		 		app.error(res.msg);
+		 	}
+		 }); 
+	  },
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiOrder/detail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.iscommentdp = res.iscommentdp,
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				that.pay_transfer_info =  res.pay_transfer_info;
+				that.payorder = res.payorder;
+				that.invoice = res.invoice;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiOrder/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiOrder/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('收货中');
+        app.post('ApiOrder/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+		openLocation:function(e){
+			var latitude = parseFloat(e.currentTarget.dataset.latitude);
+			var longitude = parseFloat(e.currentTarget.dataset.longitude);
+			var address = e.currentTarget.dataset.address;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		},
+		openMendian: function(e) {
+			var storeinfo = e.currentTarget.dataset.storeinfo;
+			app.goto('/pages/shop/mendian?id=' + storeinfo.id);
+		},
+		logistics:function(e){
+			var express_com = e.currentTarget.dataset.express_com
+			var express_no = e.currentTarget.dataset.express_no
+			var express_content = e.currentTarget.dataset.express_content
+			console.log(express_content)
+			if(!express_content){
+				app.goto('/pages/order/logistics?express_com=' + express_com + '&express_no=' + express_no);
+			}else{
+				this.express_content = JSON.parse(express_content);
+				console.log(express_content);
+				this.$refs.dialogSelectExpress.open();
+			}
+		},
+		hideSelectExpressDialog:function(){
+			this.$refs.dialogSelectExpress.close();
+		}
+  }
+};
+</script>
+<style lang="scss">
+.order-detail {
+	background: #F5F5F5;
+	min-height: 100vh;	
+	padding-bottom: calc(130rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(130rpx + env(safe-area-inset-bottom));
+	&__hd {
+		height: 248rpx;
+		padding: 48rpx 0 0 70rpx;
+		box-sizing: border-box;
+		color: #FFFFFF;
+		font-weight: bold;
+		&-title {
+			font-size: 32rpx;
+			line-height: 44rpx;
+		}
+		&-subtitle {
+			margin-top: 14rpx;
+			font-size: 26rpx;
+			line-height: 36rpx;
+		}
+	}
+	&__bd {
+		margin-top: -56rpx;
+		padding: 0 24rpx;
+	}
+	.common-module {
+		margin-bottom: 24rpx;
+		background: #FFFFFF;
+		border-radius: 12rpx;
+		padding: 28rpx 24rpx;
+	}
+	&__userinfo {
+		padding-top: 32rpx;
+		&-top {
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #333333;
+			line-height: 40rpx;
+		}
+		&-tel {
+			margin-left: 20rpx;
+		}
+		.icon-box {
+			width: 40rpx;
+			height: 40rpx;
+			background: #029d5f;
+			border-radius: 50%;
+			flex-shrink: 0;
+			margin-right: 20rpx;
+			.icon-icon-location {
+				font-size: 24rpx;
+				color: #FFFFFF;
+			}
+		}
+		&-bot {
+			margin-top: 20rpx;
+		}
+		&-address {
+			flex: 1;
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+		}
+	}
+	&__list {
+		margin-bottom: 28rpx;
+		.product-item {
+			&:not(:last-child) {
+				margin-bottom: 24rpx;
+			}
+			&__hd {
+				width: 180rpx;
+				height: 180rpx;
+				flex-shrink: 0;
+				margin-right: 24rpx;
+				border-radius: 8rpx;
+				overflow: hidden;
+			}
+			&__img {
+				width: 100%;
+				height: 100%;
+			}
+			&__bd {
+				flex: 1;
+			}
+			&__info {
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #333333;
+				line-height: 36rpx;
+			}
+			&__name {
+				flex: 1;
+			}
+			&__price {
+				flex-shrink: 0;
+				margin-left: 32rpx;
+				font-size: 28rpx;
+				line-height: 40rpx;
+			}
+			&__size,&__num {
+				margin-top: 10rpx;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #999999;
+				line-height: 34rpx;
+			}
+			&__ft {
+				margin-top: 20rpx;
+				justify-content: flex-end;
+				&-btn {
+					position: relative;
+					min-width: 160rpx;
+					height: 60rpx;
+					padding: 0 20rpx;
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #666666;
+					line-height: 60rpx;
+					box-sizing: border-box;
+					margin-left: 20rpx;
+					text-align: center;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 0;
+						right: 0;
+						top: 0;
+						bottom: 0;
+						border-radius: 30rpx;
+						border: 1rpx solid #CECECE;
+					}
+				}
+			}
+		}
+	}
+	&__shop {
+		margin-bottom: 28rpx;
+		&-logo {
+			width:36rpx;
+			height:36rpx;
+			flex-shrink: 0;
+		}
+		&-name {
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+			margin-left: 16rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+	}
+	&__form {
+		.form-item {
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+			&:not(:last-child) {
+				margin-bottom: 36rpx;
+			}
+			.sub {
+				font-size: 22rpx;
+			}
+			&__hd {
+				width: 150rpx;
+				flex-shrink: 0;
+			}
+			&__bd {
+				flex: 1;
+				text-align: right;
+				&.light {
+					color: #ED5925;
+				}
+				&.dark {
+					color: #999999;
+				}
+				&.arrow-right {
+					padding-right: 30rpx;
+					position: relative;
+					&::after {
+						content: "";
+						position: absolute;
+						right: 10rpx;
+						top: 12rpx;
+						width: 14rpx;
+						height: 14rpx;
+						border-top: 1rpx solid #999999;
+						border-right: 1rpx solid #999999;
+						transform: rotate(45deg);
+					}
+				}
+				&-headimg {
+					width: 60rpx;
+					height: 60rpx;
+					border-radius: 8rpx;
+					margin-right: 10rpx;
+					flex-shrink: 0;
+				}
+			}
+			&__ft {
+				margin-left: 20rpx;
+				flex-shrink: 0;
+				color: #999999;
+				font-size: 40rpx;
+			}
+		}
+	}
+	&__ft {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: #FFFFFF;
+		padding: 20rpx 24rpx;
+		justify-content: flex-end;
+		padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		&-btn {
+			position: relative;
+			min-width: 160rpx;
+			height: 60rpx;
+			padding: 0 20rpx;
+			font-size: 24rpx;
+			font-weight: bold;
+			color: #666666;
+			line-height: 60rpx;
+			box-sizing: border-box;
+			margin-left: 20rpx;
+			text-align: center;
+			&::before {
+				content: "";
+				position: absolute;
+				left: 0;
+				right: 0;
+				top: 0;
+				bottom: 0;
+				border-radius: 30rpx;
+				border: 1rpx solid #CECECE;
+			}
+			&.btn-light {
+				&::before {
+					border-color: #0A5D3B;
+				}
+			}
+		}
+	}
+}
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+
+</style>
\ No newline at end of file
diff --git a/pages/order/invoice.vue b/pages/order/invoice.vue
new file mode 100644
index 0000000..387440c
--- /dev/null
+++ b/pages/order/invoice.vue
@@ -0,0 +1,292 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset" report-submit="true">
+			<view class="orderinfo">
+				<view class="item">
+					<text class="t1">订单编号</text>
+					<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+				</view>
+				
+				<view class="item">
+					<text class="t1">可开票金额</text>
+					<text class="t2 red">¥{{detail.totalprice}}</text>
+				</view>
+				<view class="item">
+					<text class="t1">下单时间</text>
+					<text class="t2">{{detail.createtime}}</text>
+				</view>
+			</view>
+			<view class="orderinfo">
+				<view class="item">
+					<text class="t1">发票类型</text>
+					<view class="t2">
+						<block v-if="inputDisabled">
+							<text v-if="invoice && invoice.type == 1">普通发票</text>
+							<text v-if="invoice && invoice.type == 2">增值税专用发票</text>
+						</block>
+						<block v-else>
+							<radio-group class="radio-group" @change="changeOrderType" name="invoice_type">
+							<label class="radio" v-if="inArray(1,invoice_type)">
+								<radio value="1" :checked="invoice_type_select == 1 ? true : false"></radio>普通发票
+							</label>
+							<label class="radio" v-if="inArray(2,invoice_type)">
+								<radio value="2" :checked="invoice_type_select == 2 ? true : false"></radio>增值税专用发票
+							</label>
+							</radio-group>
+						</block>
+					 </view>
+				</view>
+				<view class="item">
+					<text class="t1">抬头类型</text>
+					<view class="t2">
+						<block v-if="inputDisabled">
+							<text v-if="invoice && invoice.name_type == 1">个人</text>
+							<text v-if="invoice && invoice.name_type == 2">公司</text>
+						</block>
+						<block v-else>
+							<radio-group class="radio-group" @change="changeNameType" name="name_type">
+							<label class="radio">
+								<radio value="1" :checked="name_type_select == 1 ? true : false" :disabled="name_type_personal_disabled ? true : false"></radio>个人
+							</label>
+							<label class="radio">
+								<radio value="2" :checked="name_type_select == 2 ? true : false"></radio>公司
+							</label>
+							</radio-group>
+						</block>
+					</view>
+				</view>
+				<view class="item">
+					<text class="t1">抬头名称</text>
+					<input class="t2" type="text" placeholder="抬头名称" placeholder-style="font-size:28rpx;color:#BBBBBB" name="invoice_name" :disabled="inputDisabled" :value="invoice ? invoice.invoice_name : ''" ></input>
+				</view>
+				<view class="item" v-if="name_type_select == 2">
+					<text class="t1">公司税号</text>
+					<input class="t2" type="text" placeholder="公司税号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="tax_no" :disabled="inputDisabled" :value="invoice ? invoice.tax_no : ''"></input>
+				</view>
+				<view class="item" v-if="invoice_type_select == 2">
+					<text class="t1">注册地址</text>
+					<input class="t2" type="text" placeholder="注册地址" placeholder-style="font-size:28rpx;color:#BBBBBB" name="address" :disabled="inputDisabled" :value="invoice ? invoice.address : ''"></input>
+				</view>
+				<view class="item" v-if="invoice_type_select == 2">
+					<text class="t1">注册电话</text>
+					<input class="t2" type="text" placeholder="注册电话" placeholder-style="font-size:28rpx;color:#BBBBBB" name="tel" :disabled="inputDisabled" :value="invoice ? invoice.tel : ''"></input>
+				</view>
+				<view class="item" v-if="invoice_type_select == 2">
+					<text class="t1">开户银行</text>
+					<input class="t2" type="text" placeholder="开户银行" placeholder-style="font-size:28rpx;color:#BBBBBB" name="bank_name" :disabled="inputDisabled" :value="invoice ? invoice.bank_name : ''"></input>
+				</view>
+				<view class="item" v-if="invoice_type_select == 2">
+					<text class="t1">银行账号</text>
+					<input class="t2" type="text" placeholder="银行账号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="bank_account" :disabled="inputDisabled" :value="invoice ? invoice.bank_account : ''"></input>
+				</view>
+				<view class="item">
+					<text class="t1">手机号</text>
+					<input class="t2" type="text" placeholder="接收电子发票手机号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="mobile" :disabled="inputDisabled" :value="invoice ? invoice.mobile : ''"></input>
+				</view>
+				<view class="item">
+					<text class="t1">邮箱</text>
+					<input class="t2" type="text" placeholder="接收电子发票邮箱" placeholder-style="font-size:28rpx;color:#BBBBBB" name="email" :disabled="inputDisabled" :value="invoice ? invoice.email : ''"></input>
+				</view>
+				<!-- <view class="item" v-if="pay_transfer_info.pay_transfer_desc">
+					<text class="text-min">{{pay_transfer_info.pay_transfer_desc}}</text>
+				</view> -->
+				<view class="item">
+					<text class="t1">开票状态</text>
+					<text class="t2" v-if="invoice">{{invoice.status_label}}</text>
+					<text class="t2" v-else>未申请</text>
+				</view>
+				<view class="item" v-if="invoice && invoice.check_remark">
+					<text class="t1">审核备注</text>
+					<text class="t2">{{invoice.check_remark}}</text>
+				</view>
+			</view>
+			<button class="btn" v-if=" !invoice" form-type="submit" :style="{background:t('color1')}">确定</button>
+			<button class="btn" v-if=" invoice && invoice.status != 1" form-type="submit" :style="{background:t('color1')}">修改</button>
+			<view class="btn-a" @tap="back">返回上一步</view>
+			<view style="padding-top:30rpx"></view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				
+				pics:[],
+				detail:{},
+				invoice:{},
+				invoice_type:[],
+				invoice_type_select:1,
+				name_type_select:1,
+				name_type_personal_disabled:false,
+				inputDisabled:false
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.pre_url = app.globalData.pre_url;
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				var type = that.opt.type;
+				that.loading = true;
+				app.get('ApiOrder/invoice', {id: that.opt.orderid,type:type}, function (res) {
+					that.loading = false;
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					that.detail = res.detail;
+					that.invoice = res.invoice;
+					if(res.invoice) {
+						that.invoice_type_select = res.invoice.type;
+						that.name_type_select = res.invoice.name_type;
+						if(that.invoice_type_select == 2) {
+							that.name_type_personal_disabled = true;
+						} else {
+							that.name_type_personal_disabled = false;
+						}
+						if(res.invoice.status == 1) {
+							that.inputDisabled = true;
+						}
+ 					}else{
+						if(app.inArray(1,res.invoice_type)){
+							that.invoice_type_select = 1;
+						}else if(app.inArray(2,res.invoice_type)){
+							that.invoice_type_select = 2;
+						}
+					}
+					that.invoice_type = res.invoice_type;
+					
+					that.loaded();
+					//
+				});
+			},
+    formSubmit: function (e) {
+      var that = this;
+      var id = that.opt.orderid;
+			var type = that.opt.type;
+			var formdata = e.detail.value;
+			if(formdata.invoice_name == '') {
+				app.error('请填写抬头名称');
+				return;
+			}
+			if((formdata.name_type == 2 || formdata.invoice_type == 2) && formdata.tax_no == '') {
+				///^[A-Z0-9]{15}$|^[A-Z0-9]{17}$|^[A-Z0-9]{18}$|^[A-Z0-9]{20}$/
+				app.error('请填写公司税号');
+				return;
+			}
+			if(formdata.invoice_type == 2) {
+				if(formdata.address == '') {
+					app.error('请填写注册地址');
+					return;
+				}
+				if(formdata.tel == '') {
+					app.error('请填写注册电话');
+					return;
+				}
+				if(formdata.bank_name == '') {
+					app.error('请填写开户银行');
+					return;
+				}
+				if(formdata.bank_account == '') {
+					app.error('请填写银行账号');
+					return;
+				}
+			}
+			if (formdata.mobile != '') {
+				if(!/^1[3456789]\d{9}$/.test(formdata.mobile)){
+					app.error("手机号码有误，请重填");
+					return;
+				}
+			}
+			if (formdata.email != '') {
+				if(!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(formdata.email)){
+					app.error("邮箱有误，请重填");
+					return;
+				}
+			}
+			if(formdata.mobile == '' && formdata.email == '') {
+				app.error("手机号和邮箱请填写其中一个");
+				return;
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiOrder/invoice', {id: id,formdata:formdata,type:type}, function (res) {
+				app.showLoading(false);
+        app.alert(res.msg);
+        if (res.status == 1) {
+         setTimeout(function () {
+					 if(type == 'shop')
+						app.goto('/pages/order/detail?id='+that.detail.id);
+					 else
+						app.goto('/activity/'+type+'/orderdetail?id='+that.detail.id);
+         }, 1000);
+        }
+      });
+    },
+		changeOrderType: function(e) {
+			var that = this;
+			var value = e.detail.value;
+			if(value == 2) {
+				that.name_type_select = 2;
+				that.name_type_personal_disabled = true;
+			} else {
+				that.name_type_personal_disabled = false;
+			}
+			that.invoice_type_select = value;
+		},
+		changeNameType: function(e) {
+			var that = this;
+			var value = e.detail.value;
+			that.name_type_select = value;
+		},
+		back:function(e) {
+			uni.navigateBack({
+				
+			})
+		}
+		}
+	}
+</script>
+
+<style>
+.radio radio{transform: scale(0.8);}
+.radio:nth-child(2) { margin-left: 30rpx;}
+.btn-a { text-align: center; padding: 30rpx; color: rgb(253, 74, 70);}
+.text-min { font-size: 24rpx; color: #999;}
+.orderinfo{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right; font-size: 28rpx;}
+.orderinfo .item .red{color:red}
+.orderinfo .item .grey{color:grey}
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+
+.form-content{width:94%;margin:16rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item{ width:100%;padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #f5f5f5 solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
diff --git a/pages/order/logistics.vue b/pages/order/logistics.vue
new file mode 100644
index 0000000..e71394e
--- /dev/null
+++ b/pages/order/logistics.vue
@@ -0,0 +1,332 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<block v-if="express_com=='同城配送'">
+		<map v-if="psorder.status!=0 && psorder.status!=4" class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:psuser.latitude,
+			longitude:psuser.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_qishou.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+		<map v-else class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+
+		<view class="order-box">
+			<view class="head">
+				<view class="f1" v-if="psorder.status==4"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已送达</view>
+				<view class="f1" v-else-if="psorder.leftminute>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">{{psorder.leftminute}}分钟内</text> 送达</view>
+				<view class="f1" v-else-if="psorder.yujitime>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已超时<text class="t1" style="margin-left:10rpx">{{-psorder.leftminute}}分钟</text></view>
+				<view class="f1" v-else><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>配送中</view>
+				<view class="flex1"></view>
+				<view class="f2"><text class="t1">{{orderinfo.freight_price}}</text>元</view>
+			</view>
+			<view class="content" style="border-bottom:0">
+				<view class="f1">
+					<view class="t1"><text class="x1">{{psorder.juli}}</text><text class="x2">{{psorder.juli_unit}}</text></view>
+					<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+					<view class="t3"><text class="x1">{{psorder.juli2}}</text><text class="x2">{{psorder.juli2_unit}}</text></view>
+				</view>
+				<view class="f2">
+					<view class="t1">{{binfo.name}}</view>
+					<view class="t2">{{binfo.address}}</view>
+					<view class="t3">{{orderinfo.address}}</view>
+				</view>
+				<view class="f3" @tap.stop="daohang"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">商品清单({{orderinfo.procount}})</view>
+			<view v-for="(item, idx) in prolist" :key="idx" class="item">
+				<text class="t1 flex1">{{item.name}} {{item.ggname}}</text>
+				<text class="t2 flex0">￥{{item.sell_price}} ×{{item.num}} </text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="psorder.status!=0">
+			<view class="box-title">配送信息</view>
+			<view class="item" v-if="psuser.realname">
+				<text class="t1">配送员</text>
+				<text class="t2"><text style="font-weight:bold">{{psuser.realname}}</text>({{psuser.tel}})</text>
+			</view>
+			<view class="item">
+				<text class="t1">接单时间</text>
+				<text class="t2">{{date(psorder.starttime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.daodiantime">
+				<text class="t1">到店时间</text>
+				<text class="t2">{{date(psorder.daodiantime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.quhuotime">
+				<text class="t1">取货时间</text>
+				<text class="t2">{{date(psorder.quhuotime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.endtime">
+				<text class="t1">送达时间</text>
+				<text class="t2">{{date(psorder.endtime)}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{date(orderinfo.createtime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{date(orderinfo.paytime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{orderinfo.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{orderinfo.product_price}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{orderinfo.totalprice}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{orderinfo.message ? orderinfo.message : '无'}}</text>
+			</view>
+		</view>
+		<view style="width:100%;height:120rpx"></view>
+		<view class="bottom">
+			<view class="f1" v-if="psorder.status!=0 && psuser.tel" @tap="call" :data-tel="psuser.tel"><image :src="event_rul +'/static/img/static/peisong/tel1.png'" class="img"/>联系配送员</view>
+			<view class="f2" v-if="psorder.status!=0" @tap="call" :data-tel="binfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel2.png'" class="img"/>联系商家</view>
+			<view class="btn1" @tap="goto" :data-url="'commentps?id='+psorder.id" v-if="psorder.psid>0 && psorder.status==4">评价配送员</view>
+		</view>
+	</block>
+	<block v-else-if="express_com=='货运托运'">
+		<view class="orderinfo">
+			<block v-if="datalist.pic">
+			<view class="item">
+				<text class="t1">物流单照片</text>
+			</view>
+			<view class="item">
+				<image class="t2" :src="datalist.pic" @tap="previewImage" :data-url="datalist.pic" mode="widthFix"/>
+			</view>
+			</block>
+			<view class="item" v-if="datalist.fhname">
+				<text class="t1">发货人信息</text>
+				<text class="t2">{{datalist.fhname}}</text>
+			</view>
+			<view class="item" v-if="datalist.fhaddress">
+				<text class="t1">发货地址</text>
+				<text class="t2">{{datalist.fhaddress}}</text>
+			</view>
+			<view class="item" v-if="datalist.shname">
+				<text class="t1">收货人信息</text>
+				<text class="t2">{{datalist.shname}}</text>
+			</view>
+			<view class="item" v-if="datalist.shaddress">
+				<text class="t1">收货地址</text>
+				<text class="t2">{{datalist.shaddress}}</text>
+			</view>
+			<view class="item" v-if="datalist.remark">
+				<text class="t1">备注</text>
+				<text class="t2">{{datalist.remark}}</text>
+			</view>
+		</view>
+	</block>
+	<block v-else>
+		<view class="expressinfo">
+			<view class="head">
+				<view class="f1"><image :src="pre_url + '/static/img/feiji.png'"></image></view>
+				<view class="f2">
+					<view class="t1">快递公司：<text style="color:#333">{{express_com}}</text></view>
+					<view class="t2">快递单号：<text style="color:#333">{{express_no}}</text></view>
+				</view>
+			</view>
+			<view class="content">
+				<view v-for="(item, index) in datalist" :key="index" :class="'item ' + (index==0?'on':'')">
+					<view class="f1"><image :src="event_rul +'/static/img/static/img/dot' + (index==0?'2':'1') + '.png'"></image></view>
+					<view class="f2">
+						<text class="t2">{{item.time}}</text>
+						<text class="t1">{{item.context}}</text>
+					</view>
+				</view>
+				<nodata v-if="nodata" text="暂未查找到物流信息"></nodata>
+			</view>
+		</view>
+	</block>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		nodata:false,
+		express_com: '',
+		express_no: '',
+		datalist: [],
+
+		orderinfo: {},
+		prolist: [],
+		binfo: {},
+		psuser: {},
+		psorder: {},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onPullDownRefresh: function () {
+    this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.express_com = that.opt.express_com;
+			that.express_no = that.opt.express_no;
+			that.loading = true;
+			app.get('ApiOrder/logistics', {express_com: that.express_com,express_no: that.express_no}, function (res) {
+				that.loading = false;
+				if(that.express_com == '同城配送'){
+					that.orderinfo = res.orderinfo;
+					that.prolist = res.prolist;
+					that.binfo = res.binfo;
+					that.psorder = res.psorder;
+					that.psuser = res.psuser;
+					setTimeout(function(){
+						that.getdata();
+					},10000)
+				}else{
+					var datalist = res.datalist;
+					if (datalist.length < 1) {
+						that.nodata = true;
+					}
+					that.datalist = datalist;
+				}
+				that.loaded();
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		}
+  }
+}
+</script>
+<style>
+.expressinfo .head { width:100%;background: #fff; margin:20rpx 0;padding: 20rpx 20rpx;display:flex;align-items:center}
+.expressinfo .head .f1{ width:120rpx;height:120rpx;margin-right:20rpx}
+.expressinfo .head .f1 image{width:100%;height:100%}
+.expressinfo .head .f2{display:flex;flex-direction:column;flex:auto;font-size:30rpx;color:#999999}
+.expressinfo .head .f2 .t1{margin-bottom:8rpx}
+.expressinfo .content{ width: 100%;  background: #fff;display:flex;flex-direction:column;color: #979797;padding:20rpx 40rpx}
+.expressinfo .content .on{color: #23aa5e;}
+.expressinfo .content .item{display:flex;width: 96%;  margin: 0 2%;border-left: 1px #dadada solid;padding:10rpx 0}
+.expressinfo .content .item .f1{ width:40rpx;flex-shrink:0;position:relative}
+.expressinfo .content image{width: 30rpx; height: 30rpx; position: absolute; left: -16rpx; top: 22rpx;}
+/*.content .on image{ top:-1rpx}*/
+.expressinfo .content .item .f1 image{ width: 30rpx; height: 30rpx;}
+
+.expressinfo .content .item .f2{display:flex;flex-direction:column;flex:auto;}
+.expressinfo .content .item .f2 .t1{font-size: 30rpx;}
+.expressinfo .content .item .f2 .t1{font-size: 26rpx;}
+
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;align-items:center;height:100rpx;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+</style>
\ No newline at end of file
diff --git a/pages/order/orderlist.vue b/pages/order/orderlist.vue
new file mode 100644
index 0000000..fc5c884
--- /dev/null
+++ b/pages/order/orderlist.vue
@@ -0,0 +1,441 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待发货','待收货','已完成']" :itemst="['all','0','1','2','3']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="pages-con">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-item" @tap="goto" :data-url="'detail?id=' + item.id">
+					<view class="order-item__hd flex j-between al-item-center">
+						<view class="order-item__name flex al-item-center" v-if="item.bid==0" @tap.stop="goto" :data-url="'/pagesA/shop/index?id=' + item.bid"><text class="iconfont icon-dianpuguanli" :style="'color:' + t('color1')"></text> {{item.binfo.name}}</view>
+						<view class="order-item__name flex al-item-center" v-else><image class="order-item__logo" :src="item.binfo.logo"></image> {{item.binfo.name}}</view>
+						<text class="order-item__state" :style="'color:' + t('color1')" v-if="item.status == 0">{{item.status == 0 ? '待付款':''}}</text>
+						<text class="order-item__state" :style="'color:' + t('color1')" v-if="item.status">{{item.status==2?'待收货':(item.status==3?'已完成':(item.status==4?'已关闭':(item.status==1?(item.freight_type==1?'待提货':'待发货'):'')))}}</text>
+					</view>
+					<view class="order-item__bd">
+						<block v-for="(item2, idx) in item.prolist" :key="idx">
+							<view class="product-item flex">
+								<view class="product-item__hd" @tap.stop="goto" :data-url="'/pages/shop/product?id=' + item2.proid">
+									<image class="product-item__img" :src="item2.pic"></image>
+								</view>
+								<view class="product-item__bd">
+									<view class="product-item__info flex">
+										<view class="product-item__name">{{item2.name}}</view>
+										<view class="product-item__price">￥{{item2.sell_price}}</view>
+									</view>
+									<view class="product-item__size">规格：{{item2.ggname}}</view>
+									<view class="product-item__num">数量：×{{item2.num}}</view>
+								</view>
+							</view>
+						</block>
+					</view>
+					<view class="order-item__ft">
+						<view class="order-item__ft-refund flex" v-if="item.refund_status">
+							<view class="refund-hd">退款</view>
+							<text class="refund-bd">{{item.refund_status==1?'退款中'+item.refund_money:(item.refund_status==2?'已退款￥'+item.refund_money:(item.refund_status==3?'退款申请已驳回':''))}}</text>
+							<text class="refund-bd" v-if="item.refundCount"> 有退款({{item.refundCount}})</text>
+						</view>
+						<view class="order-item__ft-top flex al-item-center">
+							<view class="order-item__ft-piece">共计{{item.procount}}件商品</view>
+							<view class="order-item__ft-total">实付:￥{{item.totalprice}}</view>
+							<view class="order-item__ft-total" v-if="item.balance_price > 0 && item.balance_pay_status == 0">尾款：￥{{item.balance_price}}</view>
+						</view>
+						<view class="order-item__ft-bot flex al-item-center">
+							<block v-if="([1,2,3]).includes(item.status) && item.invoice">
+								<view class="order-item__ft-btn" @tap.stop="goto" :data-url="'invoice?type=shop&orderid=' + item.id">发票</view>
+							</block>
+							<view @tap.stop="goto" :data-url="'detail?id=' + item.id" class="order-item__ft-btn">详情</view>
+							<block v-if="item.status==0">
+								<view class="order-item__ft-btn" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+								<view class="order-item__ft-btn btn-light" v-if="item.paytypeid!=5" :style="'color:'+t('color1')" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+								<view class="order-item__ft-btn btn-light" v-if="item.paytypeid==5" :style="'color:'+t('color1')" @tap.stop="goto" :data-url="'/pages/pay/transfer?id=' + item.payorderid">付款凭证</view>
+							</block>
+							<block v-if="item.status==1">
+								<block v-if="item.paytypeid!='4'">
+									<view class="order-item__ft-btn" @tap.stop="goto" :data-url="'refundSelect?orderid=' + item.id + '&price=' + item.totalprice" v-if="canrefund==1">退款</view>
+								</block>
+								<block v-else>
+									<view class="order-item__ft-btn">{{codtxt}}</view>
+								</block>
+							</block>
+							<block v-if="item.status==2">
+								<block v-if="item.paytypeid!='4'">
+									<view class="order-item__ft-btn" @tap.stop="goto" :data-url="'refundSelect?orderid=' + item.id + '&price=' + item.totalprice" v-if="canrefund==1">退款</view>
+								</block>
+								<block v-else>
+								<view class="order-item__ft-btn">{{codtxt}}</view>
+								</block>
+								<view class="order-item__ft-btn" @tap.stop="logistics" :data-express_com="item.express_com" :data-express_no="item.express_no" :data-express_content="item.express_content" v-if="item.freight_type!=3 && item.freight_type!=4">查看物流</view>
+								<view v-if="item.balance_pay_status == 0 && item.balance_price > 0" class="order-item__ft-btn btn-light" :style="'color:'+t('color1')" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.balance_pay_orderid">支付尾款</view>
+								<view v-if="item.paytypeid!='4' && (item.balance_pay_status==1 || item.balance_price==0)" class="order-item__ft-btn btn-light" :style="'color:'+t('color1')" @tap.stop="orderCollect" :data-id="item.id">确认收货</view>
+							</block>
+							<block v-if="(item.status==1 || item.status==2) && item.freight_type==1">
+								<view class="order-item__ft-btn" @tap.stop="showhxqr" :data-hexiao_qr="item.hexiao_qr">核销码</view>
+							</block>
+							<block v-if="item.status==3 || item.status==4">
+								<view class="order-item__ft-btn" @tap.stop="todel" :data-id="item.id">删除订单</view>
+							</block>
+							<block v-if="item.bid>0 && item.status==3">
+								<view v-if="item.iscommentdp==0" class="order-item__ft-btn btn-light" :style="'color:'+t('color1')" @tap.stop="goto" :data-url="'/pages/order/commentdp?orderid=' + item.id">评价店铺</view>
+							</block>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+
+		
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="hexiao_qr" @tap="previewImage" :data-url="hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup id="dialogSelectExpress" ref="dialogSelectExpress" type="dialog">
+			<view style="background:#fff;padding:20rpx 30rpx;border-radius:10rpx;width:600rpx" v-if="express_content">
+				<view class="sendexpress-item" v-for="(item, index) in express_content" :key="index" @tap="goto" :data-url="'/pages/order/logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" style="display: flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 0;">
+					<view class="flex1">{{item.express_com}} - {{item.express_no}}</view>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/>
+				</view>
+			</view>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		codtxt: "",
+		canrefund:1,
+		express_content:'',
+		selectExpressShow:false,
+		hexiao_qr:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiOrder/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.codtxt = res.codtxt;
+					that.canrefund = res.canrefund;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiOrder/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiOrder/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiOrder/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		logistics:function(e){
+			var express_com = e.currentTarget.dataset.express_com
+			var express_no = e.currentTarget.dataset.express_no
+			var express_content = e.currentTarget.dataset.express_content
+			console.log(express_content)
+			if(!express_content){
+				app.goto('/pages/order/logistics?express_com=' + express_com + '&express_no=' + express_no);
+			}else{
+				this.express_content = JSON.parse(express_content);
+				console.log(express_content);
+				this.$refs.dialogSelectExpress.open();
+			}
+		},
+		hideSelectExpressDialog:function(){
+			this.$refs.dialogSelectExpress.close();
+		},
+		showhxqr:function(e){
+			this.hexiao_qr = e.currentTarget.dataset.hexiao_qr
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		},
+  }
+};
+</script>
+<style lang="scss">
+.container{
+	min-height: 100vh;
+	background: #F5F5F5;
+	box-sizing: border-box;
+	padding-top: 90rpx;	
+	padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+}
+.pages-con{
+	padding: 24rpx;
+}
+.order-item {
+	background: #FFF;
+	border-radius:12rpx;
+	padding: 28rpx 24rpx;
+	&:not(:last-child) {
+		margin-bottom: 24rpx;
+	}
+	&__hd {
+		display:flex;
+	}
+	&__name {
+		font-size: 28rpx;
+		font-weight: bold;
+		color: #333333;
+		line-height: 40rpx;
+	}
+	.icon-dianpuguanli {
+		font-size: 36rpx;
+		flex-shrink: 0;
+		margin-right: 4rpx;
+	}
+	&__logo {
+		width: 36rpx;
+		height: 36rpx;
+		flex-shrink: 0;
+		margin-right: 4rpx;
+	}
+	&__state {
+		flex-shrink: 0;
+		margin-left: 20rpx;
+		font-size: 28rpx;
+		line-height: 40rpx;
+	}
+	&__bd {
+		margin-top: 40rpx;
+	}
+	.product-item {
+		margin-bottom: 40rpx;
+		&__hd {
+			width: 180rpx;
+			height: 180rpx;
+			flex-shrink: 0;
+			margin-right: 24rpx;
+			border-radius: 8rpx;
+			overflow: hidden;
+		}
+		&__img {
+			width: 100%;
+			height: 100%;
+		}
+		&__bd {
+			flex: 1;
+		}
+		&__info {
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #333333;
+			line-height: 36rpx;
+		}
+		&__name {
+			flex: 1;
+		}
+		&__price {
+			flex-shrink: 0;
+			margin-left: 32rpx;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		&__size,&__num {
+			margin-top: 10rpx;
+			font-size: 24rpx;
+			font-weight: bold;
+			color: #999999;
+			line-height: 34rpx;
+		}
+	}
+	&__ft {
+		padding-top: 10rpx;
+		&-top {
+			justify-content: flex-end;
+			font-size: 28rpx;
+			color: #999999;
+			line-height: 30rpx;
+		}
+		&-total {
+			color: #333333;
+			font-weight: bold;
+			margin-left: 14rpx;
+		}
+		&-refund {
+			padding: 30rpx 24rpx;
+			background: #FAFAFA;
+			border-radius: 8rpx;
+			margin-top: -8rpx;
+			font-size: 28rpx;
+			line-height: 30rpx;
+			.refund-hd {
+				font-weight: bold;
+				flex-shrink: 0;
+				margin-right: 28rpx;
+			}
+		}
+		&-bot {
+			margin-top: 30rpx;
+			justify-content: flex-end;
+		}
+		&-btn {
+			position: relative;
+			min-width: 156rpx;
+			height: 60rpx;
+			padding: 0 20rpx;
+			font-size: 24rpx;
+			font-weight: bold;
+			color: #666666;
+			line-height: 60rpx;
+			box-sizing: border-box;
+			margin-left: 12rpx;
+			text-align: center;
+			&::before {
+				content: "";
+				position: absolute;
+				left: 0;
+				right: 0;
+				top: 0;
+				bottom: 0;
+				border-radius: 30rpx;
+				border: 1rpx solid #CECECE;
+			}
+			&.btn-light {
+				&::before {
+					border-color: #0A5D3B;
+				}
+			}
+		}
+	}
+}
+.order-item .order-item__hd .f1{display:flex;align-items:center;color:#333;font-size: 28rpx;line-height: 40rpx;}
+.order-item .order-item__hd image{width: 36rpx;height: 36rpx;margin-right: 4rpx;}
+.order-item .order-item__hd .order-state {flex-shrink: 0;margin-left: 20rpx;}
+
+.order-item .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-item .content:last-child{ border-bottom: 0; }
+.order-item .content image{ width: 140rpx; height: 140rpx;}
+.order-item .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-item .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-item .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-item .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-item .content .detail .x1{ flex:1}
+.order-item .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-item .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-item .op{ display:flex;flex-wrap: wrap;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx; margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center;}
+.btn2{margin-left:20rpx; margin-top: 10rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center;}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/pages/order/refund.vue b/pages/order/refund.vue
new file mode 100644
index 0000000..29325fb
--- /dev/null
+++ b/pages/order/refund.vue
@@ -0,0 +1,323 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset" report-submit="true">
+			<view class="form-content">
+				<view class="form-item">
+					<text class="label">退款商品</text>
+				</view>
+				<view class="product">
+					<view v-for="(item, index) in prolist" :key="index" class="content">
+						<view @tap="goto" :data-url="'/pages/shop/product?id=' + item.proid">
+							<image :src="item.pic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.name}}</text>
+							<text class="t2">{{item.ggname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text>
+							<!-- <text class="x2">×{{item.num}}</text> -->
+							<view class="num-wrap">
+								<view class="addnum">
+									<view class="minus"><image class="img" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="gwcminus" :data-index="index" :data-ogid="item.id" :data-num="refundNum[index].num"/></view>
+									<input class="input" type="number" :value="refundNum[index].num" @blur="gwcinput" :data-index="index" :data-ogid="item.id" :data-max="item.num-item.refund_num" :data-num="refundNum[index].num"></input>
+									<view class="plus"><image class="img" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="gwcplus" :data-index="index" :data-ogid="item.id" :data-max="item.num-item.refund_num" :data-num="refundNum[index].num"/></view>
+								</view>
+								<view class="text-desc">申请数量：最多可申请{{item.canRefundNum}}件</view>
+							</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-content">
+				<view class="form-item" v-if="opt.type == 'refund'" style="display:none">
+					<text class="label">货物状态</text>
+					<view class="input-item">
+						<picker @change="pickerChange" :value="cindex" :range="cateArr" name="receive" style="height:80rpx;line-height:80rpx;border-bottom:1px solid #EEEEEE">
+							<view class="picker">{{cindex==-1? '请选择' : cateArr[cindex]}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<text class="label">退款原因</text>
+					<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason" @input="reasonInput"></textarea></view>
+				</view>
+				<view class="form-item">
+					<text class="label">退款金额(元)</text>
+					<view class="flex"><input name="money" @input="moneyInput" type="digit" :value="money" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+				</view>
+				<view class="form-item flex-col">
+					<view class="label">上传图片(最多三张)</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic"><image :src="event_rul +'/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="content_pic.length<3"></view>
+					</view>
+				</view>
+			</view>
+			<button class="btn" @tap="formSubmit" :style="{background:t('color1')}">确定</button>
+			<view style="padding-top:30rpx"></view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:'',
+		orderid: '',
+		totalprice: 0,
+		order:{},
+		detail: {},
+		refundNum:[],
+		prolist: [],
+		content_pic:[],
+		cindex:-1,
+		cateArr:['未收到货','已收到货'],
+		type:'',
+		money:'',
+		reason:'',
+		tmplids:[],
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.orderid = this.opt.orderid;
+		this.pre_url = app.globalData.pre_url;
+		this.type = this.opt.type;
+		if(this.type == 'return') {
+			uni.setNavigationBarTitle({
+			  title: '申请退货退款'
+			});
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiOrder/refundinit', {id: that.orderid}, function (res) {
+				that.loading = false;
+				if(res.status == 0) {
+					app.alert(res.msg,function(){
+						app.goback();retrun;
+					})
+				}
+				that.tmplids = res.tmplids;
+				that.detail = res.detail;
+				that.totalprice = that.detail.returnTotalprice;
+				that.money = that.totalprice;
+				var temp = [];
+				that.prolist = res.prolist;
+				that.order = res.order;
+				for(var i in that.prolist) {
+					temp.push({ogid:that.prolist[i].id,num:that.prolist[i].canRefundNum})
+				}
+				console.log(temp)
+				that.refundNum = temp;
+				that.loaded();
+			});
+		},
+		pickerChange: function (e) {
+		  this.cindex = e.detail.value;
+		},
+    formSubmit: function () {
+      var that = this;
+      var orderid = that.orderid;
+      var reason = that.reason;
+			var receive = that.cindex;
+      var money = parseFloat(that.money);
+			var refundNum = that.refundNum;
+			var content_pic = that.content_pic;
+			var refundtotal = 0;
+			for(var i in refundNum) {
+				refundtotal += refundNum[i].num;
+			}
+			if(refundtotal <= 0) {
+				app.alert('请选择要退款的商品');
+				return;
+			}
+			//if (receive == -1 && that.opt.type == 'refund') {
+        //app.alert('请选择货物状态');
+        //return;
+      //}
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+			
+      if (money < 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiOrder/refund', {orderid: orderid,reason: reason,money: money,content_pic:content_pic,receive:receive,refundNum:refundNum,type:that.type}, function (res) {
+				app.showLoading(false);
+        app.alert(res.msg);
+        if (res.status == 1) {
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goto('detail?id='+that.orderid);
+            }, 1000);
+          });
+        }
+      });
+    },
+		//加
+		gwcplus: function (e) {
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  var maxnum = parseInt(e.currentTarget.dataset.max);
+		  var ogid = e.currentTarget.dataset.ogid;
+		  var num = parseInt(e.currentTarget.dataset.num);
+		  if (num >= maxnum) {
+		    return;
+		  }
+			var refundNum = this.refundNum;
+			refundNum[index].num++;
+			this.refundNum = refundNum
+			this.calculate();
+		},
+		//减
+		gwcminus: function (e) {
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  var maxnum = parseInt(e.currentTarget.dataset.max);
+		  var ogid = e.currentTarget.dataset.ogid;
+		  var num = parseInt(e.currentTarget.dataset.num);
+		  if (num == 0) return;
+			var refundNum = this.refundNum;
+			refundNum[index].num--;
+			this.refundNum = refundNum
+			this.calculate();
+		},
+		//输入
+		gwcinput: function (e) {
+		  var index = parseInt(e.currentTarget.dataset.index);
+		  var maxnum = parseInt(e.currentTarget.dataset.max);
+		  var ogid = e.currentTarget.dataset.ogid;
+		  var num = parseInt(e.currentTarget.dataset.num);
+		  var newnum = parseInt(e.detail.value);
+		  console.log(num + '--' + newnum);
+		  if (num == newnum) return;
+		
+		  if (newnum > maxnum) {
+		    app.error('请输入正确数量');
+		    return;
+		  }
+			var refundNum = this.refundNum;
+			refundNum[index].num = newnum;
+			this.refundNum = refundNum
+			this.calculate();
+		},
+    calculate: function () {
+			var that = this;
+			var total = 0;
+			var refundTotalNum = 0;
+			for(var i in that.refundNum) {
+				if(that.refundNum[i].num == that.prolist[i].num)
+					total += parseFloat(that.prolist[i].real_totalprice);
+				else {
+					total += that.refundNum[i].num * parseFloat(that.prolist[i].real_totalprice) / that.prolist[i].num;
+				}
+				refundTotalNum += that.refundNum[i].num;
+			}
+			if(refundTotalNum == that.detail.totalNum || refundTotalNum == that.detail.canRefundNum) {
+				total = that.detail.returnTotalprice;
+			}
+			console.log(total)
+			total = parseFloat(total);
+			total = total.toFixed(2);
+			that.totalprice = total;			
+		},
+		moneyInput: function (e) {
+			var newmoney = parseInt(e.detail.value);
+			if (newmoney <= 0 || newmoney > parseFloat(this.totalprice)) {
+			  app.error('最大退款金额:'+this.totalprice);
+			  return;
+			}
+			this.money = newmoney;
+		},
+		reasonInput: function (e) {
+			this.reason = e.detail.value;
+		},
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+  }
+};
+</script>
+<style>
+	.num-wrap {position: absolute;right: 0;bottom:24rpx;}
+	.num-wrap .text-desc { margin-bottom: -60rpx; color: #999; font-size: 24rpx; text-align: right;}
+	.addnum {position: absolute;right: 0;bottom:0rpx;font-size: 30rpx;color: #666;width:auto;display:flex;align-items:center}
+	.addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+	.addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+	.product .addnum .img{width:24rpx;height:24rpx}
+	.addnum .i {padding: 0 20rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx}
+	.addnum .input{flex:1;width:70rpx;border:0;text-align:center;color:#2B2B2B;font-size:24rpx}
+	
+	.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+	.form-item4 .label{ width:150rpx;}
+	.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+	.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+	.layui-imgbox-close image{width:100%;height:100%}
+	.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+	.layui-imgbox-img>image{max-width:100%;}
+	.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+	.uploadbtn{position:relative;height:200rpx;width:200rpx}
+	
+.product{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed; height: 196rpx;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;height:72rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246; position: relative;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.form-content{width:94%;margin:16rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item{ width:100%;padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #f5f5f5 solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/pages/order/refundDetail.vue b/pages/order/refundDetail.vue
new file mode 100644
index 0000000..cad2091
--- /dev/null
+++ b/pages/order/refundDetail.vue
@@ -0,0 +1,242 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop_refund.jpg);background-size:100%'">
+			<view class="f1" v-if="detail.refund_status==0">
+				<view class="t1">已取消</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==1">
+				<view class="t1">审核中</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==2">
+				<view class="t1">审核通过，已退款</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==3">
+				<view class="t1">驳回</view>
+			</view>
+			<view class="f1" v-if="detail.refund_status==4">
+				<view class="t1">审核通过，待退货</view>
+				<view class="t2">联系商家进行退货</view>
+			</view>
+		</view>
+		<view class="btitle flex-y-center" v-if="detail.bid>0" @tap="goto" :data-url="'/pages/business/index?id=' + detail.bid">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;"></image>
+			<view class="flex1" decode="true" space="true" style="padding-left:16rpx">{{detail.binfo.name}}</view>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'/pages/shop/product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.refund_num}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">退货单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.refund_ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true" @tap="goto" :data-url="'detail?id='+detail.orderid">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">申请时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">类型</text>
+				<text class="t2 red">{{detail.refund_type_label}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">申请退款金额</text>
+				<text class="t2 red">¥{{detail.refund_money}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">退款状态</text>
+				<text class="t2 grey" v-if="detail.refund_status==0">已取消</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回</text>
+				<text class="t2 red" v-if="detail.refund_status==4">审核通过，待退货</text>
+			</view>
+			<view class="item">
+				<text class="t1">退款原因</text>
+				<text class="t2">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2">{{detail.refund_checkremark}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_pics">
+				<text class="t1">图片</text>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in detail.refund_pics" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view class="orderinfo" v-if="detail.freight_type==11">
+			<view class="item">
+				<text class="t1">发货地址</text>
+				<text class="t2">¥{{detail.freight_content.send_address}} - {{detail.freight_content.send_tel}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">收货地址</text>
+				<text class="t2">¥{{detail.freight_content.receive_address}} - {{detail.freight_content.receive_tel}}</text>
+			</view>
+		</view>
+
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<block v-if="detail.refund_status==1 || detail.refund_status==4">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">取消</view>
+			</block>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      prodata: '',
+      detail: "",
+      prolist: "",
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiOrder/refundDetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+
+				that.loaded();
+			});
+		},
+    toclose: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该退款单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiOrder/refundOrderClose', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('收货中');
+        app.post('ApiOrder/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		openLocation:function(e){
+			var latitude = parseFloat(e.currentTarget.dataset.latitude);
+			var longitude = parseFloat(e.currentTarget.dataset.longitude);
+			var address = e.currentTarget.dataset.address;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+.orderinfo .item .grey{color:grey}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+</style>
\ No newline at end of file
diff --git a/pages/order/refundSelect.vue b/pages/order/refundSelect.vue
new file mode 100644
index 0000000..bcdee21
--- /dev/null
+++ b/pages/order/refundSelect.vue
@@ -0,0 +1,159 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset" report-submit="true">
+			<view class="form-content">
+				<view class="form-item">
+					<text class="label">退款商品</text>
+				</view>
+				<view class="product">
+					<view v-for="(item, index) in prolist" :key="index" class="content">
+						<view @tap="goto" :data-url="'/pages/shop/product?id=' + item.proid">
+							<image :src="item.pic"></image>
+						</view>
+						<view class="detail">
+							<text class="t1">{{item.name}}</text>
+							<text class="t2">{{item.ggname}}</text>
+							<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text>
+							<text class="x2">×{{item.num}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="card-view">
+				<view class="card-wrap">
+					<view class="card-title">选择类型</view>
+					<view class="info-item mt" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&type=refund'">
+						<view class="t1 flex1 flex-col">
+							<view>我要退款(无需退货)</view>
+							<view class="desc">没收到货，或与卖家协商一致不用退货只退款</view>
+						</view>
+						<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+					</view>
+					<view class="info-item" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&type=return'">
+						<view class="t1 flex1 flex-col">
+							<view>我要退货退款</view>
+							<view class="desc">已收到货，需要退还收到的货物</view>
+						</view>
+						<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+					</view>
+				</view>
+			</view>
+			<view class="card-view">
+				<view class="card-wrap">
+					<view class="info-item mt" @tap="goto" :data-url="'refundlist?orderid='+ detail.id">
+						<view class="t1 flex1">
+							<view>查看本订单退款记录</view>
+						</view>
+						<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+					</view>
+				</view>
+			</view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:'',
+		orderid: '',
+		totalprice: 0,
+		order:{},
+		detail: {},
+		refundNum:[],
+		prolist: [],
+		content_pic:[],
+		cindex:-1,
+		cateArr:['未收到货','已收到货'],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.orderid = this.opt.orderid;
+		this.pre_url = app.globalData.pre_url;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiOrder/refundinit', {id: that.orderid}, function (res) {
+				that.loading = false;
+				if(res.status == 0) {
+					app.alert(res.msg,function(){
+						app.goback();return;
+					})
+				}
+				that.tmplids = res.tmplids;
+				that.detail = res.detail;
+				var temp = [];
+				that.prolist = res.prolist;
+				that.order = res.order;
+				for(var i in that.prolist) {
+					temp.push({ogid:that.prolist[i].id,num:0})
+				}
+				console.log(temp)
+				that.refundNum = temp;
+				that.loaded();
+			});
+		},
+		
+  }
+};
+</script>
+<style>
+	.card-view {background-color: #FFFFFF;width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;}
+	.card-wrap { }
+	.card-wrap:first-child{ }
+	.card-wrap .card-title {font-size: 30rpx; color: #333; font-weight: bold;}
+		
+	.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid; min-height: 96rpx;}
+	.info-item:last-child{border:none}
+	.info-item .t1{ width: 200rpx;color: #333;font-weight:bold;/* height:96rpx;line-height:96rpx */}
+	.info-item .t1.flex-col {line-height: 40rpx;height: 40rpx; justify-content: center; margin: 50rpx 0; }
+	.info-item .desc {color: #888; font-size: 24rpx; font-weight: normal;}
+	.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+	.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+	
+.product{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246; position: relative;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.form-content{width:96%;margin:16rpx 2%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item{ width:100%;padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #f5f5f5 solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/pages/order/refundlist.vue b/pages/order/refundlist.vue
new file mode 100644
index 0000000..e4bd0bc
--- /dev/null
+++ b/pages/order/refundlist.vue
@@ -0,0 +1,183 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','审核中','已同意','驳回']" :itemst="['all','1','2','3']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'refundDetail?id=' + item.id">
+					<view class="head">
+						<view class="f1" v-if="item.bid!=0" @tap.stop="goto" :data-url="'/pages/business/index?id=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+						<view v-else><image :src="item.binfo.logo" class="logo-row"></image> {{item.binfo.name}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.refund_status==0" class="st3">取消</text>
+						<text v-if="item.refund_status==1" class="st0">审核中</text>
+						<text v-if="item.refund_status==2" class="st4">通过</text>
+						<text v-if="item.refund_status==3" class="st2">驳回</text>
+						<text v-if="item.refund_status==4" class="st2">审核通过,待退货</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view>
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3">
+									<text class="x1 flex1">￥{{item2.sell_price}}</text>
+									<text class="x2">×{{item2.refund_num}}</text>
+								</view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text style="margin-right: 10rpx;">{{item.refund_type_label}}</text>
+						<text v-if="item.refund_status==0" style="color:grey"> 申请退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+						<text v-if="item.refund_status==4" style="color:red"> 审核通过,待退货</text>
+					</view>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'refundDetail?id=' + item.id" class="btn2">详情</view>
+						<block v-if="item.refund_status==1">
+							<view class="btn2" @tap.stop="toclose" :data-id="item.id">取消</view>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiOrder/refundList', {st: st,pagenum: pagenum,orderid:that.opt.orderid}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    toclose: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.confirm('确定要取消该退款吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiOrder/refundOrderClose', {id: id}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333;}
+.order-box .head image{width:34rpx;height:34rpx;margin-right:8rpx;}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 220rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center;font-size: 22rpx;}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center; font-size: 22rpx;}
+
+</style>
\ No newline at end of file
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
new file mode 100644
index 0000000..1ef5a4d
--- /dev/null
+++ b/pages/pay/pay.vue
@@ -0,0 +1,862 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="top">
+			<view class="f1">需支付金额</view>
+			<view class="f2" v-if="payorder.score==0"><text class="t1">￥</text><text class="t2">{{payorder.money}}</text></view>
+			<view class="f2" v-else-if="payorder.money>0 && payorder.score>0"><text class="t1">￥</text><text class="t2">{{payorder.money}}</text><text style="font-size:28rpx"> + {{payorder.score}}{{t('积分')}}</text></view>
+			<view class="f2" v-else><text class="t3">{{payorder.score}}{{t('积分')}}</text></view>
+			<view class="f3" @tap="goto" :data-url="detailurl" v-if="detailurl!=''">订单详情<text class="iconfont iconjiantou"></text></view>
+		</view>
+		<view class="paytype">
+			<view class="f1">选择支付方式：</view>
+			<block v-if="payorder.money==0 && payorder.score>0">
+				<view class="f2">
+					<view class="item" v-if="moneypay==1" @tap.stop="changeradio" data-typeid="1">
+						<view class="t1 flex">
+							<image class="img" :src="event_rul +'/static/img/static/img/pay-money.png'"/>
+							<view class="flex-col"><text>{{t('积分')}}支付</text><text style="font-size:22rpx;font-weight:normal">剩余{{t('积分')}}<text style="color:#FC5729">{{userinfo.score}}</text></text></view>
+						</view>
+						<view class="radio" :style="typeid=='1' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<view class="f2">
+					<view class="item" v-if="wxpay==1 && (wxpay_type==0 || wxpay_type==1)" @tap.stop="changeradio" data-typeid="2">
+						<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信支付</view>
+						<view class="radio" :style="typeid=='2' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+					<view class="item" v-if="wxpay==1 && wxpay_type==2" @tap.stop="changeradio" data-typeid="22">
+						<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信支付</view>
+						<view class="radio" :style="typeid=='22' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+					
+					<view class="item" v-if="alipay==2" @tap.stop="changeradio" data-typeid="23">
+						<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝支付</view>
+						<view class="radio" :style="typeid=='23' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+                    
+					<!-- <view class="item" v-if="alipay==2" @tap.stop="changeradio" data-typeid="24">
+						<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/pay-money.png'"/>银联支付</view>
+						<view class="radio" :style="typeid=='24' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view> -->
+
+					<view class="item" v-if="alipay==1" @tap.stop="changeradio" data-typeid="3">
+						<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝支付</view>
+						<view class="radio" :style="typeid=='3' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+                    
+                    <block v-if="more_alipay==1">
+                        <view class="item" v-if="alipay2==1" @tap.stop="changeradio" data-typeid="31">
+                        	<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝支付2</view>
+                        	<view class="radio" :style="typeid=='31' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+                        </view>
+                        <view class="item" v-if="alipay3==1" @tap.stop="changeradio" data-typeid="32">
+                        	<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝支付3</view>
+                        	<view class="radio" :style="typeid=='32' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+                        </view>
+                    </block>
+                    
+					<view class="item" v-if="baidupay==1" @tap.stop="changeradio" data-typeid="11">
+						<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/pay-money.png'"/>在线支付</view>
+						<view class="radio" :style="typeid=='11' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+					<view class="item" v-if="toutiaopay==1" @tap.stop="changeradio" data-typeid="12">
+						<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/pay-money.png'"/>在线支付</view>
+						<view class="radio" :style="typeid=='12' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+					<view class="item" v-if="moneypay==1" @tap.stop="changeradio" data-typeid="1">
+						<view class="t1 flex">
+							<image class="img" :src="event_rul +'/static/img/static/img/pay-money.png'"/>
+							<view class="flex-col"><text>{{t('余额')}}支付</text><text style="font-size:22rpx;font-weight:normal">可用余额<text style="color:#FC5729">￥{{userinfo.money}}</text></text></view>
+						</view>
+						<view class="radio" :style="typeid=='1' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<button class="btn" @tap="topay" :style="{background:t('color1')}" v-if="typeid != '0'">立即支付</button>
+		<button class="btn" @tap="topay2" v-if="cancod==1" style="background:rgba(126,113,246,0.5);">{{codtxt}}</button>
+		<button class="btn" @tap="topayTransfer" v-if="pay_transfer==1" :style="{background:t('color2')}" data-text="转账汇款">转账汇款</button>
+		
+		<uni-popup id="dialogInput" ref="dialogInput" type="dialog">
+			<uni-popup-dialog mode="input" title="支付密码" value="" placeholder="请输入支付密码" @confirm="getpwd"></uni-popup-dialog>
+		</uni-popup>
+
+		<block v-if="give_coupon_show">
+			<view class="give-coupon flex-x-center flex-y-center">
+				<view class='coupon-block'>
+					<image :src="pre_url+'/static/img/coupon-top.png'" style="width:630rpx;height:330rpx;"></image>
+					<view @tap="give_coupon_close" :data-url="give_coupon_close_url" class="coupon-del flex-x-center flex-y-center">
+						<image :src="event_rul +'/static/img/static/img/coupon-del.png'"></image>
+					</view>
+					<view class="flex-x-center">
+						<view class="coupon-info">
+							<view class="flex-x-center coupon-get">获得{{give_coupon_list.length}}张{{t('优惠券')}}</view>
+							<view style="background:#f5f5f5;padding:10rpx 0">
+							<block v-for="(item,index) in give_coupon_list" :key="item.id">
+								<block v-if="index < 3">
+									<view class="coupon-coupon">
+										<view :class="item.type==1?'pt_img1':'pt_img2'"></view>
+										<view class="pt_left" :class="item.type==1?'':'bg2'">
+											<view class="f1" v-if="item.type==1"><text class="t0">￥</text><text class="t1">{{item.money}}</text></view>
+											<view class="f1" v-if="item.type==2">礼品券</view>
+											<view class="f1" v-if="item.type==3"><text class="t1">{{item.limit_count}}</text><text class="t2">次</text></view>
+											<view class="f1" v-if="item.type==4">抵运费</view>
+											<view class="f2" v-if="item.type==1 || item.type==4">
+												<text v-if="item.minprice>0">满{{item.minprice}}元可用</text>
+												<text v-else>无门槛</text>
+											</view>
+										</view>
+										<view class="pt_right">
+											<view class="f1">
+												<view class="t1">{{item.name}}</view>
+												<view class="t2" v-if="item.type==1">代金券</view>
+												<view class="t2" v-if="item.type==2">礼品券</view>
+												<view class="t2" v-if="item.type==3">计次券</view>
+												<view class="t2" v-if="item.type==4">运费抵扣券</view>
+												<!-- <view class="t4" v-if="item.bid>0">适用商家：{{item.bname}}</view> -->
+												<!-- <view class="t3">有效期至 {{item.yxqdate}}</view> -->
+											</view>
+										</view>
+									</view>
+								</block>
+							</block>
+							</view>
+							<view @tap="goto" data-url="/pages/coupon/mycoupon" class="flex-x-center coupon-btn">前往查看</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<uni-popup id="dialogOpenWeapp" ref="dialogOpenWeapp" type="dialog" :maskClick="false">
+			<view style="background:#fff;padding:50rpx;position:relative;border-radius:20rpx">
+				<view style="height:80px;line-height:80px;width:200px;margin:0 auto;font-size: 18px;text-align:center;font-weight:bold;text-align:center;color:#333">恭喜您支付成功</view>
+				<!-- #ifdef H5 -->
+				<wx-open-launch-weapp :username="payorder.payafter_username" :path="payorder.payafter_path">
+					<script type="text/wxtag-template">
+						<div style="background:#FD4A46;height:50px;line-height: 50px;width:200px;margin:0 auto;border-radius:5px;margin-top:15px;color: #fff;font-size: 15px;font-weight:bold;text-align:center">{{payorder.payafterbtntext}}</div>
+					</script>
+				</wx-open-launch-weapp>
+				<!-- #endif -->
+				<view style="height:50px;line-height: 50px;width:200px;margin:0 auto;border-radius:5px;color:#66f;font-size: 14px;text-align:center" @tap="goto" :data-url="detailurl">查看订单详情</view>
+			</view>
+		</uni-popup>
+
+		
+		<uni-popup id="dialogPayconfirm" ref="dialogPayconfirm" type="dialog" :maskClick="false">
+			<uni-popup-dialog type="info" title="支付确认" content="是否已完成支付" @confirm="PayconfirmFun"></uni-popup-dialog>
+		</uni-popup>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		detailurl:'',
+		tourl:'',
+		typeid:'0',
+		wxpay:0,
+		wxpay_type:0,
+		alipay:0,
+		baidupay:0,
+		toutiaopay:0,
+		moneypay:0,
+		cancod:0,
+		pay_transfer:0,
+		codtxt:'',
+		give_coupon_list:[],
+		userinfo:[],
+		paypwd: '',
+		hiddenmodalput: true,
+		payorder: {},
+		tmplids: [],
+		give_coupon_show: false,
+		give_coupon_close_url: "",
+		more_alipay : 0,
+		alipay2 : 0,
+		alipay3 : 0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt.tourl) this.tourl = decodeURIComponent(this.opt.tourl);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			var thisurl = '';
+			if(app.globalData.platform == 'mp' || app.globalData.platform == 'h5'){
+				thisurl = location.href;
+			}
+			app.post('ApiPay/pay', {orderid: that.opt.id,thisurl:thisurl,tourl:that.tourl,scene:app.globalData.scene}, function (res) {
+
+				that.loading = false;
+				if (res.status == 0) {
+					app.error(res.msg);
+					return;
+				}
+                
+				that.wxpay = res.wxpay;
+				that.wxpay_type = res.wxpay_type;
+				that.alipay = res.alipay;
+				that.baidupay = res.baidupay;
+				that.toutiaopay = res.toutiaopay;
+				that.cancod = res.cancod;
+				that.codtxt = res.codtxt;
+				that.moneypay = res.moneypay;
+				that.pay_transfer = res.pay_transfer;
+				that.pay_transfer_info = res.pay_transfer_info;
+				that.payorder = res.payorder;
+				that.userinfo = res.userinfo;
+				that.tmplids = res.tmplids;
+				that.give_coupon_list = res.give_coupon_list;
+				that.detailurl = res.detailurl;
+				that.tourl = res.tourl;
+                
+        that.more_alipay = res.more_alipay;
+        that.alipay2 = res.alipay2;
+        that.alipay3 = res.alipay3;
+                
+				if(that.wxpay){
+					if(that.wxpay_type == 2){
+						that.typeid = 22;	
+					}else{
+						that.typeid = 2;
+					}
+				}else if(that.moneypay){
+					that.typeid = 1;
+				}else if(that.alipay){
+					that.typeid = 3;
+					if(that.alipay == 2){
+						that.typeid = 23;
+					}
+				}else if(that.more_alipay){
+					if(that.alipay2){
+						that.typeid = 31;
+					}
+          if(that.alipay3){
+						that.typeid = 32;
+          }
+				}else if(that.baidupay){
+					that.typeid = 11;
+				}else if(that.toutiaopay){
+					that.typeid = 12;
+				}
+				if(that.payorder.money==0 && that.payorder.score>0){
+					that.typeid = 1;
+				}
+				that.loaded();
+			});
+		},
+    getpwd: function (done, val) {
+			this.paypwd = val;
+			this.topay({currentTarget:{dataset:{typeid:1}}});
+    },
+    changeradio: function (e) {
+      var that = this;
+      var typeid = e.currentTarget.dataset.typeid;
+      that.typeid = typeid;
+			console.log(typeid)
+    },
+    topay: function (e) {
+      var that = this;
+      var typeid = that.typeid;
+      var orderid = this.payorder.id;
+      if (typeid == 1) { //余额支付
+        if(that.userinfo.haspwd && that.paypwd==''){
+					that.$refs.dialogInput.open();return;
+        }
+        app.confirm('确定用' + that.t('余额') + '支付吗?', function () {
+					app.showLoading('提交中');
+          app.post('ApiPay/pay', {op:'submit',orderid: orderid,typeid: typeid,paypwd: that.paypwd}, function (res) {
+						app.showLoading(false);
+            if (res.status == 0) {
+              app.error(res.msg);
+              return;
+            }
+            if (res.status == 2) {
+              app.success(res.msg);
+              that.subscribeMessage(function () {
+                setTimeout(function () {
+                  if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+                    that.give_coupon_show = true;
+                    that.give_coupon_close_url = that.tourl;
+                  } else {
+                    that.gotourl(that.tourl,'reLaunch');
+                  }
+                }, 1000);
+              });
+              return;
+            }
+          });
+        });
+      } else if (typeid == 2) { //微信支付
+				console.log(app)
+				app.showLoading('提交中');
+        app.post('ApiPay/pay', {op:'submit',orderid: orderid,typeid: typeid}, function (res) {
+					app.showLoading(false);
+          if (res.status == 0) {
+            app.error(res.msg);
+            return;
+          }
+          if (res.status == 2) {
+            //无需付款
+            app.success(res.msg);
+            that.subscribeMessage(function () {
+              setTimeout(function () {
+                if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+                  that.give_coupon_show = true;
+                  that.give_coupon_close_url = that.tourl;
+                } else {
+                  that.gotourl(that.tourl,'reLaunch');
+                }
+              }, 1000);
+            });
+            return;
+          }
+          var opt = res.data;
+          if (app.globalData.platform == 'wx') {
+						if(that.payorder.type == 'shop'){
+							console.log('requestOrderPayment');
+							wx.requestOrderPayment({
+								'timeStamp': opt.timeStamp,
+								'nonceStr': opt.nonceStr,
+								'package': opt.package,
+								'signType': 'MD5',
+								'paySign': opt.paySign,
+								'orderInfo':opt.orderInfo,
+								'success': function (res2) {
+									app.success('付款完成');
+									that.subscribeMessage(function () {
+										setTimeout(function () {
+											if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+												that.give_coupon_show = true;
+												that.give_coupon_close_url = that.tourl;
+											} else {
+												that.gotourl(that.tourl,'reLaunch');
+											}
+										}, 1000);
+									});
+								},
+								'fail': function (res2) {
+									//app.alert(JSON.stringify(res2))
+								}
+							});
+						}else{
+							uni.requestPayment({
+								'provider':'wxpay',
+								'timeStamp': opt.timeStamp,
+								'nonceStr': opt.nonceStr,
+								'package': opt.package,
+								'signType': 'MD5',
+								'paySign': opt.paySign,
+								'success': function (res2) {
+									app.success('付款完成');
+									that.subscribeMessage(function () {
+										setTimeout(function () {
+											if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+												that.give_coupon_show = true;
+												that.give_coupon_close_url = that.tourl;
+											} else {
+												that.gotourl(that.tourl,'reLaunch');
+											}
+										}, 1000);
+									});
+								},
+								'fail': function (res2) {
+									//app.alert(JSON.stringify(res2))
+								}
+							});
+						}
+					}else if(app.globalData.platform == 'mp'){
+						// #ifdef H5
+						function jsApiCall(){
+							WeixinJSBridge.invoke('getBrandWCPayRequest',opt,function(res){
+									if(res.err_msg == "get_brand_wcpay_request:ok" ) {
+										app.success('付款完成');
+										that.subscribeMessage(function () {
+											setTimeout(function () {
+												if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+													that.give_coupon_show = true;
+													that.give_coupon_close_url = that.tourl;
+												} else {
+													that.gotourl(that.tourl,'reLaunch');
+												}
+											}, 1000);
+										});
+									}else{
+
+									}
+								}
+							);
+						}
+						if (typeof WeixinJSBridge == "undefined"){
+							if( document.addEventListener ){
+								document.addEventListener('WeixinJSBridgeReady', jsApiCall, false);
+							}else if (document.attachEvent){
+								document.attachEvent('WeixinJSBridgeReady', jsApiCall); 
+								document.attachEvent('onWeixinJSBridgeReady', jsApiCall);
+							}
+						}else{
+							jsApiCall();
+						}
+						// #endif
+						/*
+						var jweixin = require('jweixin-module');
+						jweixin.chooseWXPay({
+							timestamp: opt.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+							nonceStr: opt.nonceStr, // 支付签名随机串，不长于 32 位
+							package: opt.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=\*\*\*）
+							signType: opt.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+							paySign: opt.paySign, // 支付签名
+							success: function (res2) {
+								// 支付成功后的回调函数
+								app.success('付款完成');
+								that.subscribeMessage(function () {
+									setTimeout(function () {
+										if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+											that.give_coupon_show = true;
+											that.give_coupon_close_url = that.tourl;
+										} else {
+											that.gotourl(that.tourl,'reLaunch');
+										}
+									}, 1000);
+								});
+							}
+						});
+						*/
+					}else if(app.globalData.platform == 'h5'){
+						location.href = opt.wx_url  + '&redirect_url='+encodeURIComponent(location.href.split('#')[0] + '#'+that.tourl);
+					}else if(app.globalData.platform == 'app'){
+						console.log(opt)
+						uni.requestPayment({
+							'provider':'wxpay',
+							'orderInfo': opt,
+							'success': function (res2) {
+								app.success('付款完成');
+								that.subscribeMessage(function () {
+									setTimeout(function () {
+										if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+											that.give_coupon_show = true;
+											that.give_coupon_close_url = that.tourl;
+										} else {
+											that.gotourl(that.tourl,'reLaunch');
+										}
+									}, 1000);
+								});
+							},
+							'fail': function (res2) {
+								console.log(res2)
+								//app.alert(JSON.stringify(res2))
+							}
+						});
+					}else if(app.globalData.platform == 'qq'){
+						qq.requestWxPayment({
+							url: opt.wx_url,
+							referer: opt.referer,
+							success(res) {
+								that.subscribeMessage(function () {
+									setTimeout(function () {
+										if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+											that.give_coupon_show = true;
+											that.give_coupon_close_url = that.tourl;
+										} else {
+											that.gotourl(that.tourl,'reLaunch');
+										}
+									}, 1000);
+								});
+							},
+							fail(res) { }
+						})
+					}
+				})
+			} else if (typeid == 3 || typeid == 31 || typeid == 32) { //支付宝支付
+				app.showLoading('提交中');
+        app.post('ApiPay/pay', {op:'submit',orderid: orderid,typeid: typeid}, function (res) {
+					console.log(res)
+					app.showLoading(false);
+          if (res.status == 0) {
+            app.error(res.msg);
+            return;
+          }
+          if (res.status == 2) {
+            //无需付款
+            app.success(res.msg);
+            that.subscribeMessage(function () {
+              setTimeout(function () {
+                if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+                  that.give_coupon_show = true;
+                  that.give_coupon_close_url = that.tourl;
+                } else {
+                  that.gotourl(that.tourl,'reLaunch');
+                }
+              }, 1000);
+            });
+            return;
+          }
+          var opt = res.data;
+					if (app.globalData.platform == 'alipay') {
+						uni.requestPayment({
+							'provider':'alipay',
+							'orderInfo': opt.trade_no,
+							'success': function (res2) {
+								console.log(res2)
+								if(res2.resultCode == '6001'){
+									return;
+								}
+								app.success('付款完成');
+								that.subscribeMessage(function () {
+									setTimeout(function () {
+										if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+											that.give_coupon_show = true;
+											that.give_coupon_close_url = that.tourl;
+										} else {
+											that.gotourl(that.tourl,'reLaunch');
+										}
+									}, 1000);
+								});
+							},
+							'fail': function (res2) {
+								//app.alert(JSON.stringify(res2))
+							}
+						});
+					}else if(app.globalData.platform == 'mp' || app.globalData.platform == 'h5'){
+						document.body.innerHTML = res.data;
+						document.forms['alipaysubmit'].submit();
+					}else if(app.globalData.platform == 'app'){
+						console.log('------------alipay----------')
+						console.log(opt)
+						console.log('------------alipay end----------')
+						uni.requestPayment({
+							'provider':'alipay',
+							'orderInfo': opt,
+							'success': function (res2) {
+								console.log('------------success----------')
+								console.log(res2)
+								app.success('付款完成');
+								that.subscribeMessage(function () {
+									setTimeout(function () {
+										if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+											that.give_coupon_show = true;
+											that.give_coupon_close_url = that.tourl;
+										} else {
+											that.gotourl(that.tourl,'reLaunch');
+										}
+									}, 1000);
+								});
+							},
+							'fail': function (res2) {
+								console.log(res2)
+								//app.alert(JSON.stringify(res2))
+							}
+						});
+					}
+				})
+      } else if (typeid == '11') {
+				app.showLoading('提交中');
+        app.post('ApiPay/pay', {op:'submit',orderid: orderid,typeid: typeid}, function (res) {
+					app.showLoading(false);
+					swan.requestPolymerPayment({
+						'orderInfo': res.orderInfo,
+						'success': function (res2) {
+							app.success('付款完成');
+							that.subscribeMessage(function () {
+								setTimeout(function () {
+									if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+										that.give_coupon_show = true;
+										that.give_coupon_close_url = that.tourl;
+									} else {
+										that.gotourl(that.tourl,'reLaunch');
+									}
+								}, 1000);
+							});
+						},
+						'fail': function (res2) {
+							if(res2.errCode!=2){
+								app.alert(JSON.stringify(res2))
+							}
+						}
+					});
+				});
+			} else if (typeid == '12') {
+				app.showLoading('提交中');
+        app.post('ApiPay/pay', {op:'submit',orderid: orderid,typeid: typeid}, function (res) {
+					app.showLoading(false);
+					console.log(res.orderInfo);
+					tt.pay({
+						'service':5,
+						'orderInfo': res.orderInfo,
+						'success': function (res2) {
+							if (res2.code === 0) {
+								app.success('付款完成');
+								that.subscribeMessage(function () {
+									setTimeout(function () {
+										if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+											that.give_coupon_show = true;
+											that.give_coupon_close_url = that.tourl;
+										} else {
+											that.gotourl(that.tourl,'reLaunch');
+										}
+									}, 1000);
+								});
+							}
+						},
+						'fail': function (res2) {
+							app.alert(JSON.stringify(res2))
+						}
+					});
+				});
+			} else if (typeid == '22') {
+				if (app.globalData.platform == 'wx') {
+					wx.login({
+						success:function(res){
+							if (res.code) {
+								app.showLoading('提交中');
+								app.post('ApiPay/getYunMpauthParams',{jscode: res.code},function(res){
+									app.showLoading(false);
+									app.post('https://showmoney.cn/scanpay/fixed/mpauth',res.params,function(res2){
+										console.log(res2.sessionKey);
+										app.post('ApiPay/getYunUnifiedParams',{orderid: orderid,sessionKey:res2.sessionKey},function(res3){
+											app.post('https://showmoney.cn/scanpay/unified',res3.params,function(res4){
+												if(res4.respcd == '09'){
+													wx.requestPayment({
+														timeStamp: res4.timeStamp,
+														nonceStr: res4.nonceStr,
+														package: res4.package,
+														signType: res4.mpSignType,
+														paySign: res4.mpSign,
+														success: function success(result) {
+															app.success('付款完成');
+															that.subscribeMessage(function () {
+																setTimeout(function () {
+																	if (that.give_coupon_list && that.give_coupon_list.length > 0) {
+																		that.give_coupon_show = true;
+																		that.give_coupon_close_url = that.tourl;
+																	} else {
+																		that.gotourl(that.tourl,'reLaunch');
+																	}
+																}, 1000);
+															});
+														},
+														fail: function (res5) {
+															//app.alert(JSON.stringify(res5))
+														}
+													});
+												}else{
+													app.alert(res4.errorDetail);
+												}
+											})
+										})
+									})
+								})
+							} else {
+								console.log('登录失败！' + res.errMsg)
+							}
+						}
+					});
+				}else{
+					var url = app.globalData.baseurl + 'ApiPay/pay'+'&aid=' + app.globalData.aid + '&platform=' + app.globalData.platform + '&session_id=' + app.globalData.session_id;
+					url += '&op=submit&orderid='+orderid+'&typeid=22';
+					location.href = url;
+				}
+			} else if (typeid == '23') {
+				//var url = app.globalData.baseurl + 'ApiPay/pay'+'&aid=' + app.globalData.aid + '&platform=' + app.globalData.platform + '&session_id=' + app.globalData.session_id;
+				//url += '&op=submit&orderid='+orderid+'&typeid=23';
+				//location.href = url;
+				setTimeout(function () {
+					that.$refs.dialogPayconfirm.open();
+				}, 1000);
+
+				app.goto('/pages/index/webView2?orderid='+orderid+'&typeid=23'+'&aid=' + app.globalData.aid + '&platform=' + app.globalData.platform + '&session_id=' + app.globalData.session_id);
+				return ;
+				app.showLoading('提交中');
+				app.post('ApiPay/pay',{op:'submit',orderid: orderid,typeid: 23},function(res){
+					app.showLoading(false);
+					console.log(res)
+					app.goto('url::'+res.url);
+				});
+			} else if (typeid == '24') {
+				//var url = app.globalData.baseurl + 'ApiPay/pay'+'&aid=' + app.globalData.aid + '&platform=' + app.globalData.platform + '&session_id=' + app.globalData.session_id;
+				//url += '&op=submit&orderid='+orderid+'&typeid=23';
+				//location.href = url;
+
+				app.goto('/pages/index/webView2?orderid='+orderid+'&typeid=24');
+				return ;
+				app.showLoading('提交中');
+				app.post('ApiPay/pay',{op:'submit',orderid: orderid,typeid: 24},function(res){
+					app.showLoading(false);
+					console.log(res)
+					app.goto('url::'+res.url);
+				});
+			}
+    },
+		topay2:function(){
+			var that = this;
+      var orderid = this.payorder.id;
+			app.confirm('确定要' + that.codtxt + '吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiPay/pay', {op:'submit',orderid: orderid,typeid: 4}, function (res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					if (res.status == 2) {
+						//无需付款
+						app.success(res.msg);
+						that.subscribeMessage(function () {
+							setTimeout(function () {
+								that.gotourl(that.tourl,'reLaunch');
+							}, 1000);
+						});
+						return;
+					}
+				});
+			})
+		},
+		topayTransfer:function(e){
+			var that = this;
+      var orderid = this.payorder.id;
+			app.confirm('确定要' + e.currentTarget.dataset.text + '吗?', function () {
+				app.showLoading('提交中');
+				app.post('ApiPay/pay', {op:'submit',orderid: orderid,typeid: 5}, function (res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					if (res.status == 2) {
+						//无需付款
+						app.success(res.msg);
+						that.subscribeMessage(function () {
+							
+						});
+						setTimeout(function () {
+							that.gotourl('transfer?id='+orderid,'reLaunch');
+						}, 1000);
+						return;
+					}
+				});
+			})
+		},
+		give_coupon_close:function(e){
+			var that = this;
+			var tourl = e.currentTarget.dataset.url;
+			this.give_coupon_show = false;
+			that.gotourl(tourl,'reLaunch');
+		},
+		gotourl:function(tourl, opentype){
+			var that = this;
+			if(app.globalData.platform == 'mp' || app.globalData.platform == 'h5'){
+				if (tourl.indexOf('miniProgram::') === 0) {
+					//其他小程序
+					tourl = tourl.slice(13);
+					var tourlArr = tourl.split('|');
+					console.log(tourlArr)
+					that.showOpenWeapp();
+					return;
+				}
+			}
+			app.goto(tourl, opentype);
+		},
+		showOpenWeapp:function(){
+			this.$refs.dialogOpenWeapp.open();
+		},
+		closeOpenWeapp:function(){
+			this.$refs.dialogOpenWeapp.close();
+		},
+		PayconfirmFun:function(){
+			this.gotourl(this.tourl,'reLaunch');
+		}
+  }
+}
+</script>
+<style>
+
+.top{width:100%;display:flex;flex-direction:column;align-items:center;padding-top:60rpx}
+.top .f1{height:60rpx;line-height:60rpx;color:#939393;font-size:24rpx;}
+.top .f2{color:#101010;font-weight:bold;font-size:72rpx;height:120rpx;line-height:120rpx}
+.top .f2 .t1{font-size:44rpx}
+.top .f2 .t3{font-size:50rpx}
+.top .f3{color:#FC5729;font-size:26rpx;height:70rpx;line-height:70rpx}
+
+.paytype{width:94%;margin:20rpx 3% 80rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.paytype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+
+.paytype .f2{padding:0 30rpx}
+.paytype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.paytype .f2 .item:last-child{border-bottom:0}
+.paytype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#222222;font-size:30rpx;font-weight:bold}
+.paytype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.paytype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.paytype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:10rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.op{width:94%;margin:20rpx 3%;display:flex;align-items:center;margin-top:40rpx}
+.op .btn{flex:1;height:100rpx;line-height:100rpx;background:#07C160;width:90%;margin:0 10rpx;border-radius:10rpx;color: #fff;font-size:28rpx;font-weight:bold;display:flex;align-items:center;justify-content:center}
+.op .btn .img{width:48rpx;height:48rpx;margin-right:20rpx}
+
+.give-coupon { width: 100%; height: 100%; position: absolute; left: 0; top: 0; z-index: 2000; background-color: rgba(0, 0, 0, 0.5); }
+.give-coupon .coupon-block { margin-top: -140rpx; position: relative; }
+.give-coupon .coupon-info { width: 559rpx; border-radius: 0 0 30rpx 30rpx; background-color: #fff; margin-top: -20rpx; padding: 20rpx 0 20rpx 0; }
+.give-coupon .coupon-one { width: 100%; height: 164rpx; margin-bottom: 10rpx; }
+.give-coupon .coupon-bg { width: 514rpx; height: 164rpx; border-radius: 10rpx; box-shadow: 2rpx 2rpx 30rpx #ddd; padding: 14rpx; }
+.give-coupon .coupon-bg-1 { width: 100%; height: 100%; border: 2rpx #ff4544 dashed; border-radius: 10rpx; padding: 0 20rpx; }
+.give-coupon .coupon-del { position: absolute; right: 34rpx; top: 224rpx; width: 90rpx; height: 90rpx; }
+.give-coupon .coupon-del image{ width: 30rpx; height: 30rpx; }
+.give-coupon .coupon-text { color: #707070; margin-top: 24rpx; margin-bottom: 34rpx; font-size: 9pt; }
+.give-coupon .coupon-text::before { content: ' '; margin-right: 32rpx; width: 50rpx; height: 1rpx; background-color: #707070; overflow: hidden; margin-top: 21rpx; }
+.give-coupon .coupon-text::after { content: ' '; margin-left: 32rpx; width: 50rpx; height: 1rpx; background-color: #707070; overflow: hidden; margin-top: 21rpx; }
+.give-coupon .coupon-btn { position: relative;margin:0 auto;width:340rpx;height:70rpx;line-height:70rpx;background:linear-gradient(90deg,#F9475F,#EF155B);color:#fff;border-radius:40rpx;margin-top:20rpx}
+.give-coupon .coupon-btn image { width: 374rpx; height: 96rpx; }
+.give-coupon .coupon-get{ margin-top: 4rpx; margin-bottom: 20rpx; color: #ff4544; font-size: 13pt; }
+
+.give-coupon .coupon-coupon{width:100%;display:flex;padding:0 20rpx;margin:10rpx 0;}
+.give-coupon .coupon-coupon .pt_img1{background:url(data:image/svg+xml;base64,PHN2ZyBpZD0i5Zu+5bGCXzEiIGRhdGEtbmFtZT0i5Zu+5bGCIDEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDI3IDEzMCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiM3M2FmNjA7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT7nu7/oibJfMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMzkuNSw0Ny43NlY2MS42MmE1LDUsMCwwLDEsMCw5LjgydjMuMzhhNSw1LDAsMCwxLDAsOS44MlY4OGE1LDUsMCwwLDEsMCw5LjgydjMuMzlhNSw1LDAsMCwxLDAsOS44MnYzLjM5YTUsNSwwLDAsMSwwLDkuODJ2My4zOWE1LDUsMCwwLDEsMCw5LjgydjMuMzlhNSw1LDAsMCwxLDAsOS44MnYzLjM4YTUsNSwwLDAsMSwwLDkuODJ2MTMuODdoMjd2LTEzMFoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0zOS41IC00Ny43NikiLz48L3N2Zz4=);background-size: 147%;height:140rpx;border-bottom-left-radius:16rpx;border-top-left-radius:16rpx;width:4%}
+.give-coupon .coupon-coupon .pt_img2{background:url(data:image/svg+xml;base64,PHN2ZyBpZD0i5Zu+5bGCXzEiIGRhdGEtbmFtZT0i5Zu+5bGCIDEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDI3IDEzMCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiM2ZmM1ZmE7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT7ok53oibJfMTwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMCwwVjEzLjg2YTUsNSwwLDAsMSw0LjEsNC45MUE1LDUsMCwwLDEsMCwyMy42OHYzLjM5QTUsNSwwLDAsMSw0LjEsMzIsNSw1LDAsMCwxLDAsMzYuODl2My4zOWE1LDUsMCwwLDEsNC4xLDQuOTFBNSw1LDAsMCwxLDAsNTAuMXYzLjM5QTUsNSwwLDAsMSw0LjEsNTguNCw1LDUsMCwwLDEsMCw2My4zMXYzLjM4QTUsNSwwLDAsMSw0LjEsNzEuNiw1LDUsMCwwLDEsMCw3Ni41MVY3OS45YTUsNSwwLDAsMSw0LjEsNC45MUE1LDUsMCwwLDEsMCw4OS43MnYzLjM5QTUsNSwwLDAsMSw0LjEsOTgsNSw1LDAsMCwxLDAsMTAyLjkzdjMuMzlhNSw1LDAsMCwxLDQuMSw0LjkxQTUsNSwwLDAsMSwwLDExNi4xNFYxMzBIMjdWMFoiLz48L3N2Zz4=);background-size: 147%;height:140rpx;border-bottom-left-radius:16rpx;border-top-left-radius:16rpx;width:4%}
+.give-coupon .coupon-coupon .pt_left{background: #73af60;height:140rpx;color: #FFF;padding-bottom:20rpx;padding-right:10rpx;width:30%;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.give-coupon .coupon-coupon .pt_left.bg2{background:#6fc5fa}
+.give-coupon .coupon-coupon .pt_left .f1{font-size:34rpx;text-align:center}
+.give-coupon .coupon-coupon .pt_left .t0{padding-right:10rpx;}
+.give-coupon .coupon-coupon .pt_left .t1{font-size:46rpx;}
+.give-coupon .coupon-coupon .pt_left .t2{padding-left:10rpx}
+.give-coupon .coupon-coupon .pt_left .f2{font-size:24rpx;text-align:center;overflow:hidden}
+.give-coupon .coupon-coupon .pt_right{background: #fff;width:66%;display:flex;height:140rpx;text-align: left;padding:20rpx 30rpx;border-top-right-radius:16rpx;border-bottom-right-radius:16rpx;position:relative}
+.give-coupon .coupon-coupon .pt_right .f1{flex-grow: 1;flex-shrink: 1;}
+.give-coupon .coupon-coupon .pt_right .f1 .t1{font-size:36rpx;color:#2c3e50;height:40rpx;line-height: 40rpx;overflow: hidden;}
+.give-coupon .coupon-coupon .pt_right .f1 .t2{height:60rpx;line-height:60rpx;font-size:24rpx;color:#727272;}
+.give-coupon .coupon-coupon .pt_right .f1 .t2_1{height:40rpx;line-height:40rpx}
+.give-coupon .coupon-coupon .pt_right .f1 .t3{font-size:24rpx;color:#2c3e50}
+.give-coupon .coupon-coupon .pt_right .f1 .t4{font-size:24rpx;color:#555555}
+.give-coupon .coupon-coupon .pt_right .btn{position:absolute;right:30rpx;top:50%;margin-top:-25rpx;border-radius:25rpx;width:140rpx;height:50rpx;line-height:50rpx;background:#07c160;color:#fff;}
+
+</style>
\ No newline at end of file
diff --git a/pages/pay/transfer.vue b/pages/pay/transfer.vue
new file mode 100644
index 0000000..6f6e152
--- /dev/null
+++ b/pages/pay/transfer.vue
@@ -0,0 +1,192 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset" report-submit="true">
+			<!-- <view class="form-content">
+				<view class="form-item">
+					<text class="label">转账汇款</text>
+				</view>
+			</view> -->
+			<view class="orderinfo">
+				<view class="item">
+					<text class="t1">订单编号</text>
+					<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+				</view>
+				
+				<view class="item">
+					<text class="t1">订单金额</text>
+					<text class="t2 red">¥{{detail.money}}</text>
+				</view>
+				<view class="item">
+					<text class="t1">下单时间</text>
+					<text class="t2">{{orderDetail.createtime}}</text>
+				</view>
+				<view class="item" v-if="detail.paytypeid">
+					<text class="t1">支付方式</text>
+					<text class="t2">{{detail.paytype}}</text>
+				</view>
+				<view class="item" v-if="pay_transfer_info.pay_transfer_account_name">
+					<text class="t1">户名</text>
+					<text class="t2">{{pay_transfer_info.pay_transfer_account_name}}</text>
+				</view>
+				<view class="item" v-if="pay_transfer_info.pay_transfer_account">
+					<text class="t1">账户</text>
+					<text class="t2">{{pay_transfer_info.pay_transfer_account}}</text>
+				</view>
+				<view class="item" v-if="pay_transfer_info.pay_transfer_bank">
+					<text class="t1">开户行</text>
+					<text class="t2">{{pay_transfer_info.pay_transfer_bank}}</text>
+				</view>
+				<view class="item" v-if="pay_transfer_info.pay_transfer_desc">
+					<text class="text-min">{{pay_transfer_info.pay_transfer_desc}}</text>
+				</view>
+				<view class="item">
+					<text class="t1">审核状态</text>
+					<text class="t2">{{detail.check_status_label}}</text>
+				</view>
+				<view class="item" v-if="detail.check_remark">
+					<text class="t1">审核备注</text>
+					<text class="t2">{{detail.check_remark}}</text>
+				</view>
+			</view>
+			<view class="form-content">
+				<view class="form-item flex-col">
+					<view class="label">上传付款凭证(最多三张)</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in pics" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" v-if="detail.check_status != 1" @tap="removeimg" :data-index="index" data-field="pics"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pics" v-if="pics.length<3 && detail.check_status != 1"></view>
+					</view>
+				</view>
+			</view>
+			<button class="btn" v-if="detail.check_status != 1" form-type="submit" :style="{background:t('color1')}">确定</button>
+			<view class="btn-a" @tap="goto" :data-url="'pages/order/detail?id='+detail.orderid">查看订单详情</view>
+			<view style="padding-top:30rpx"></view>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				pre_url:app.globalData.pre_url,
+
+				pics:[],
+				detail:{},
+				orderDetail:{},
+				pay_transfer_info:{},
+
+				event_rul: app.globalData.event_url,
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				app.get('ApiPay/transfer', {id: that.opt.id}, function (res) {
+					that.loading = false;
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					that.detail = res.detail;
+					that.pay_transfer_info = res.pay_transfer_info;
+					that.orderDetail = res.orderDetail;
+					that.pics = res.detail.paypics;
+					
+					that.loaded();
+					//
+				});
+			},
+    formSubmit: function (e) {
+      var that = this;
+      var id = that.opt.id;
+			var pics = that.pics;
+			if(pics.length <= 0) {
+				app.error('请上传付款凭证');
+				return;
+			}
+
+			app.showLoading('提交中');
+      app.post('ApiPay/transfer', {id: id,pics:pics}, function (res) {
+				app.showLoading(false);
+        app.alert(res.msg);
+        if (res.status == 1) {
+         setTimeout(function () {
+           // app.goto('/pages/order/detail?id='+that.detail.orderid);
+					 app.goto('/pages/my/usercenter');
+         }, 1000);
+        }
+      });
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			pics.splice(index,1)
+		},
+		}
+	}
+</script>
+
+<style>
+.btn-a { text-align: center; padding: 30rpx; color: rgb(253, 74, 70);}
+.text-min { font-size: 24rpx; color: #999;}
+.orderinfo{width:96%;margin:0 2%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+.orderinfo .item .grey{color:grey}
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+	
+
+.form-content{width:94%;margin:16rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item{ width:100%;padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #f5f5f5 solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
diff --git a/pages/shop/cart.vue b/pages/shop/cart.vue
new file mode 100644
index 0000000..00a91ad
--- /dev/null
+++ b/pages/shop/cart.vue
@@ -0,0 +1,782 @@
+<template>
+<view class="container" @touchmove.stop="touchmove">
+	<block v-if="isload">
+		<block v-if="cartlist.length>0">
+			<view class="cartmain">
+				<view class="regulate-title flex"><text @click="regulateDel" :style="{color: t('color1')}">{{isRegulate ? '退出管理': '管理'}}</text></view>
+				<block v-for="(item, index) in cartlist" :key="item.bid">
+					<view class="cartmain-item">
+						<!-- <view v-show="isSowso && swctbid != item.bid " class="swipe-action-item-smk b-s" style="background-color: rgba(255, 255, 255, 0);" @touchstart.stop="tstart($event)"></view> -->
+						<view class="cartmain-item__hd flex al-item-center">
+							<view class="cartmain-item__hd-label" @tap.stop="changeradio" :data-index="index">
+								<view  class="label-radio" :style="item.checked ? 'background:'+'linear-gradient(to right bottom, #00AE68, #096742)'+';border:0' : ''"><image class="label-radio__checked" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+							</view>
+							<image class="cartmain-item__hd-logo" :src="item.business.logo" mode=""></image>
+							<view v-if="item.bid == 0" class="cartmain-item__hd-name" >{{item.business.name}} </view>
+							<view v-else class="cartmain-item__hd-name flex al-item-center" @tap="goto" :data-url="'/pagesA/shop/index?id=' + item.business.id">{{item.business.name}} <text class="iconfont icon-arrow-right"></text></view>
+						</view>
+						<view class="cartmain-item__bd">
+							<uni-swipe-action>
+								<uni-swipe-action-item v-for="(item2,index2) in item.prolist" :key="index2"  ref="closall"  @change="swatinChange($event,item.bid, item2.id, index)">
+									<view class="swipe-action-item flex al-item-center">
+										<!-- <view class="swipe-action-item-smk b-s" v-if="item2.status == 0 || item2.guige.stock == 0"></view> -->
+										<view class="swipe-action-item__label" @tap.stop="changeradio2" :data-index="index" :data-index2="index2">
+											<view class="label-radio" :style="item2.checked ? 'background:'+'linear-gradient(to right bottom, #00AE68, #096742)'+';border:0' : ''"><image class="label-radio__checked" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+										</view>
+										<view class="swipe-action-item__bd flex" :style="(item.prolist).length == index2+1 ? 'border:0' : ''">
+											<view class="swipe-action-item__img">
+												<image class="img-url" :src="item2.product.pic" @tap.stop="goto" :data-url="'/pages/shop/product?id=' + item2.product.id"/>
+												<view class="img-tips" v-if="item2.status == 0">已下架</view>
+												<view class="img-tips" v-else-if="item2.guige.stock == 0">无货</view>
+											</view>
+											<view class="swipe-action-item__info">
+												<view  class="info-title" @tap="goto" :data-url="'/pages/shop/product?id=' + item2.product.id"><text>{{item2.product.name}}</text></view>
+												<view class="info-subtitle text-overflow-line"><text>{{item2.guige.name}}</text></view>
+												<view class="info-price"><text class="symbol">￥</text>{{item2.guige.sell_price}}</view>
+												
+												<view class="swipe-action-item__btn flex al-item-center">
+													<image class="btn-sub" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="gwcminus" :data-index="index" :data-index2="index2" :data-cartid="item2.id" :data-num="item2.num" :data-limit_start="item2.product.limit_start" :data-limit_start_guige="item2.guige.limit_start"></image>
+													<input class="input" type="number" :value="item2.num" @blur="gwcinput" :data-max="item2.guige.store_nums" :data-index="index" :data-index2="index2" :data-cartid="item2.id" :data-num="item2.num" :data-limit_start="item2.product.limit_start" :data-limit_start_guige="item2.guige.limit_start" />
+													<image class="btn-add" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="gwcplus" :data-index="index" :data-index2="index2" :data-max="item2.guige.store_nums" :data-num="item2.num" :data-cartid="item2.id" :data-limit_start="item2.product.limit_start" :data-limit_start_guige="item2.guige.limit_start"></image>
+												</view>
+											</view>
+										</view>
+									</view>
+									<template v-slot:right>
+										<view class="sideslip-box flex">
+											<view v-if="item2.status != 0" class="sideslip-collectible flex al-item-center j-center" @tap.stop="delCollectible(item2.id, item2.product.id, item2)">
+												<text class="iconfont icon-a-Fill11"></text>
+												<view class="sideslip-box__txt">移至收藏</view>
+											</view>
+											<view class="sideslip-del flex al-item-center j-center" @tap.stop="delShop(item2.id)">
+												<text class="iconfont icon-a-Fill1"></text>
+												<view class="sideslip-box__txt">删除</view>
+											</view>
+										</view>
+									</template>
+								</uni-swipe-action-item>
+							</uni-swipe-action>
+						</view>
+					</view>
+				</block>
+			</view>
+		</block>
+		<block v-else>
+			<view class="data-empty flex al-item-center">
+				<image class="data-empty-img" :src="event_rul+'/static/images/empty-cart.svg'"></image>
+				<view class="data-empty-txt">购物车空空如也~</view>
+				<view class="data-empty-tips" style="margin-top:20rpx;font-size:24rpx">赶紧慰劳一下自己吧</view>
+				<view class="data-empty-btn" @tap="goto" :data-url="indexurl" data-opentype="reLaunch">去逛逛</view>
+			</view>
+		</block>
+	</block>
+	<view v-if="tjdatalist.length > 0">
+		<view class="xihuan">
+			<view class="xihuan-text" style="flex: 1;">
+				<image :src="event_rul +'/static/images/title-decorate.svg'" class="img-n" mode="widthFix" />
+				<text class="txt" style="padding: 0 30rpx;">为您推荐</text>
+				<image :src="event_rul +'/static/images/title-decorate.svg'" class="img-n" mode="widthFix" />
+			</view>
+		</view>
+		<view class="prolist">
+			<dp-product-item types='cart' :data="tjdatalist" @addcart="addcart" @touchmove="touchmove" :menuindex="menuindex"></dp-product-item>
+		</view>
+	</view>
+
+	<loading v-if="loading"></loading>
+	<block v-if="cartlist.length>0">
+	<view v-if="isRegulate">
+		<view class="footer flex" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+			<view class="check-all" @tap.stop="changeradioAll">
+				<view  class="radio" :style="allchecked ? 'background:'+'linear-gradient(to right bottom, #00AE68, #096742)'+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				<view  class="text0">全选（{{selectedcount}}）</view>
+			</view>
+			<view class="flex1"></view>
+			<view class="op" :style="{background:'linear-gradient(to right, #00AE68, #096742)'}" @tap="showDel">删除</view>
+		</view>
+	</view>
+	<block v-else>
+		<view class="footer flex" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+			<view class="check-all" @tap.stop="changeradioAll">
+				<view  class="radio" :style="allchecked ? 'background:'+'linear-gradient(to right bottom, #00AE68, #096742)'+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				<view  class="text0">全选（{{selectedcount}}）</view>
+			</view>
+			<view class="flex1"></view>
+			<view class="text1">合计：</view>
+			<view class="text2"><text style="font-size:24rpx">￥</text>{{totalprice}}</view>
+			<view class="op" :style="{background:'linear-gradient(to right, #00AE68, #096742)'}" @tap="toOrder">去结算</view>
+		</view>
+	</block>
+	<!-- 删除弹框 -->
+	<view v-if="isAllDel" class="del-dialog" @touchmove.stop.prevent="moveHandle">
+		<view class="del-dialog__con">
+			<view class="del-dialog__title">确定将这{{actionLet.length > 0 ? '' : selectedcount}}个商品删除吗?</view>
+			<view class="del-dialog__btns flex al-item-center j-between">
+				<button class="del-dialog__btn confirm-btn" type="primflex-direction: column;ary" @click="allDel">删除</button>
+				<button class="del-dialog__btn cancel-btn" type="primary" @click="cenlDel">我再想想</button>
+			</view>
+		</view>
+	</view>
+	</block>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		indexurl:app.globalData.indexurl,
+		cartlist:[],
+		tjdatalist:[],
+		totalprice: '0.00',
+		selectedcount: 0,
+		allchecked:true,
+
+		isRegulate: false,
+		isAllDel: false, // 删除提示
+		
+		actionLet: [], // 左滑删除的数组
+
+		event_rul: app.globalData.event_url,
+		
+		isSowso:false,
+		swctbid: -1,
+		swctid: -1,
+    };
+  },
+  
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+  },
+	onShow:function(){
+		this.getdata();
+		this.loading = false
+		this.$forceUpdate()
+	},
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		touchmove() {
+			this.$refs.closall.forEach(item => {
+				item.is_show = 'none'
+			})
+		},
+	  // 滑动选中项
+	  swatinChange(e, bid, id, idx) {
+		  this.swctbid = bid
+		  this.swctid = id
+		  if(e == 'right') {
+			  this.isSowso = true
+		  }else {
+			  this.isSowso = false
+		  }
+	  },
+	  // 点击管理显示多删除
+	regulateDel() {
+			this.isRegulate = !this.isRegulate 
+	},
+	//收藏操作
+	delCollectible(proid, productId, data) {
+		if(data.status == 0) {
+			app.error('该商品已下架，无法收藏')
+			return
+		}
+		var that = this;
+		let ids = []
+		ids.push(proid)
+		app.confirm('确定要移至收藏吗?', () => {
+			if(data.isfavorite) {
+				app.post('ApiShop/cartdelete', {ids: ids}, (data) => {
+				    that.getdata()
+					app.success('已收藏');
+					this.isSowso = false
+				})
+			}else {
+				app.post('ApiShop/addfavorite', {
+					proid: productId,
+					type: 'shop'
+				}, data => {
+					if (data.status == 1) {
+						app.post('ApiShop/cartdelete', {ids: ids}, (data) => {
+						    that.getdata()
+						})
+					}
+					this.isSowso = false
+					app.success(data.msg);
+				});
+			}
+
+		}, () => {this.isSowso = false})
+	},
+	// 滑动删除
+	delShop(bid) {
+		let ids = []
+		ids.push(bid)
+		this.actionLet = ids
+		this.isAllDel = true
+		// var that = this;
+		// app.confirm('确定要从购物车移除吗?', () => {
+		//   app.post('ApiShop/cartdelete', {ids: ids}, (data) => {
+		//     app.success('操作成功');
+		// 	this.isSowso = false
+		//     setTimeout(() => {
+		//       that.getdata();
+		//     }, 1000);
+		//   });
+		// },() => {this.isSowso = false})
+	},
+	// 阻止滑动穿透
+	moveHandle(){
+			return true
+	},
+	// 点击显示删除弹框
+	showDel() {
+		if(this.selectedcount == 0) {
+			app.confirm('请选择要删除的商品', () => {
+				
+			})
+			return
+		}
+		this.isAllDel = true
+	},
+	// 多选删除
+	allDel() {
+		let ids = []
+		var that = this;
+		if (this.actionLet.length > 0) {
+			ids = this.actionLet
+		}else {
+			for(var i in that.cartlist){
+				for(var j in that.cartlist[i].prolist){
+					if(that.cartlist[i].prolist[j].checked){
+						ids.push(that.cartlist[i].prolist[j].id);
+					}
+				}
+			}
+		}
+
+	  app.post('ApiShop/cartdelete', {ids: ids}, (data) => {
+		this.isAllDel = false
+		setTimeout(() => {
+			app.success('操作成功');
+			that.getdata();
+		  this.actionLet = []
+		}, 500);
+	  });
+
+	},
+	// 取消删除
+	cenlDel() {
+		this.isAllDel = false
+		this.actionLet = []
+	},
+    getdata: function (){
+
+		let carSelectList = uni.getStorageSync('cart_select_list')
+      var that = this;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			if(bid){
+				that.indexurl = 'pages/business/index?id='+bid;
+			}
+			that.loading = true;
+      app.get('ApiShop/cart', {bid:bid}, function (res) {
+				that.loading = false;
+        that.cartlist = res.cartlist;
+
+        that.tjdatalist = res.tjdatalist;
+		if(carSelectList.length > 0) {
+			for(let i = 0; i < carSelectList.length;i++){
+				for(let j = 0;j<  carSelectList[i].prolist.length;j++){
+					that.cartlist.forEach((data, ndx) => {	
+						data.checked = true;
+						data.prolist.forEach((datm, ndx) => {
+							if ( datm.id == carSelectList[i].prolist[j].id) {
+								datm.checked = carSelectList[i].prolist[j].checked
+							}
+							if(!datm.checked){
+								data.checked = false;
+							}
+						})
+					})
+					
+				}
+			}
+		}
+		let alSleArr = []
+		that.cartlist.forEach((item, idx) => {
+			if(item.checked) {
+				alSleArr.push(item.checked)
+			}
+		})
+		if(alSleArr.length == that.cartlist.length) {
+			that.allchecked = true
+		}else {
+			that.allchecked = false
+		}
+		uni.setStorageSync('cart_select_list', that.cartlist);
+        that.calculate();
+				that.loaded();
+		that.$forceUpdate();
+      });
+    },
+    calculate: function () {
+      var that = this;
+      var cartlist = that.cartlist;
+      var ids = [];
+      var totalprice = 0.00;
+      var selectedcount = 0;
+			for(var i in cartlist){
+				for(var j in cartlist[i].prolist){
+					if(cartlist[i].prolist[j].checked){
+						ids.push(cartlist[i].prolist[j].id);
+						var thispro = cartlist[i].prolist[j];
+						totalprice += thispro.guige.sell_price * thispro.num;
+						selectedcount += thispro.num;
+					}
+				}
+			}
+      that.totalprice = totalprice.toFixed(2);
+      that.selectedcount = selectedcount;
+    },
+    changeradio: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+			var cartlist = that.cartlist;
+      var checked = cartlist[index].checked;
+			if(checked){
+				cartlist[index].checked = false;
+			}else{
+				cartlist[index].checked = true;
+			}
+			for(var i in cartlist[index].prolist){
+				cartlist[index].prolist[i].checked = cartlist[index].checked;
+			}
+			that.cartlist = cartlist;
+			let alSleArr = []
+			that.cartlist.forEach(item => {
+				if(item.checked) {
+					alSleArr.push(item.checked)
+				}
+			})
+			if(alSleArr.length == that.cartlist.length) {
+				this.allchecked = true
+			}else {
+				this.allchecked = false
+			}
+			uni.setStorageSync('cart_select_list', that.cartlist);
+      that.calculate();
+    },
+		
+    changeradio2: function (e) {
+      var that = this;
+      var index = e.currentTarget.dataset.index;
+      var index2 = e.currentTarget.dataset.index2;
+			var cartlist = that.cartlist;
+      var checked = cartlist[index].prolist[index2].checked;
+			if(checked){
+				cartlist[index].prolist[index2].checked = false;
+			}else{
+				cartlist[index].prolist[index2].checked = true;
+			}
+			var isallchecked = true;
+			for(var i in cartlist[index].prolist){
+				if(cartlist[index].prolist[i].checked == false){
+					isallchecked = false;
+				}
+			}
+			if(isallchecked){
+				cartlist[index].checked = true;
+			}else{
+				cartlist[index].checked = false;
+			}
+			that.cartlist = cartlist;
+			let alSleArr = []
+			that.cartlist.forEach(item => {
+				if(item.checked) {
+					alSleArr.push(item.checked)
+				}
+			})
+			if(alSleArr.length == that.cartlist.length) {
+				this.allchecked = true
+			}else {
+				this.allchecked = false
+			}
+			uni.setStorageSync('cart_select_list', that.cartlist);
+      that.calculate();
+    },
+		changeradioAll:function(){
+      var that = this;
+			var cartlist = that.cartlist;
+			var allchecked = that.allchecked
+			for(var i in cartlist){
+				cartlist[i].checked = allchecked ? false : true;
+				for(var j in cartlist[i].prolist){
+					cartlist[i].prolist[j].checked = allchecked ? false : true;
+				}
+			}
+			that.cartlist = cartlist;
+			that.allchecked = allchecked ? false : true;
+			uni.setStorageSync('cart_select_list', that.cartlist);
+      that.calculate();
+		},
+    cartdelete: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.cartid;
+      app.confirm('确定要从购物车移除吗?', function () {
+        app.post('ApiShop/cartdelete', {id: id}, function (data) {
+          app.success('操作成功');
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+	cartdeleteb:function(e){
+      var that = this;
+      var bid = e.currentTarget.dataset.bid;
+      app.confirm('确定要从购物车移除吗?', function () {
+        app.post('ApiShop/cartdelete', {bid: bid}, function (data) {
+          app.success('操作成功');
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    toOrder: function () {
+      var that = this;
+      var cartlist = that.cartlist;
+      var ids = [];
+      var prodata = [];
+			for(var i in cartlist){
+				for(var j in cartlist[i].prolist){
+					if(cartlist[i].prolist[j].checked){
+						var thispro = cartlist[i].prolist[j];
+						prodata.push(thispro.product.id + ',' + thispro.guige.id + ',' + thispro.num);
+					}
+				}
+			}
+      if (prodata == undefined || prodata.length == 0) {
+        app.error('请先选择产品');
+        return;
+      }
+      app.goto('/pagesA/shop/buy?prodata=' + prodata.join('-'));
+    },
+    //加
+    gwcplus: function (e) {
+      var index = parseInt(e.currentTarget.dataset.index);
+      var index2 = parseInt(e.currentTarget.dataset.index2);
+      var maxnum = parseInt(e.currentTarget.dataset.max);
+      var cartid = e.currentTarget.dataset.cartid;
+      var num = parseInt(e.currentTarget.dataset.num);
+      if (num >= maxnum) {
+        app.error('库存不足');
+        return;
+      }
+			var cartlist = this.cartlist;
+			cartlist[index].prolist[index2].num++;
+			this.cartlist = cartlist
+			this.calculate();
+      var that = this;
+      app.post('ApiShop/cartChangenum', {id: cartid,num: num + 1}, function (data){
+        if (data.status == 1) {
+          //that.getdata();
+        } else {
+          app.error(data.msg);
+					cartlist[index].prolist[index2].num--;
+        }
+      });
+    },
+    //减
+    gwcminus: function (e) {
+      var index = parseInt(e.currentTarget.dataset.index);
+      var index2 = parseInt(e.currentTarget.dataset.index2);
+      var maxnum = parseInt(e.currentTarget.dataset.max);
+      var cartid = e.currentTarget.dataset.cartid;
+      var num = parseInt(e.currentTarget.dataset.num);
+      var limit_start = parseInt(e.currentTarget.dataset.limit_start);
+      var limit_start_guige = parseInt(e.currentTarget.dataset.limit_start_guige);
+			if(limit_start_guige > 0 && num <= limit_start_guige){
+				app.error('该商品规格'+limit_start_guige+'件起售');
+				return;
+			}
+			if(limit_start > 0 && num <= limit_start){
+				app.error('该商品'+limit_start+'件起售');
+				return;
+			}
+      if (num == 1) return;
+			var cartlist = this.cartlist;
+			cartlist[index].prolist[index2].num--;
+			this.cartlist = cartlist
+			this.calculate();
+      var that = this;
+      app.post('ApiShop/cartChangenum', {id: cartid,num: num - 1}, function (data) {
+        if (data.status == 1) {
+          //that.getdata();
+        } else {
+          app.error(data.msg);
+					cartlist[index].prolist[index2].num++;
+        }
+      });
+    },
+    //输入
+    gwcinput: function (e) {
+      var index = parseInt(e.currentTarget.dataset.index);
+      var index2 = parseInt(e.currentTarget.dataset.index2);
+      var maxnum = parseInt(e.currentTarget.dataset.max);
+      var cartid = e.currentTarget.dataset.cartid;
+      var num = e.currentTarget.dataset.num;
+      var newnum = parseInt(e.detail.value);
+      if (num == newnum) return;
+			var limit_start = parseInt(e.currentTarget.dataset.limit_start);
+			var limit_start_guige = parseInt(e.currentTarget.dataset.limit_start_guige);
+			if(limit_start_guige > 0 && newnum < limit_start_guige){
+				app.error('该商品规格'+limit_start_guige+'件起售');
+				return;
+			}
+			if(limit_start > 0 && newnum < limit_start){
+				app.error('该商品'+limit_start+'件起售');
+				return;
+			}
+			if (newnum < 1) {
+			  app.error('最小数量为1');
+			  return;
+			}
+
+      if (newnum > maxnum) {
+        app.error('库存不足');
+        return;
+      }
+			var cartlist = this.cartlist;
+			cartlist[index].prolist[index2].num = newnum;
+			this.cartlist = cartlist
+			this.calculate();
+
+      var that = this;
+      app.post('ApiShop/cartChangenum', {id: cartid,num: newnum}, function (data) {
+        if (data.status == 1) {
+          //that.getdata();
+        } else {
+          app.error(data.msg);
+        }
+      });
+    },
+		addcart:function(){
+			setTimeout(() => {
+				this.getdata();
+			}, 500);
+		}
+  }
+};
+</script>
+<style lang="scss">
+.container{
+	height: 100vh;
+	background: #F5F5F5;
+	padding-bottom: 110rpx;
+	box-sizing: border-box;
+	overflow-y: auto;
+	& ::-webkit-scrollbar {
+		display: none;
+	}
+}
+
+.cartmain {
+	padding: 86rpx 24rpx 0;
+	&-item {
+		background: #fff;border-radius: 12rpx;padding: 32rpx 24rpx;
+		&:not(:last-child) {margin-bottom: 24rpx;}
+		&__hd {
+			&-label {
+				flex-shrink: 0;
+				.label-radio{
+					width: 40rpx;height: 40rpx;border: 1rpx solid #CCCCCC;border-radius: 50%;overflow: hidden;
+					&__checked {width: 100%;height: 100%;}
+				}
+			}
+			&-logo { width: 36rpx;height: 36rpx;margin-left: 24rpx; }
+			&-name {
+				flex: 1;font-size: 28rpx;font-weight: bold;color: #333333;line-height: 40rpx;margin-left: 16rpx;
+				.icon-arrow-right {color: #CCCCCC;font-size: 32rpx;}
+			}
+		}
+		&__bd {
+			.swipe-action-item {
+				margin-top: 40rpx;
+				&__label {
+					flex-shrink: 0;
+					.label-radio{
+						width: 40rpx;height: 40rpx;border: 1rpx solid #CCCCCC;border-radius: 50%;overflow: hidden;
+						&__checked {width: 100%;height: 100%;}
+					}
+				}
+				&__bd {
+					flex: 1;
+					margin-left: 24rpx;
+				}
+				&__img {position: relative;}
+				.img-url {width: 168rpx;height: 168rpx;border-radius: 12rpx;}
+				.img-tips {
+					position: absolute;
+					top: 50%;
+					left: 0;
+					right: 0;
+					transform: translateY(-50%);
+					background: rgba($color: #000000, $alpha: 0.4);
+					border-radius: 18rpx;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					line-height: 36rpx;
+					text-align: center;
+				}
+				&__info {margin-left: 24rpx;font-weight: bold;}
+				.info-title {font-size: 26rpx;color: #333333;line-height: 36rpx;height: 72rpx;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;}
+				.info-subtitle {margin-top: 6rpx;font-size: 22rpx;color: #CCCCCC;line-height: 36rpx;}
+				.info-price {margin-top: 6rpx;font-size: 36rpx;color: #ED5925;line-height: 60rpx;height: 60rpx;}
+				.symbol {font-size: 24rpx;}
+				&__btn {position: absolute;right: 0;bottom: 0;border: 1rpx solid #CCCCCC;border-radius: 12rpx;height: 56rpx;}
+				.input {width: 80rpx;text-align: center;font-size: 28rpx;color: #333333;border: 1rpx solid #CCCCCC;border-top: none;border-bottom: none;height: 100%;line-height: 54rpx;}
+				.btn-sub,.btn-add {width: 18rpx;height: 18rpx;margin: 18rpx;}
+			}
+		}
+	}
+}
+
+.footer {width: 100%;background: #fff;position: fixed;left: 0px;z-index:8;display:flex;align-items:center;padding:24rpx 20rpx;border-top:1px solid #EFEFEF}
+.footer .radio{flex-shrink:0;width: 40rpx;height: 40rpx;background: #FFFFFF;border: 1rpx solid #BFBFBF;border-radius: 50%;margin-right:8rpx}
+.footer .radio .radio-img{width:100%;height:100%}
+.footer .text0{color:#999999;font-size:24rpx;line-height: 34rpx;}
+.footer .text1 {line-height: 34rpx;color:#333333;font-size:24rpx;}
+.footer .text2 {color: #ED5925;font-size: 40rpx;font-weight:bold}
+.footer .op{width: 198rpx;height: 80rpx;line-height:80rpx;border-radius: 40rpx;font-weight:bold;color:#FFF;font-size:28rpx;text-align:center;margin-left: 24rpx}
+
+.xihuan{display:flex;align-items:center;padding: 28rpx 0 24rpx;}
+.xihuan-line{height: auto; padding: 0; overflow: hidden;flex:1;height:0;border-top:1px solid #eee}
+.xihuan-text{padding:0 32rpx;text-align:center;display:flex;align-items:center;justify-content:center}
+.xihuan-text .txt{color:#0A5D3B;font-size:30rpx}
+.xihuan-text .img{text-align:center;width:36rpx;height:36rpx;margin-right:12rpx}
+
+.prolist{width: 100%;height:auto;padding: 8rpx 20rpx;}
+
+.data-empty {
+	background: #FFF;padding: 72rpx 20rpx 32rpx;flex-direction: column;font-weight: 500;font-size: 28rpx;
+	&-img { width: 346rpx; height: 278rpx; }
+	&-txt { font-size: 26rpx;color: #999999;line-height: 36rpx; }
+	&-tips { margin-top: 6rpx;color: #0A5D3B;line-height: 40rpx; }
+	&-btn { background: linear-gradient(to right,#00AE68 0%,#096742 100%);margin-top: 44rpx;width: 158rpx;height: 62rpx;border-radius: 62rpx;text-align: center;color: #FFF;line-height: 62rpx; }
+}
+
+.data-empty-text{ display: block; text-align: center; color: #999999; font-size:32rpx; width: 100%; margin-top: 30rpx; } 
+
+.xihuan .img-n {width: 36rpx;}
+
+/* 全选 */
+.check-all {display: flex;align-items:center ;}
+	
+
+/* 管理 */
+.regulate-title {
+	position: fixed;
+	background: #F5F5F5;
+	top: 0;
+	left: 0;
+	right: 0;
+	padding: 24rpx;
+	z-index: 3;
+	justify-content: flex-end;
+}
+/* 侧滑删除 */
+.sideslip-box {
+	margin-left: 24rpx;
+	margin-top: 40rpx;
+	&__txt {
+		font-size: 28rpx;
+		font-weight: bold;
+		color: #FFFFFF;
+		line-height: 40rpx;
+		margin-top: 8rpx;
+	}
+	.iconfont {
+		color: #FFF;
+		font-size: 36rpx;
+	}
+}
+.sideslip-del {
+	width: 148rpx;
+	flex-direction: column;
+	background-color: #fa4a4a;
+	.iconfont {
+		font-size: 36rpx;
+	}
+}
+/* 侧滑删除收藏 */
+.sideslip-collectible {
+	width: 148rpx;
+	flex-direction: column;
+	background-color: #ffa32e;
+}
+
+// .not-s {
+// 	position: relative;
+// 	display: flex;
+// }
+// .swipe-action-item-smk {
+// 	width: 100%;
+// 	height: 100%;
+// 	text-align: center;
+// 	line-height: 176rpx;
+// 	font-size: 50rpx;
+// 	border-radius: 50%;
+// 	position: absolute;
+// 	top: 0%;
+// 	left: 0;
+// 	background-color: rgba(0, 0, 0, .3);
+// 	color: #fff;
+// 	z-index: 7;
+// }
+// .b-s {
+// 	border-radius: 0;
+// 	background-color: rgba(255, 255, 255, .3);
+// }
+
+/*  删除弹框 */
+.del-dialog {
+	width: 100%;height: 100%;position: fixed;top: 0;left: 0;background-color: rgba(0,0,0, .5);z-index: 9999999;
+	&__con {
+		width: 598rpx;
+		position: fixed;
+		top: 40%;
+		left: 50%;
+		transform: translateX(-50%) translateY(-50%);
+		background: #FFFFFF;
+		border-radius: 12rpx;
+		padding: 70rpx 50rpx 44rpx;
+	}
+	&__title {
+		text-align: center;font-size: 28rpx;font-weight: bold;color: #333333;line-height: 20px;
+	}
+	&__btns { margin-top: 60rpx; }
+	&__btn { 
+		font-size: 28rpx; line-height: 80rpx;border-radius: 40rpx;width: 236rpx;
+		&.confirm-btn {
+			border: 1rpx solid #E8E8E8;color: #666666;
+		}
+		&.cancel-btn {
+			background: linear-gradient(to right,#00AE68 0%,#096742 100%);
+		}
+	}
+	
+}
+
+</style>
\ No newline at end of file
diff --git a/pages/shop/category1.vue b/pages/shop/category1.vue
new file mode 100644
index 0000000..9403827
--- /dev/null
+++ b/pages/shop/category1.vue
@@ -0,0 +1,57 @@
+<template>
+<view class="navbox">
+	<block v-for="(item, index) in data" :key="index">
+  <view class="nav_li" @tap="goto" :data-url="'/pages/shop/prolist?'+(bid>0?'bid='+bid+'&cid2':'cid')+'=' + item.id">
+    <image :src="item.pic"></image>
+    <view>{{item.name}}</view>
+  </view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      data: [],
+			bid:0,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid ? this.opt.bid : 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiShop/category1', {bid:that.bid}, function (res) {
+				that.loading = false;
+				that.data = res.data;
+				that.loaded();
+			});
+		},
+  }
+};
+</script>
+<style>
+page{background-color:#fff}
+.navbox{margin-top:12rpx;height: auto;overflow: hidden;padding-bottom:20rpx;}
+.nav_li{width:33%;text-align: center;box-sizing: border-box;padding:30rpx 0 10rpx;float: left;}
+.nav_li image{width:100rpx;height:100rpx;margin-bottom:20rpx;}
+</style>
\ No newline at end of file
diff --git a/pages/shop/category2.vue b/pages/shop/category2.vue
new file mode 100644
index 0000000..1477ebb
--- /dev/null
+++ b/pages/shop/category2.vue
@@ -0,0 +1,148 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="view-show">
+			<view @tap.stop="goto" :data-url="'/pages/shop/search?bid='+bid" class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<view class="search-text">搜索感兴趣的商品</view>
+				</view>
+			</view>
+			<view class="content" style="height:calc(100% - 94rpx);overflow:hidden;display:flex">
+				<scroll-view class="nav_left" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<block v-for="(item, index) in data" :key="index" >
+					<view class="nav_left_items" :class="index===currentActiveIndex?'active':''" @tap="clickRootItem" :data-root-item-id="item.id" :data-root-item-index="index"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+					</block>
+				</scroll-view>
+				<view class="nav_right">
+					<view class="nav_right-content">
+						<scroll-view @scroll="scroll" class="detail-list" :scrollIntoView="scrollToViewId" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+							<view v-for="(detail, index) in data" :key="index" class="classification-detail-item">
+								<view class="head" :data-id="detail.id" :id="'detail-' + detail.id">
+									<view class="txt">{{detail.name}}</view>
+									<view class="show-all" @tap="gotoCatproductPage" :data-id="detail.id">查看全部<text class="iconfont iconjiantou"></text></view>
+								</view>
+								<view class="detail">
+									<view v-for="(item, itemIndex) in detail.child" :key="itemIndex" @tap.stop="gotoCatproductPage" class="detail-item" :data-id="item.id" form-type="submit" :style="(itemIndex+1)%3===0?'margin-right: 0':''">
+										<image class="img" :src="item.pic"></image>
+										<view class="txt">{{item.name}}</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		harr:[],
+		data: [],
+		currentActiveIndex: 0,
+		animation: true,
+		scrollToViewId: "",
+		bid:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid ? this.opt.bid : '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiShop/category2', {bid:that.bid}, function (res) {
+				that.loading = false;
+				//计算每个高度
+				var harr = [];
+				var clientwidth = uni.getSystemInfoSync().windowWidth;
+				var data = res.data;
+				for (var i = 0; i < data.length; i++) {
+					var child = data[i].child;
+					harr.push(Math.ceil(child.length / 3) * 196 / 750 * clientwidth);
+				}
+				that.harr = harr;
+				that.data = res.data;
+				that.loaded();
+			});
+		},
+    clickRootItem: function (t) {
+      var e = t.currentTarget.dataset;
+      this.scrollToViewId = 'detail-' + e.rootItemId;
+      this.currentActiveIndex = e.rootItemIndex;
+    },
+    gotoCatproductPage: function (t) {
+      var e = t.currentTarget.dataset;
+			if(this.bid){
+				app.goto('/pages/shop/prolist?bid='+this.bid+'&cid2=' + e.id);
+			}else{
+				app.goto('/pages/shop/prolist?cid=' + e.id);
+			}
+    },
+    scroll: function (e) {
+      var scrollTop = e.detail.scrollTop;
+      var harr = this.harr;
+      var countH = 0;
+      for (var i = 0; i < harr.length; i++) {
+        if (scrollTop >= countH && scrollTop < countH + harr[i]) {
+          this.currentActiveIndex = i;
+          break;
+        }
+        countH += harr[i];
+      }
+    }
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+button {border: 0 solid!important;}
+.container{height:100%}
+.view-show{background-color: white;line-height: 1;width: 100%;height: 100%;}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 0 20rpx}
+.nav_right-content{background: #ffffff;padding:20rpx;height:100%;position:relative}
+.detail-list {height:100%;overflow:scroll}
+.classification-detail-item {width: 100%;overflow: visible;background:#fff}
+.classification-detail-item .head {height: 82rpx;width: 100%;display: flex;align-items:center;justify-content:space-between;}
+.classification-detail-item .head .txt {color:#222222;font-weight:bold;font-size:28rpx;}
+.classification-detail-item .head .show-all {font-size: 22rpx;color:#949494;display:flex;align-items:center}
+.classification-detail-item .detail {width:100%;display:flex;flex-wrap:wrap}
+.classification-detail-item .detail .detail-item {width:150rpx;height: 150rpx;margin-bottom: 36rpx;}
+.classification-detail-item .detail .detail-item .img {width: 112rpx;height: 112rpx;margin-left:24rpx}
+.classification-detail-item .detail .detail-item .txt {color:#5A5A5A;font-size: 26rpx;margin-top:20rpx;text-align: center;white-space: nowrap;word-break: break-all;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
+</style>
\ No newline at end of file
diff --git a/pages/shop/category3.vue b/pages/shop/category3.vue
new file mode 100644
index 0000000..605a340
--- /dev/null
+++ b/pages/shop/category3.vue
@@ -0,0 +1,142 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="view-show">
+			<view @tap.stop="goto" :data-url="'/pages/shop/search?bid='+bid" class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<view class="search-text">搜索感兴趣的商品</view>
+				</view>
+			</view>
+			<view class="content" style="height:calc(100% - 94rpx);overflow:hidden;display:flex">
+				<scroll-view class="nav_left" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<block v-for="(item, index) in data" :key="index" >
+					<view class="nav_left_items" :class="index===currentActiveIndex?'active':''" @tap="clickRootItem" :data-root-item-id="item.id" :data-root-item-index="index"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+					</block>
+				</scroll-view>
+				<view class="nav_right">
+					<view class="nav_right-content">
+						<scroll-view @scroll="scroll" class="detail-list" :scrollIntoView="scrollToViewId" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+							<view v-for="(detail, index) in clist" :key="index" class="classification-detail-item">
+								<view class="head" :data-id="detail.id" :id="'detail-' + detail.id">
+									<view class="txt">{{detail.name}}</view>
+									<view class="show-all" @tap="gotoCatproductPage" :data-id="detail.id">查看全部<text class="iconfont iconjiantou"></text></view>
+								</view>
+								<view class="detail">
+									<view v-for="(item, itemIndex) in detail.child" :key="itemIndex" @tap.stop="gotoCatproductPage" class="detail-item" :data-id="item.id" form-type="submit" :style="(itemIndex+1)%3===0?'margin-right: 0':''">
+										<image class="img" :src="item.pic"></image>
+										<view class="txt">{{item.name}}</view>
+									</view>
+								</view>
+							</view>
+							<nodata v-if="nodata"></nodata>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading" loadstyle="left:62.5%"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		data: [],
+		currentActiveIndex: 0,
+		animation: true,
+		clist: "",
+		bid:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid ? this.opt.bid : '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiShop/category3', {bid:that.bid}, function (res) {
+				that.loading = false;
+				that.data = res.data;
+				that.loaded();
+				that.getdownclist3(res.data[0].id);
+			});
+		},
+    getdownclist3: function (id) {
+      var that = this;
+			that.loading = true;
+			that.nodata = false;
+      app.post("ApiShop/getdownclist3", {id: id,bid:that.bid}, function (res) {
+				that.loading = false;
+        that.clist = res.data;
+				if((that.clist).length == 0){
+					that.nodata = true;
+				}
+      });
+    },
+    clickRootItem: function (t) {
+      var e = t.currentTarget.dataset;
+      this.currentActiveIndex = e.rootItemIndex;
+      var id = e.rootItemId;
+      this.getdownclist3(id);
+    },
+    gotoCatproductPage: function (t) {
+      var e = t.currentTarget.dataset;
+			if(this.bid){
+				app.goto('/pages/shop/prolist?bid='+this.bid+'&cid2=' + e.id);
+			}else{
+				app.goto('/pages/shop/prolist?cid=' + e.id);
+			}
+    }
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+button {border: 0 solid!important;}
+.container{height:100%}
+.view-show{background-color: white;line-height: 1;width: 100%;height: 100%;}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 0 20rpx}
+.nav_right-content{background: #ffffff;padding:20rpx;height:100%;position:relative}
+.detail-list {height:100%;overflow:scroll}
+.classification-detail-item {width: 100%;overflow: visible;background:#fff}
+.classification-detail-item .head {height: 82rpx;width: 100%;display: flex;align-items:center;justify-content:space-between;}
+.classification-detail-item .head .txt {color:#222222;font-weight:bold;font-size:28rpx;}
+.classification-detail-item .head .show-all {font-size: 22rpx;color:#949494;display:flex;align-items:center}
+.classification-detail-item .detail {width:100%;display:flex;flex-wrap:wrap}
+.classification-detail-item .detail .detail-item {width:160rpx;height: 160rpx;margin-bottom: 36rpx;}
+.classification-detail-item .detail .detail-item .img {width: 112rpx;height: 112rpx;margin-left:24rpx}
+.classification-detail-item .detail .detail-item .txt {color:#5A5A5A;font-size: 26rpx;margin-top:20rpx;text-align: center;white-space: nowrap;word-break: break-all;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
+
+</style>
\ No newline at end of file
diff --git a/pages/shop/category4.vue b/pages/shop/category4.vue
new file mode 100644
index 0000000..61d2a56
--- /dev/null
+++ b/pages/shop/category4.vue
@@ -0,0 +1,124 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="view-show">
+			<view @tap.stop="goto" :data-url="'/pages/shop/search?bid='+bid" class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<view class="search-text">搜索感兴趣的商品</view>
+				</view>
+			</view>
+			<view class="content" style="height:calc(100% - 94rpx);overflow:hidden;display:flex">
+				<scroll-view class="nav_left" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<block v-for="(item, index) in data" :key="index" >
+					<view class="nav_left_items" :class="index===currentActiveIndex?'active':''" @tap="clickRootItem" :data-root-item-id="item.id" :data-root-item-index="index"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+					</block>
+				</scroll-view>
+				<view class="nav_right">
+					<view class="nav_right-content">
+						<scroll-view class="detail-list" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+							<view class="head">
+								<view class="txt">{{data[currentActiveIndex].name}}</view>
+								<view class="show-all" @tap="gotoCatproductPage" :data-id="data[currentActiveIndex].id">查看全部<text class="iconfont iconjiantou"></text></view>
+							</view>
+							<view class="detail">
+								<view v-for="(item, itemIndex) in data[currentActiveIndex].child" :key="itemIndex" @tap.stop="gotoCatproductPage" class="detail-item" :data-id="item.id" form-type="submit" :style="(itemIndex+1)%3===0?'margin-right: 0':''">
+									<image class="img" :src="item.pic"></image>
+									<view class="txt">{{item.name}}</view>
+								</view>
+							</view>
+							<nodata v-if="(data[currentActiveIndex].child).length == 0"></nodata>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading" loadstyle="left:62.5%"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		data: [],
+		currentActiveIndex: 0,
+		animation: true,
+		clist: "",
+		bid:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid ? this.opt.bid : '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiShop/category2', {bid:that.bid}, function (res) {
+				that.loading = false;
+				that.data = res.data;
+				that.loaded();
+			});
+		},
+    clickRootItem: function (t) {
+      var e = t.currentTarget.dataset;
+      this.currentActiveIndex = e.rootItemIndex;
+    },
+    gotoCatproductPage: function (t) {
+      var e = t.currentTarget.dataset;
+			if(this.bid){
+				app.goto('/pages/shop/prolist?bid='+this.bid+'&cid2=' + e.id);
+			}else{
+				app.goto('/pages/shop/prolist?cid=' + e.id);
+			}
+    }
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+button {border: 0 solid!important;}
+.container{height:100%}
+.view-show{background-color: white;line-height: 1;width: 100%;height: 100%;}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 0 20rpx}
+.nav_right-content{background: #ffffff;padding:20rpx;height:100%;position:relative}
+.detail-list {height:100%;overflow:scroll}
+.detail-list .head {height: 82rpx;width: 100%;display: flex;align-items:center;justify-content:space-between;margin-bottom:40rpx}
+.detail-list .head .txt {color:#222222;font-weight:bold;font-size:28rpx;}
+.detail-list .head .show-all {font-size: 22rpx;color:#949494;display:flex;align-items:center}
+.detail-list .detail {width:100%;display:flex;flex-wrap:wrap}
+.detail-list .detail .detail-item {width:160rpx;height: 160rpx;margin-bottom:70rpx;}
+.detail-list .detail .detail-item .img {width: 112rpx;height: 112rpx;margin-left:24rpx}
+.detail-list .detail .detail-item .txt {color:#5A5A5A;font-size: 26rpx;margin-top:20rpx;text-align: center;white-space: nowrap;word-break: break-all;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
+
+</style>
\ No newline at end of file
diff --git a/pages/shop/classify.vue b/pages/shop/classify.vue
new file mode 100644
index 0000000..10b2a5c
--- /dev/null
+++ b/pages/shop/classify.vue
@@ -0,0 +1,1040 @@
+<template>
+	<view class="container">  
+		<block v-if="isload">			
+			<view class="pages-hd" 
+				:style="{'padding-top': menuButtonTop + 'px'}">	
+				<view class="navigation flex al-item-center" v-if="!storeInfo.name"
+					:style="{'height': menuButtonHeight + 'px'}">
+					<text class="iconfont icon-icon_arrow_left" v-if="isShowBack" @click="goBack"></text>
+					<view class="navigation-title">{{storeInfo.name ? '商品分类' : '全部商品'}}</view>
+				</view>
+				<view class="pages-hd__search">
+					<view class="left" @click="goto" data-url="/pagesA/shop/sizeShop?types=classify" v-if="!storeInfo.name">
+						<view class="l_top">
+							<text class="iconfont icon-dianpu1"></text>
+							<text class="txt">请选择店铺</text> <text class="iconfont icon-shang"></text>
+						</view>
+					</view>
+
+					<view @tap.stop="goto" :data-url="'/pages/shop/search?bid='+bid" class="search-container">
+						<view class="search-box">
+							<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+							<view class="search-text">搜索感兴趣的商品</view>
+						</view>
+					</view>
+				</view>
+				<view class="pages-hd__shop" @click="goto" data-url="/pagesA/shop/sizeShop?types=classify" v-if="storeInfo.name">
+					<view class="shop-name flex al-item-center">{{storeInfo.name}}<text class="iconfont icon-arrow-right"></text></view>
+					<view class="shop-distance">
+						<text class="iconfont icon-didian"></text>距离{{storeInfo.juli}}
+					</view>
+				</view>
+			</view>
+			
+			<view class="coentent_box" v-if="!storeInfo.name" style="flex: 1; overflow: hidden;">
+				<view class="nav-pai1">
+					<view class="nav-paili1 flex al-item-center j-center" :class="(!field||field=='sort')?'actived':''" @tap="changeOrder" data-field="sort" data-order="desc">综合</view> 
+					<view class="nav-paili1 flex al-item-center j-center" :class="field=='sales'?'actived':''" @tap="changeOrder" data-field="sales" data-order="desc">销量</view> 
+					<view class="nav-paili1 flex al-item-center j-center" :class="field=='createtime'?'actived':''" @tap="changeOrder" data-field="createtime" data-order="desc">上新</view>
+					<view class="nav-paili1 flex al-item-center j-center" @tap="changeOrder" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+						<view :class="field=='sell_price'?'selected':''">价格</view>
+						<text  style="font-size: 26rpx; " class="iconfont icon-danbianjiantou1" :style="field=='sell_price'&&order=='asc'?'color:'+'#333333;':''"></text>
+						<text style="margin-left: -10rpx; font-size: 26rpx;" class="iconfont icon-danbianjiantou" :style="field=='sell_price'&&order=='desc'?'color:'+'#333333;':''"></text>
+					</view>  
+				</view>
+				<scroll-view class="classify-box" scroll-y="true" @scrolltolower="scrolltolower">
+				<view class="product-container" style="padding: 20rpx;">
+					<block v-if="datalist && datalist.length>0">
+						<!-- <dp-product-item  types='search'  :data="datalist" :menuindex="-1"></dp-product-item> -->
+						<view class="product-box flex flex-w j-between">
+							<block v-for="(item, idx) in datalist" :key="idx">
+								<view
+									class="product-item bg-color-white overflow-hd"
+									@click="goto"
+									:data-url="'/pages/shop/product?id=' + item.id"
+								>
+									<view class="product-item__hd flex j-center al-item-center">
+										<image
+											class="product-img"
+											:src="item.pic"
+											mode="widthFix"
+										></image>
+									</view>
+									<view class="item-info">
+										<view class="item-info__name text-overflow-line">{{ item.name }}</view>
+										<view class="item-info__salse">已售 {{ item.sales ? (item.sales >= 10000 ? (item.sales / 10000).toFixed(1) + '万': item.sales) : 0 }}</view>
+											<view class="item-info__price"><text class="symbol">¥</text>{{ item.sell_price }}</view>
+										<view class="item-info__shop flex al-item-center j-between">
+											<view class="item-info__shop-bd flex al-item-center"
+												@click="goto"
+												:data-url="'/pagesA/shop/index?id=' + item.business.id">
+												<image class="item-info__shop-logo" :src="item.business.logo"></image>
+												<view class="item-info__shop-name">{{item.business.name}}</view>
+											</view>
+											<view
+												class="item-info__shop-cart flex border-rius-r al-item-center j-center"
+												@click.stop="buydialogChange"
+												:data-proid="item.id"
+											>
+												<text class="iconfont icon-gouwuche1"></text>
+											</view>
+										</view>
+									</view>
+								</view>
+							</block>
+						</view>
+					</block>
+					<nomore text="没有更多商品了" v-else></nomore>
+					<!-- <nodata text="没有查找到相关商品" v-if="nodata"></nodata> -->
+					<!-- <loading v-if="loading"></loading> -->
+				</view>
+				</scroll-view>
+			</view>
+			<view class="content-container" v-else>
+				<view class="nav_left">
+					<view :class="'nav_left_items ' + (curIndex == -1 ? 'active' : '')" @tap="switchRightTab"
+						data-index="-1" data-id="0">全部
+					</view>
+					<block v-for="(item, index) in clist" :key="index">
+						<view :class="'nav_left_items ' + (curIndex == index ? 'active' : '')" @tap="switchRightTab"
+							:data-index="index" :data-id="item.id">{{item.name}}
+						</view>
+					</block>
+				</view>
+				<view class="nav_right">
+					<scroll-view class="nav_right-scroll" v-if="curIndex>-1" scroll-x="true">
+						<view class="nav-paili" :class="{'nav-pailiz':curIndex2==-1}"
+							@tap="changeCTab" :data-id="clist[curIndex].id" data-index="-1">全部</view>
+						<view class="nav-paili" :class="{'nav-pailiz':curIndex2== idx2}"
+							v-for="(item, idx2) in clist[curIndex].child" :key="idx2" @tap="changeCTab"
+							:data-id="item.id" :data-index="idx2">{{item.name}}</view>
+					</scroll-view>
+					<view class="nav_right-content">
+						<scroll-view class="classify-box" scroll-y="true" @scrolltolower="scrolltolower">
+							<view class="product-itemlist">
+								<view class="item" v-for="(item,index) in datalist" :key="index" @click="goto"
+									:data-url="'/pages/shop/product?id='+item.id">
+									<view class="product-pic">
+										<image class="image" :src="item.pic" mode="widthFix" />
+									</view>
+									<view class="product-info flex j-between">
+										<view class="product-info__name"><text>{{item.name}}</text></view>
+										<view class="product-info__bot flex j-between">
+											<view class="product-info__price">
+												<text class="current-price"><text
+														class="symbol">￥</text>{{item.sell_price}}</text>
+												<text class="original-price"
+													v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+											</view>
+											<view class="car-btn"
+												@click.stop="buydialogChange" :data-proid="item.id"><text
+													class="iconfont icon-jiahao"></text></view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<nomore text="没有更多商品了" v-if="nomore"></nomore>
+							<nodata text="暂无相关商品" v-if="nodata"></nodata>
+							<view style="width:100%;height:100rpx"></view>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+		
+		</block>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex">
+		</buydialog>
+		<loading v-if="loading" ></loading>
+		<dp-tabbar v-if="tab_show" :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+		<popmsg ref="popmsg"></popmsg>
+		<!-- 弹窗 -->
+		<view class="hm_box" v-if="hm_show">
+			<view class="contoent">
+				<view class="title">
+					检测到您的定位已经发生变化，是否切换店铺为你提供服务？
+				</view>
+				
+				<view class="item">
+				 <text class="wai" @click="hm30_show = !hm30_show "><text v-if="hm30_show" class="nei"></text></text>	最近30天内不显示该选项
+				</view>
+				<view class="btn_box">
+					<view class="left" @click="hm_btn(1)">
+						切换
+					</view>
+					<view class="right" @click="hm_btn(0)">
+						不切换
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+
+		data() {
+			return {
+				tab_show:true,
+				class_hm30_show: uni.getStorageSync('class_hm30_show') || '',
+				hm_show:false,
+				hm30_show:false,
+				storeInfo: uni.getStorageSync('class_store_info')?JSON.parse(uni.getStorageSync('class_store_info')): {},
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+				pagenum: 1,
+				nomore: false,
+				nodata: false,
+				order: '',
+				field: '',
+				clist: [],
+				curIndex: -1,
+				curIndex2: -1,
+				datalist: [],
+				nodata: false,
+				curCid: 0,
+				proid: 0,
+				buydialogShow: false,
+				bid: '',
+				menuButtonTop: 0,
+				menuButtonHeight: 40,
+				isShowBack: true,
+				
+				event_rul: app.globalData.event_url,
+			};
+		},
+
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			const pages = getCurrentPages();
+			if (pages.length === 1) {
+				this.isShowBack = false;
+			} else {
+				this.isShowBack = true;
+			}
+
+			if(this.storeInfo.id){
+				this.bid = this.storeInfo.id ||'';
+			}else{
+				this.bid = this.opt.bid ||'';
+			}
+			
+			
+			
+			if(opt.homeType){ //首页进来,默认全部商品
+			 	this.storeInfo ={};
+				this.bid= '';
+				this.tab_show = false;
+				
+			}else{
+				if(this.storeInfo.id&&(!this.class_hm30_show || Number(new Date) >(this.class_hm30_show+ 2592000000))){
+					this.resetFn();
+				}
+			}
+			// #ifdef MP
+			// 获取右上角胶囊坐标信息
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+			this.menuButtonHeight = menuButtonInfo.height;  // 胶囊的高度
+			
+			if(this.storeInfo.name) {
+				this.menuButtonTop = menuButtonInfo.top - (48 - this.menuButtonHeight) / 2;
+			} else {
+				this.menuButtonTop = menuButtonInfo.top;  
+			}
+			// #endif
+			
+		
+			this.getdata();
+			
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		methods: {
+			hm_btn(e){
+				if(this.hm30_show){
+					uni.setStorageSync('class_hm30_show',Number(new Date))
+				}
+				if(e == 1){
+					uni.navigateTo({
+						url:'/pagesA/shop/sizeShop'
+					})
+				}else{
+					this.hm_show = false;
+				}
+			},
+			resetFn(){
+				var that = this;
+				let newTime = Number(new Date)
+				let oldTime = this.storeInfo.resetTime || 0
+				console.log(newTime,oldTime)
+				if(newTime > (oldTime+3600000)){
+					app.getLocation(function(res) {
+							var latitude =  res.latitude;
+							var longitude =  res.longitude;
+							app.post('ApiBusiness/nearby',{latitude,longitude,bid:that.bid},function (res){
+								if(res.bid !== 0){
+									that.hm_show = true;
+								}
+							})
+						})
+					
+				}
+			},
+			getdata: function() {
+				var that = this;
+				var nowcid = that.opt.cid;
+				if (!nowcid) nowcid = '';
+				that.pagenum = 1;
+				that.datalist = [];
+				that.loading = true;
+				app.get('ApiShop/classify', {
+					cid: nowcid,
+					bid: that.bid
+				}, function(res) {
+					that.loading = false;
+					var clist = res.data;
+					that.clist = clist;
+					if (nowcid) {
+						for (var i = 0; i < clist.length; i++) {
+							if (clist[i]['id'] == nowcid) {
+								that.curIndex = i;
+								that.curCid = nowcid;
+							}
+							var downcdata = clist[i]['child'];
+							var isget = 0;
+							for (var j = 0; j < downcdata; j++) {
+								if (downcdata[j]['id'] == nowcid) {
+									that.curIndex = i;
+									that.curIndex2 = j;
+									that.curCid = nowcid;
+									isget = 1;
+									break;
+								}
+							}
+							if (isget) break;
+						}
+					}
+					that.loaded();
+					that.getdatalist();
+				});
+			},
+
+			getdatalist: function(loadmore) {
+				if (!loadmore) {
+					this.pagenum = 1;
+					this.datalist = [];
+				}
+
+				var that = this;
+
+				var pagenum = that.pagenum;
+
+				var cid = that.curCid;
+				var bid = this.bid;
+				var order = that.order;
+
+				var field = that.field;
+				that.loading = true;
+				that.nodata = false;
+				that.nomore = false;
+				var wherefield = {};
+				wherefield.pagenum = pagenum;
+				wherefield.field = field;
+				wherefield.order = order;
+				wherefield.bid = bid;
+				if (bid > 0) {
+					wherefield.cid2 = cid;
+				} else {
+					wherefield.cid = cid;
+				}
+				app.post('ApiShop/getprolist', wherefield, function(res) {
+					that.loading = false;
+
+					uni.stopPullDownRefresh();
+
+					var data = res.data;
+					if (data.length == 0) {
+						if (pagenum == 1) {
+							that.nodata = true;
+						} else {
+							that.nomore = true;
+						}
+					}
+					var datalist = that.datalist;
+					var newdata = datalist.concat(data);
+					that.datalist = newdata;
+				});
+
+			},
+
+			scrolltolower: function() {
+
+				if (!this.nomore) {
+
+					this.pagenum = this.pagenum + 1;
+					this.getdatalist(true);
+
+				}
+
+			},
+
+			//改变子分类
+
+			changeCTab: function(e) {
+
+				var that = this;
+
+				var id = e.currentTarget.dataset.id;
+				var index = parseInt(e.currentTarget.dataset.index);
+
+				this.curIndex2 = index;
+				this.nodata = false;
+
+				this.curCid = id;
+
+				this.pagenum = 1;
+
+				this.datalist = [];
+
+				this.nomore = false;
+
+				this.getdatalist();
+
+			},
+
+			//改变排序规则
+
+			changeOrder: function(e) {
+
+				var t = e.currentTarget.dataset;
+
+				this.field = t.field;
+				this.order = t.order;
+
+				this.pagenum = 1;
+				this.datalist = [];
+				this.nomore = false;
+
+				this.getdatalist();
+
+			},
+
+			//事件处理函数
+
+			switchRightTab: function(e) {
+
+				var that = this;
+
+				var id = e.currentTarget.dataset.id;
+
+				var index = parseInt(e.currentTarget.dataset.index);
+
+				this.curIndex = index;
+				this.curIndex2 = -1;
+				this.nodata = false;
+				this.curCid = id;
+				this.pagenum = 1;
+				this.datalist = [];
+				this.nomore = false;
+
+				this.getdatalist();
+
+			},
+			buydialogChange: function(e) {
+				if (!this.buydialogShow) {
+					this.proid = e.currentTarget.dataset.proid
+				}
+				this.buydialogShow = !this.buydialogShow;
+			},			
+			goBack() {
+				uni.navigateBack({
+					delta: 1,
+				})
+			}
+		}
+
+	};
+</script>
+<style lang="scss">
+	// 弹窗
+	.hm_box{
+		position: fixed;
+        z-index: 9;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		background-color: rgba($color: #000000, $alpha: .5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		.contoent{
+			width: 598rpx;
+			background-color: #fff;
+			padding: 60rpx 50rpx 44rpx;
+			border-radius: 12rpx;
+			.title {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #333333;
+				line-height: 40rpx;
+			}
+			.btn_box{
+				margin-top: 50rpx;
+				width: 100%;
+				display: flex;
+				justify-content: space-around;
+				
+				.left,.right{
+					width: 336rpx;
+					text-align: center;
+					padding: 0rpx 20rpx;
+					box-sizing: border-box;
+					border-radius: 40rpx;
+					font-size: 28rpx;
+					color: #666666;
+					line-height: 80rpx;
+				}
+				.left {
+					border: 1rpx solid #E8E8E8;
+				}
+				.right{
+					margin-left: 26rpx;
+					color: #FFFFFF;
+					background: linear-gradient(to right,#00AE68 0%,#096742 100%);
+				}
+			}
+			.item{
+				margin-top: 20rpx;
+				width: 100%;
+				justify-content: center;
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				color: #666666;
+				line-height: 34rpx;
+				.wai{
+					width: 24rpx;
+					height: 24rpx;
+					margin-right: 6rpx;
+					border-radius: 50%;
+					overflow: hidden;
+					padding: 4rpx;
+					border: 1px solid#0A5D3B;
+				}
+				.nei{
+					display: block;
+					width: 100%;
+					height: 100%;
+					border-radius: 50%;
+					background-color: #0A5D3B;
+				}
+			}
+		}
+	}
+	.coentent_box{
+		display: flex;
+		flex-direction: column;
+		.nav-pai1{
+			width: 100%;display:flex;align-items:center;justify-content:center;background: #FFF;
+			.nav-paili1{
+				flex:1; text-align:center;color:#999; font-size:28rpx;height:80rpx;line-height:80rpx;
+				&.actived,.selected {
+					font-weight:bold;
+					position: relative;
+					color: #333;
+					height: 80rpx;
+					line-height: 80rpx;
+					&::after {
+						content: '';position: absolute;left: 50%;bottom: 10rpx;width:42rpx;height: 6rpx;transform: translateX(-50%);background: #0A5D3B;border-radius: 4rpx;
+					}
+				}
+			}
+			.nav-paili1 .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+			.nav-paili1 .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+
+		}
+		.head_nav{
+			margin-bottom: 20rpx;
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			.item{
+				color: #333;
+			}
+			.itemz{
+				color: #f0bd71;
+				font-size: 34rpx;
+				font-weight: bold;
+			}
+		}
+		
+	}
+	.pages-hd {
+		background: #FFF;
+		&__search {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 12rpx 24rpx 10rpx;
+			// #ifdef H5
+			padding: 28rpx 24rpx 10rpx;
+			// #endif
+			.left {
+				margin-right: 16rpx;
+				.l_top {
+					color: #333;
+					display: flex;
+					align-items: center;
+					background: #F7F7F7;
+					height: 72rpx;
+					border-radius: 36rpx;
+					padding: 0 20rpx;
+					flex-shrink: 0;
+					width: 274rpx;
+	
+					.txt {
+						font-weight: 28rpx;
+						max-width: 100%;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						margin: 0 20rpx;
+					}
+					.iconfont {
+						color: #333333;
+						font-weight: 600;
+					}
+					.icon-dianpu1 {
+						font-size: 32rpx;
+					}
+					.icon-shang {
+						font-size: 22rpx;
+						transform: rotate(180deg);
+					}
+				}
+			}
+		}
+		&__shop {
+			padding: 22rpx 24rpx 10rpx;
+			.shop-name {
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+				line-height: 44rpx;
+				.iconfont {
+					font-size: 36rpx;
+					line-height: 44rpx;
+				}
+			}
+			.shop-distance {
+				font-size: 26rpx;
+				color: #999999;
+				line-height: 36rpx;
+				margin-top: 12rpx;
+				.iconfont {
+					font-size: 28rpx;
+					margin-right: 6rpx;
+				}
+			}
+		}
+	}
+
+	page {
+		height: 100%;
+	}
+
+	.container {
+		width: 100%;
+		height: 100%;
+		color: #f5f5f5;
+		display: flex;
+		flex-direction: column
+	}
+.product-box {
+  .product-item {
+    width: 340rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+		margin-bottom: 24rpx;
+    &__hd {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+    }
+
+    .product-img {
+      width: 100%rpx;
+      height: 260rpx;
+    }
+    .item-info {
+      padding: 24rpx 20rpx;
+      width: 100%;
+			&__name {
+				font-size: 26rpx;
+				font-weight: bold;
+				color: #333333;
+				line-height: 36rpx;
+				height: 72rpx;
+			}
+			&__salse {
+				margin-top: 10rpx;
+				font-size: 20rpx;
+				color: #999999;
+				line-height: 22rpx;
+			}
+			&__price {
+				margin-top: 4rpx;
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #ED5925;
+				line-height:50rpx;
+				.symbol {
+					font-size: 24rpx;
+					line-height: 34rpx;
+				}
+			}
+			&__shop {
+				margin-top: 14rpx;
+				&-bd {
+					flex: 1;
+
+				}
+				&-logo {
+					width: 50rpx;
+					height: 50rpx;
+					flex-shrink: 0;
+					border-radius: 50%;
+					margin-right: 6rpx;
+				}
+				&-name {
+					flex: 1;
+					max-width: 175rpx;
+					font-size: 22rpx;
+					color: #666666;
+					line-height: 32rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+				&-cart {
+					width:52rpx;
+					height:52rpx;
+					background: linear-gradient(to bottom,#01a664 0%,#086e45 100%);
+
+					.iconfont {
+						font-size:36rpx;
+						height: 52rpx;
+						line-height: 50rpx;
+						color: #FFFFFF;
+					}
+				}
+
+			}
+    }
+    .product-b-t {
+      padding-top: 28rpx;
+
+      .b-t1 {
+        color: #ED5925;
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 36rpx;
+        margin-left: 6rpx;
+      }
+      .car {
+        width: 54rpx;
+        height: 54rpx;
+        background: linear-gradient(to bottom,#F96648 0%,#FD4641 100%);
+
+        .icon-gouwuche1 {
+          color: #fff;
+          font-size: 36rpx;
+          line-height: 44rpx;
+          height: 48rpx;
+        }
+      }
+    }
+  }
+  .shops-cont:nth-child(2n) {
+    // margin-left: calc(100% - 680rpx);
+    margin-left: 2%;
+  }
+  .shops-cont:nth-child(n + 3) {
+    margin-top: 20rpx;
+  }
+}
+	.navigation {
+		box-sizing: content-box;
+		.icon-icon_arrow_left {
+			font-size: 45rpx;
+			color: #000000;
+		}
+		&-title {
+			flex: 1;
+			padding-right: 44rpx;
+			text-align: center;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 50rpx;
+		}
+	}
+
+	.search-container {
+		width: 100%;
+		height: 72rpx;
+	}
+
+	.search-box {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 100%;
+		border-radius: 36rpx;
+		border: 0;
+		background-color: #F7F7F7;
+		flex: 1
+	}
+
+	.search-box .img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 16rpx;
+		margin-left: 20rpx
+	}
+
+	.search-box .search-text {
+		font-size: 28rpx;
+		color: #C2C2C2;
+		width: 100%;
+	}
+
+	.content-container {
+		flex: 1;
+		height: 100%;
+		display: flex;
+		overflow: hidden;
+	}
+
+	.nav_left {
+		width: 176rpx;
+		height: 100%;
+		background: #F5F5F5;
+		overflow-y: scroll;
+		&_items {
+			width: 100%;
+			text-align: center;
+			color: #666666;
+			font-size: 28rpx;
+			line-height: 108rpx;
+			&.active {
+				position: relative;
+				background: #fff;
+				color: #333333;
+				font-size: 28rpx;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+				font-weight: bold;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				position: relative;
+				&::before {
+					content: "";
+					position: absolute;
+					left: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					width: 6rpx;
+					height: 46rpx;
+					border-radius: 6rpx;
+					background: #0A5D3B;
+				}
+			}
+		}
+	}
+
+	.nav_right {
+		flex: 1;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		background: #FFFFFF;
+		box-sizing: border-box;
+		padding: 20rpx 20rpx 0 20rpx;
+		&-scroll {
+			width: 100%;
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+		}
+	}
+
+	.nav_right-content {
+		background: #ffffff;
+		padding-right: 20rpx;
+		height: 100%
+	}
+
+	.nav-paili {
+		display: inline-block;
+		margin: 0 10rpx 20rpx 0;
+		min-width: 96rpx;
+		box-sizing: border-box;
+		padding: 0 22rpx;
+		border-radius: 54rpx;
+		background: #F7F7F7;
+		height: 54rpx;
+		line-height: 54rpx;
+		color: #666;
+		font-size: 24rpx;
+		text-align: center;
+	}
+
+	.nav-pailiz {
+		background: #E2F7EF;
+		color: #0A5D3B;
+		font-weight: bold;
+	}
+
+	.nav-paili .iconshangla {
+		position: absolute;
+		top: -4rpx;
+		padding: 0 6rpx;
+		font-size: 20rpx;
+		color: #7D7D7D
+	}
+
+	.nav-paili .icondaoxu {
+		position: absolute;
+		top: 8rpx;
+		padding: 0 6rpx;
+		font-size: 20rpx;
+		color: #7D7D7D
+	}
+
+	.classify-ul {
+		width: 100%;
+		height: 100rpx;
+		padding: 0 10rpx;
+	}
+
+	.classify-li {
+		flex-shrink: 0;
+		display: flex;
+		background: #F5F6F8;
+		border-radius: 22rpx;
+		color: #6C737F;
+		font-size: 20rpx;
+		text-align: center;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 0 28rpx;
+		margin: 12rpx 10rpx 12rpx 0
+	}
+
+	.classify-box {
+		width: 100%;
+		height: calc(100%);
+		overflow-y: scroll;
+		& ::-webkit-scrollbar {
+			display: none;
+		}
+	}
+
+	.classify-box .nav_right_items {
+		width: 100%;
+		border-bottom: 1px #f4f4f4 solid;
+		padding: 16rpx 0;
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.product-itemlist {
+		height: auto;
+		position: relative;
+		overflow: hidden;
+		padding: 0px;
+		display: flex;
+		flex-wrap: wrap
+	}
+
+	.product-itemlist .item {
+		width: 100%;
+		display: inline-block;
+		position: relative;
+		margin-bottom: 12rpx;
+		background: #fff;
+		display: flex;
+		padding: 14rpx 0;
+		border-radius: 10rpx;
+		border-bottom: 1px solid #F4F4F4;
+	}
+
+	.product-itemlist .product-pic {
+		width: 180rpx;
+		overflow: hidden;
+		background: #ffffff;
+		border-radius: 4px;
+	}
+
+	.product-itemlist .product-pic .image {
+		width: 100%;
+	}
+	.product-itemlist .product-info {
+		flex-direction: column;
+		flex: 1;
+		padding: 0 10rpx 5rpx 20rpx;
+		&__name {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 36rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			/* autoprefixer: ignore next */
+			-webkit-box-orient: vertical;
+			text-align: justify;
+			white-space: pre-wrap;
+			word-break: break-all;
+		}
+		&__price {
+			.current-price {
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #ED5925;
+				line-height: 36rpx;
+			}
+			.original-price {
+				margin-left: 10rpx;
+				font-size: 24rpx;
+				color: #aaa;
+				text-decoration: line-through;
+			}
+			.symbol {
+				font-size: 22rpx;
+			}
+		}
+		.icon-jiahao {
+			color: #068150;
+			font-size: 45rpx;
+		}
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+</style>
diff --git a/pages/shop/commentlist.vue b/pages/shop/commentlist.vue
new file mode 100644
index 0000000..5002b0e
--- /dev/null
+++ b/pages/shop/commentlist.vue
@@ -0,0 +1,162 @@
+<template>
+<view class="container">
+	<view class="head_box">
+		<view class="item" :class="{'itemz':type === 0}" @click="headChange(0)">
+			全部
+		</view>
+		<view class="item" :class="{'itemz':type === 1}" @click="headChange(1)">
+			图片
+		</view>
+		<view class="item" :class="{'itemz':type === 2}" @click="headChange(2)">
+			文字
+		</view>
+	</view>
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="top_box" style="display: flex; align-items: center; justify-content: space-between;">
+				<view class="f1" style="display: flex; width: auto;">
+					<image class="t1" :src="item.headimg"/>
+					<view>
+						<view class="t2">{{item.nickname}}</view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+					</view>
+				</view>
+				<view class="time" style="color: #c2c2c2;">
+					{{item.createtime}}
+				</view>
+			</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" />
+							</view>
+						</block>
+					</block>
+				</view>
+				<text class="t3">规格：{{item.ggname}}</text>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		type:0,
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+	  headChange(e){
+		  this.type = e;
+		  this.getdata()
+	  },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiShop/commentlist', {type:this.type,proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style lang="scss">
+	
+	.head_box{
+		display: flex;
+		padding: 20rpx 40rpx;
+		// justify-content: space-between;
+		.item{
+			margin-right: 30rpx;
+			color: #999999;
+		}
+		.itemz{
+			font-weight: bold;
+			color: #0A5D3B;
+		}
+	}
+.container{background:#f6f6f6}
+.comment{display:flex;flex-direction:column;padding:10rpx 20rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx; margin-bottom: 20rpx; border-radius: 10rpx; box-shadow: 0 0 0 10rpx 0 #ccc; display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx; margin-bottom: 10rpx;}
+.comment .item .f2 .t2{display:flex;width:100%; margin-bottom: 10rpx;}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/pages/shop/fastbuy.vue b/pages/shop/fastbuy.vue
new file mode 100644
index 0000000..0be5ca5
--- /dev/null
+++ b/pages/shop/fastbuy.vue
@@ -0,0 +1,296 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="view-show">
+			<view @tap.stop="goto" :data-url="'/pages/shop/search?bid='+bid" class="search-container">
+				<view class="search-box">
+					<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+					<view class="search-text">搜索感兴趣的商品</view>
+				</view>
+			</view>
+			<view class="content" style="overflow:hidden;display:flex" :style="{height:'calc(100% - '+(menuindex>-1?294:194)+'rpx)'}">
+				<scroll-view class="nav_left" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+					<block v-for="(item, index) in datalist" :key="index" >
+					<view class="nav_left_items" :class="index===currentActiveIndex?'active':''" @tap="clickRootItem" :data-root-item-id="item.id" :data-root-item-index="index"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+					</block>
+				</scroll-view>
+				<view class="nav_right">
+					<view class="nav_right-content">
+						<scroll-view @scroll="scroll" class="detail-list" :scrollIntoView="scrollToViewId" :scrollWithAnimation="animation" scroll-y="true" :show-scrollbar="false">
+							<view v-for="(detail, index) in datalist" :key="index" class="classification-detail-item">
+								<view class="head" :data-id="detail.id" :id="'detail-' + detail.id">
+									<view class="txt">{{detail.name}}</view>
+									<view class="show-all" @tap="gotoCatproductPage" :data-id="detail.id">查看全部<text class="iconfont iconjiantou"></text></view>
+								</view>
+								<view class="product-itemlist">
+									<view class="item" v-for="(item,index) in detail.prolist" :key="item.id" @click="goto" :data-url="'/pages/shop/product?id='+item.id">
+										<view class="product-pic">
+											<image class="image" :src="item.pic" mode="widthFix"/>
+										</view>
+										<view class="product-info">
+											<view class="p1"><text>{{item.name}}</text></view>
+											<view class="p2">
+												<text class="t1" :style="{color:t('color1')}"><text style="font-size:20rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+												<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+											</view>
+											<view class="p3">
+												<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+												<view class="p3-2" v-if="item.limit_start>0"><text style="overflow:hidden;">{{item.limit_start}}件起售</text></view>
+											</view>
+											<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" @click.stop="buydialogChange" :data-proid="item.id"><text class="iconfont icon_gouwuche"></text></view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" @addcart="afteraddcart" :menuindex="menuindex" btntype="1" :needaddcart="false"></buydialog>
+		<view style="height:auto;position:relative">
+			<view style="width:100%;height:100rpx"></view>
+			<view class="footer flex" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+				<view class="cart_ico" :style="{background:'linear-gradient(0deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap.stop="handleClickMask"><image class="img" :src="event_rul +'/static/img/static/img/cart.png'"/><view class="cartnum" :style="{background:t('color1')}" v-if="cartList.total>0">{{cartList.total}}</view></view>
+				<view class="text1">合计</view>
+				<view class="text2 flex1" :style="{color:t('color1')}"><text style="font-size:20rpx">￥</text>{{cartList.totalprice}}</view>
+				<view class="op" :style="{background:'linear-gradient(270deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="gopay">去结算</view>
+			</view>
+		</view>
+
+		<view v-if="cartListShow" class="popup__container" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+			<view class="popup__overlay" @tap.stop="handleClickMask" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':'notabbarbot'"></view>
+			<view class="popup__modal" style="min-height:400rpx;padding:0">
+				<view class="popup__title" style="border-bottom:1px solid #EFEFEF">
+					<text class="popup__title-text" style="color:#323232;font-weight:bold;font-size:32rpx">购物车</text>
+					<view class="popup__close flex-y-center" @tap.stop="clearShopCartFn" style="color:#999999;font-size:24rpx"><image :src="event_rul +'/static/img/static/img/del.png'" style="width:24rpx;height:24rpx;margin-right:6rpx"/>清空</view>
+				</view>
+				<view class="popup__content" style="padding:0">
+					<scroll-view scroll-y class="prolist">
+						<block v-for="(cart, index) in cartList.list" :key="index">
+							<view class="proitem">
+								<image :src="cart.guige.pic?cart.guige.pic:cart.product.pic" class="pic flex0"></image>
+								<view class="con">
+									<view class="f1">{{cart.product.name}}</view>
+									<view class="f2" v-if="cart.guige.name!='默认规格'">{{cart.guige.name}}</view>
+									<view class="f3" style="color:#ff5555;margin-top:10rpx;font-size:28rpx">￥{{cart.guige.sell_price}}</view>
+								</view>
+								<view class="addnum">
+									<view class="minus"><image class="img" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="addcart" data-num="-1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+									<text class="i">{{cart.num}}</text>
+									<view class="plus"><image class="img" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="addcart" data-num="1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+								</view>
+							</view>
+						</block>
+						<block v-if="!cartList.list.length">
+							<text class="nopro">暂时没有商品喔~</text>
+						</block>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		cartListShow:false,
+		buydialogShow:false,
+		harr:[],
+		datalist: [],
+		cartList:{},
+		proid:'',
+		totalprice:'0.00',
+		currentActiveIndex: 0,
+		animation: true,
+		scrollToViewId: "",
+		bid:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid ? this.opt.bid  : '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var bid = that.opt.bid ? that.opt.bid : 0;
+			that.loading = true;
+			app.get('ApiShop/fastbuy', {bid:bid}, function (res) {
+				that.loading = false;
+				that.datalist = res.data;
+				that.cartList = res.cartList;
+
+				//计算每个高度
+				var harr = [];
+				var clientwidth = uni.getSystemInfoSync().windowWidth;
+				var datalist = res.data;
+				console.log(datalist.length)
+				for (var i = 0; i < datalist.length; i++) {
+					var child = datalist[i].prolist;
+					console.log(child)
+					harr.push(Math.ceil(child.length) * 200 / 750 * clientwidth);
+				}
+				that.harr = harr;
+				that.loaded();
+			});
+		},
+    clickRootItem: function (t) {
+      var e = t.currentTarget.dataset;
+      this.scrollToViewId = 'detail-' + e.rootItemId;
+      this.currentActiveIndex = e.rootItemIndex;
+    },
+		addcart:function(e){
+			var that = this;
+			var ks = that.ks;
+			var num = e.currentTarget.dataset.num;
+			var proid = e.currentTarget.dataset.proid;
+			var ggid = e.currentTarget.dataset.ggid;
+			that.loading = true;
+			app.post('ApiShop/addcart', {proid: proid,ggid: ggid,num: num}, function (res) {
+				that.loading = false;
+				if (res.status == 1) {
+					that.getdata();
+				} else {
+					app.error(res.msg);
+				}
+			});
+		},
+    //加入购物车弹窗后
+    afteraddcart: function (e) {
+			e.hasoption = false;
+			console.log('111');
+      this.addcart({currentTarget:{dataset:e}});
+    },
+    clearShopCartFn: function () {
+      var that = this;
+      app.post("ApiShop/cartclear", {bid:that.opt.bid}, function (res) {
+        that.getdata();
+      });
+    },
+    gopay: function () {
+      var cartList = this.cartList.list;
+      if (cartList.length == 0) {
+        app.alert('请先添加商品到购物车');
+        return;
+      }
+      var prodata = [];
+      for (var i = 0; i < cartList.length; i++) {
+        prodata.push(cartList[i].proid + ',' + cartList[i].ggid + ',' + cartList[i].num);
+      }
+      app.goto('buy?frompage=fastbuy&prodata=' + prodata.join('-'));
+    },
+    gotoCatproductPage: function (t) {
+      var e = t.currentTarget.dataset;
+			if(this.bid){
+				app.goto('/pages/shop/prolist?bid='+this.bid+'&cid2=' + e.id);
+			}else{
+				app.goto('/pages/shop/prolist?cid=' + e.id);
+			}
+    },
+    scroll: function (e) {
+      var scrollTop = e.detail.scrollTop;
+      var harr = this.harr;
+      var countH = 0;
+      for (var i = 0; i < harr.length; i++) {
+        if (scrollTop >= countH && scrollTop < countH + harr[i]) {
+          this.currentActiveIndex = i;
+          break;
+        }
+        countH += harr[i];
+      }
+    },
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+		handleClickMask:function(){
+			this.cartListShow = !this.cartListShow;
+		}
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+.container{height:100%;overflow:hidden}
+.view-show{background-color: white;line-height: 1;width: 100%;height: 100%;}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 20rpx 20rpx}
+.nav_right-content{background: #ffffff;padding:20rpx;height:100%;position:relative}
+.detail-list {height:100%;overflow:scroll}
+.classification-detail-item {width: 100%;overflow: visible;background:#fff}
+.classification-detail-item .head {height: 82rpx;width: 100%;display: flex;align-items:center;justify-content:space-between;}
+.classification-detail-item .head .txt {color:#222222;font-weight:bold;font-size:28rpx;}
+.classification-detail-item .head .show-all {font-size: 22rpx;color:#949494;display:flex;align-items:center}
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:14rpx 0;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:60rpx}
+.product-itemlist .product-info .p2{margin-top:10rpx;height:36rpx;line-height:36rpx;overflow:hidden;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999;margin-right:10rpx}
+.product-itemlist .product-info .p3-2{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#777}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+
+.prolist {max-height: 620rpx;min-height: 320rpx;overflow: hidden;padding:0rpx 20rpx;font-size: 28rpx;border-bottom: 1px solid #e6e6e6;}
+.prolist .nopro {text-align: center;font-size: 26rpx;display: block;margin: 80rpx auto;}
+.prolist .proitem{position: relative;padding:10rpx 0;display:flex;border-bottom:1px solid #eee}
+.prolist .proitem .pic{width: 120rpx;height: 120rpx;margin-right: 20rpx;}
+.prolist .proitem .con{padding-right:180rpx;padding-top:10rpx}
+.prolist .proitem .con .f1{color:#323232;font-size:26rpx;line-height:32rpx;margin-bottom: 10rpx;margin-top: -6rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+.prolist .proitem .con .f2{font-size: 24rpx;line-height:28rpx;color: #999;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;}
+.prolist .proitem .addnum {position: absolute;right: 20rpx;bottom:50rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.prolist .proitem .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .img{width:24rpx;height:24rpx}
+.prolist .proitem .addnum .i {padding: 0 20rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx}
+.prolist .tips {font-size: 22rpx;color: #666;text-align: center;line-height: 56rpx;background: #f5f5f5;}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;z-index:8;display:flex;align-items:center;padding:0 20rpx;border-top:1px solid #EFEFEF}
+.footer .cart_ico{width:64rpx;height:64rpx;border-radius: 10rpx;display:flex;align-items:center;justify-content:center;position:relative}
+.footer .cart_ico .img{width:36rpx;height:36rpx;}
+.footer .cart_ico .cartnum{position:absolute;top:-17rpx;right:-17rpx;width:34rpx;height:34rpx;border:1px solid #fff;border-radius:50%;display:flex;align-items:center;justify-content:center;overflow:hidden;font-size:20rpx;font-weight:bold;color:#fff}
+.footer .text1 {height: 100rpx;line-height: 100rpx;color:#555555;font-weight:bold;font-size: 30rpx;margin-left:40rpx;margin-right:10rpx}
+.footer .text2 {font-size: 32rpx;font-weight:bold}
+.footer .op{width: 200rpx;height: 72rpx;line-height:72rpx;border-radius: 36rpx;font-weight:bold;color:#fff;font-size:28rpx;text-align:center}
+::-webkit-scrollbar{width: 0;height: 0;color: transparent;}
+</style>
\ No newline at end of file
diff --git a/pages/shop/fastbuy2.vue b/pages/shop/fastbuy2.vue
new file mode 100644
index 0000000..dcf240d
--- /dev/null
+++ b/pages/shop/fastbuy2.vue
@@ -0,0 +1,542 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="view-show">
+			<view class="topbannerbg" :style="business.pic?'background:url('+business.pic+') 100%':''"></view>
+			<view class="topbannerbg2"></view>
+			<view class="topbanner">
+				<view class="left"><image class="img" :src="business.logo"/></view>
+				<view class="right">
+					<view class="f1">{{business.name}}</view>
+					<view class="f2">{{business.desc}}</view>
+					<view class="f2" style="opacity:0.9" v-if="business.address" @tap="openLocation" :data-latitude="business.latitude" :data-longitude="business.longitude" :data-company="business.name" :data-address="business.address"><text class="iconfont icondingwei"></text>{{business.address}}</view>
+					<!-- <view class="f3"><view class="flex1"></view><view class="t2">收藏<image class="img" :src="event_rul +'/static/img/static/restaurant/like1.png'"/></view></view> -->
+				</view>
+			</view>
+			<view class="navtab">
+				<block v-if="paylist && paylist.length > 0">
+				<block v-for="(item, index) in menuList" :key="index">
+					<view :class="'item ' + (st == item.st ? 'on' : '')" @tap="changetab" :data-st="item.st">{{item.alias ? item.alias : item.name}}<view class="after" :style="{background:t('color1')}"></view></view>
+				</block>
+					<!-- <view class="item" :class="st==0?'on':''" @tap="changetab" data-st="0">商品<view class="after" :style="{background:t('color1')}"></view></view>
+					<view class="item" :class="st==1?'on':''" @tap="changetab" data-st="1">商家信息<view class="after" :style="{background:t('color1')}"></view></view>
+					<view class="item" :class="st==3?'on':''" @tap="changetab" data-st="3" v-if="paylist && paylist.length > 0">会员支付<view class="after" :style="{background:t('color1')}"></view></view> -->
+				</block>
+				<block v-else>
+					<view class="item" :class="st==0?'on':''" @tap="changetab" data-st="0">商品<view class="after" :style="{background:t('color1')}"></view></view>
+					<view class="item" :class="st==1?'on':''" @tap="changetab" data-st="1">商家信息<view class="after" :style="{background:t('color1')}"></view></view>
+					<view class="item" :class="st==2?'on':''" @tap="changetab" data-st="2" v-if="!paylist || paylist.length == 0">评价<view class="after" :style="{background:t('color1')}"></view></view>
+				</block>
+			</view>
+			<view v-if="st==0" class="content" style="overflow:hidden;display:flex;margin-top:86rpx" :style="{height:'calc(100% - '+(menuindex>-1?460:360)+'rpx)'}">
+				<scroll-view class="nav_left" :scrollWithAnimation="animation" scroll-y="true">
+					<block v-for="(item, index) in datalist" :key="index" >
+					<view class="nav_left_items" :class="index===currentActiveIndex?'active':''" @tap="clickRootItem" :data-root-item-id="item.id" :data-root-item-index="index"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+					</block>
+				</scroll-view>
+				<view class="nav_right">
+					<view class="nav_right-content">
+						<scroll-view @scroll="scroll" class="detail-list" :scrollIntoView="scrollToViewId" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+							<view v-for="(detail, index) in datalist" :key="index" class="classification-detail-item">
+								<view class="head" :data-id="detail.id" :id="'detail-' + detail.id">
+									<view class="txt">{{detail.name}}</view>
+									<!-- <view class="show-all" @tap="gotoCatproductPage">查看全部<text class="iconfont iconjiantou"></text></view> -->
+								</view>
+								<view class="product-itemlist">
+									<view class="item" v-for="(item,index) in detail.prolist" :key="item.id">
+										<view class="product-pic" @click="goto" :data-url="'product?id='+item.id">
+											<image class="image" :src="item.pic" mode="widthFix"/>
+										</view>
+										<view class="product-info">
+											<view class="p1"><text>{{item.name}}</text></view>
+											<view class="p2">
+												<text class="t1" :style="{color:t('color1')}"><text style="font-size:20rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+												<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+											</view>
+											<view class="p3">
+												<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+											</view>
+											<!-- <view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" @click.stop="buydialogChange" :data-proid="item.id"><text class="iconfont icon_gouwuche"></text></view> -->
+											<view class="addnum">
+												<view v-if="numtotal[item.id]>0" class="minus" @tap.stop="addcart" data-num="-1" :data-proid="item.id" :data-stock="item.stock">-</view>
+												<text v-if="numtotal[item.id]>0" class="i">{{numtotal[item.id]}}</text>
+												<view v-if="item.ggcount>1" class="plus" @tap.stop="buydialogChange" :data-proid="item.id" :data-stock="item.stock">+</view>
+												<view v-else class="plus" @tap.stop="addcart" data-num="1" :data-proid="item.id" :data-ggid="item.gglist[0].id" :data-stock="item.stock">+</view>
+											</view>
+
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+			<view v-if="st==1" class="content1" style="margin-top:86rpx;padding-top:20rpx">
+				<view class="item flex-col">
+					<text class="t1">联系电话</text>
+					<text class="t2">{{business.tel}}</text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">商家地址</text>
+					<text class="t2">{{business.address}}</text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">商家简介</text>
+					<text class="t2">{{business.content}}</text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">营业时间</text>
+					<text class="t2">{{business.start_hours}} 至 {{business.end_hours}}</text>
+				</view>
+
+				
+			</view>
+			<view v-if="st==2" class="content2" style="margin-top:86rpx;padding-top:20rpx">
+				<view class="comment" style="height:calc(100vh - 460rpx);overflow:scroll">
+					<block v-if="commentlist.length>0">
+						
+						<view class="title">
+							<view class="f1">评价({{business.comment_num}})</view>
+							<view class="f2" @tap="goto">好评率 <text :style="{color:t('color1')}">{{business.comment_haopercent}}%</text></view>
+						</view>
+						<view v-for="(item, index) in commentlist" :key="index" class="item">
+							<view class="f1">
+								<image class="t1" :src="item.headimg"/>
+								<view class="t2">{{item.nickname}}</view>
+								<view class="flex1"></view>
+								<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+							</view>
+							<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+							<view class="f2">
+								<text class="t1">{{item.content}}</text>
+								<view class="t2">
+									<block v-if="item.content_pic!=''">
+										<block v-for="(itemp, index) in item.content_pic" :key="index">
+											<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+												<image :src="itemp" mode="widthFix"/>
+											</view>
+										</block>
+									</block>
+								</view>
+							</view>
+							<view class="f3" v-if="item.reply_content">
+								<view class="arrow"></view>
+								<view class="t1">商家回复：{{item.reply_content}}</view>
+							</view>
+						</view>
+					</block>
+					<block v-else>
+						<nodata v-show="comment_nodata"></nodata>
+					</block>
+				</view>
+			</view>
+			<view v-if="st==3" class="content2" style="margin-top:86rpx;padding-top:20rpx">
+				<view class="paylist" style="height:calc(100vh - 460rpx);overflow:scroll">
+					<view class="item" v-for="(item,index) in paylist" @click="createpayorder" :data-id="item.id">
+						<view class="f1">
+							<image class="image" :src="item.pic" mode="widthFix"/>
+						</view>
+						<view class="f2">
+							<view class="t1"><text>{{item.name}}</text></view>
+							<view class="t2" :style="{color:t('color1')}">￥{{item.market_price}}<text style="padding:0 4rpx">/</text><text style="font-size:24rpx">会员价￥</text>{{item.sell_price}}</view>
+						</view>
+						<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="arrowright"/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" @addcart="afteraddcart" :menuindex="menuindex" btntype="1" :needaddcart="false"></buydialog>
+		<view style="height:auto;position:relative">
+			<view style="width:100%;height:100rpx"></view>
+			<view class="footer flex" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+				<view class="cart_ico" :style="{background:'linear-gradient(0deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap.stop="handleClickMask"><image class="img" :src="event_rul +'/static/img/static/img/cart.png'"/><view class="cartnum" :style="{background:t('color1')}" v-if="cartList.total>0">{{cartList.total}}</view></view>
+				<view class="text1">合计</view>
+				<view class="text2" :style="{color:t('color1')}"><text style="font-size:20rpx">￥</text>{{cartList.totalprice}}</view>
+				<view class="flex1"></view>
+				<view class="op" :style="{background:'linear-gradient(270deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="gopay">去结算</view>
+			</view>
+		</view>
+
+		<view v-if="cartListShow" class="popup__container" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+			<view class="popup__overlay" @tap.stop="handleClickMask" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':'notabbarbot'"></view>
+			<view class="popup__modal" style="min-height:400rpx;padding:0">
+				<view class="popup__title" style="border-bottom:1px solid #EFEFEF">
+					<text class="popup__title-text" style="color:#323232;font-weight:bold;font-size:32rpx">购物车</text>
+					<view class="popup__close flex-y-center" @tap.stop="clearShopCartFn" style="color:#999999;font-size:24rpx"><image :src="event_rul +'/static/img/static/img/del.png'" style="width:24rpx;height:24rpx;margin-right:6rpx"/>清空</view>
+				</view>
+				<view class="popup__content" style="padding:0">
+					<scroll-view scroll-y class="prolist">
+						<block v-for="(cart, index) in cartList.list" :key="index">
+							<view class="proitem">
+								<image :src="cart.guige.pic?cart.guige.pic:cart.product.pic" class="pic flex0"></image>
+								<view class="con">
+									<view class="f1">{{cart.product.name}}</view>
+									<view class="f2" v-if="cart.guige.name!='默认规格'">{{cart.guige.name}}</view>
+									<view class="f3" style="color:#ff5555;margin-top:10rpx;font-size:28rpx">￥{{cart.guige.sell_price}}</view>
+								</view>
+								<view class="addnum">
+									<view class="minus"><image class="img" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="addcart" data-num="-1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+									<text class="i">{{cart.num}}</text>
+									<view class="plus"><image class="img" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="addcart" data-num="1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+								</view>
+							</view>
+						</block>
+						<block v-if="!cartList.list.length">
+							<text class="nopro">暂时没有商品喔~</text>
+						</block>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st:0,
+		cartListShow:false,
+		buydialogShow:false,
+		harr:[],
+		business:{},
+		datalist: [],
+		menuList:[],
+		cartList:{},
+		numtotal:[],
+		proid:'',
+		totalprice:'0.00',
+		currentActiveIndex: 0,
+		animation: true,
+		scrollToViewId: "",
+		commentlist:[],
+		comment_nodata:false,
+		comment_nomore:false,
+		paylist:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onReachBottom: function () {
+		if (this.st == 2) {
+			if (!this.comment_nodata && !this.comment_nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getCommentList(true);
+			}
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiShop/fastbuy2', {bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				that.business = res.business
+				that.datalist = res.data;
+				that.cartList = res.cartList;
+				that.menuList = res.menuList;
+				that.numtotal = res.numtotal;
+				that.paylist = res.paylist;
+				uni.setNavigationBarTitle({
+					title: that.business.name
+				});
+				
+				if(that.menuList.length > 0) {
+					that.st = that.menuList[0].st;
+				}
+
+				//计算每个高度
+				var harr = [];
+				var clientwidth = uni.getSystemInfoSync().windowWidth;
+				var datalist = res.data;
+				console.log(datalist.length)
+				for (var i = 0; i < datalist.length; i++) {
+					var child = datalist[i].prolist;
+					console.log(child)
+					harr.push(Math.ceil(child.length) * 200 / 750 * clientwidth);
+				}
+				that.harr = harr;
+				that.loaded();
+			});
+		},
+		changetab:function(e){
+			this.st = e.currentTarget.dataset.st;
+			this.pagenum = 1;
+			this.commentlist = [];
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+			this.getCommentList();
+		},
+		getCommentList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.commentlist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var st = that.st;
+			that.loading = true;
+			that.comment_nodata = false;
+			that.comment_nomore = false;
+			app.post('ApiBusiness/getdatalist', {id: that.business.id,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.commentlist = data;
+          if (data.length == 0) {
+            that.comment_nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.comment_nomore = true;
+          } else {
+            var commentlist = that.commentlist;
+            var newdata = commentlist.concat(data);
+            that.commentlist = newdata;
+          }
+        }
+      });
+		},
+    clickRootItem: function (t) {
+      var e = t.currentTarget.dataset;
+      this.scrollToViewId = 'detail-' + e.rootItemId;
+      this.currentActiveIndex = e.rootItemIndex;
+    },
+		addcart:function(e){
+			var that = this;
+			var ks = that.ks;
+			var num = e.currentTarget.dataset.num;
+			var proid = e.currentTarget.dataset.proid;
+			var ggid = e.currentTarget.dataset.ggid;
+			that.loading = true;
+			app.post('ApiShop/addcart', {proid: proid,ggid: ggid,num: num}, function (res) {
+				that.loading = false;
+				if (res.status == 1) {
+					that.getdata();
+				} else {
+					app.error(res.msg);
+				}
+			});
+		},
+    //加入购物车弹窗后
+    afteraddcart: function (e) {
+			e.hasoption = false;
+			console.log('111');
+      this.addcart({currentTarget:{dataset:e}});
+    },
+    clearShopCartFn: function () {
+      var that = this;
+      app.post("ApiShop/cartclear", {bid:that.opt.bid}, function (res) {
+        that.getdata();
+      });
+    },
+    gopay: function () {
+      var cartList = this.cartList.list;
+      if (cartList.length == 0) {
+        app.alert('请先添加商品到购物车');
+        return;
+      }
+      var prodata = [];
+      for (var i = 0; i < cartList.length; i++) {
+        prodata.push(cartList[i].proid + ',' + cartList[i].ggid + ',' + cartList[i].num);
+      }
+      app.goto('buy?frompage=fastbuy&prodata=' + prodata.join('-'));
+    },
+    gotoCatproductPage: function (t) {
+      var e = t.currentTarget.dataset;
+      app.goto('prolist?cid=' + e.id);
+    },
+    scroll: function (e) {
+      var scrollTop = e.detail.scrollTop;
+      var harr = this.harr;
+      var countH = 0;
+      for (var i = 0; i < harr.length; i++) {
+        if (scrollTop >= countH && scrollTop < countH + harr[i]) {
+          this.currentActiveIndex = i;
+          break;
+        }
+        countH += harr[i];
+      }
+    },
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+		handleClickMask:function(){
+			this.cartListShow = !this.cartListShow;
+		},
+		openLocation:function(e){
+			//console.log(e)
+			var latitude = parseFloat(e.currentTarget.dataset.latitude)
+			var longitude = parseFloat(e.currentTarget.dataset.longitude)
+			var address = e.currentTarget.dataset.address
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+		 })		
+		},
+		createpayorder:function(e){
+			var id = e.currentTarget.dataset.id
+			app.showLoading('提交中');
+			app.post('ApiPlugBusinessqr/createpayorder',{id:id},function(res){
+				if(res.status == 0) {
+						app.error(res.msg);
+				} else {
+					app.goto('/pages/pay/pay?id=' + res.payorderid);
+				}
+			})
+		}
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+.container{height:100%;overflow:hidden;position: relative;}
+
+.topbannerbg{width:100%;height:264rpx;background:#fff;}
+.topbannerbg2{position:absolute;z-index:7;width:100%;height:264rpx;background:rgba(0,0,0,0.7);top:0}
+.topbanner{position:absolute;z-index:8;width:100%;display:flex;padding:40rpx 20rpx;top:0}
+.topbanner .left{width:160rpx;height:160rpx;flex-shrink:0;margin-right:20rpx}
+.topbanner .left .img{width:100%;height:100%;border-radius:50%}
+.topbanner .right{display:flex;flex-direction:column;padding:20rpx 0}
+.topbanner .right .f1{font-size:36rpx;font-weight:bold;color:#fff}
+.topbanner .right .f2{font-size:22rpx;color:#fff;opacity:0.7;margin-top:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;line-height:30rpx;}
+.topbanner .right .f3{width:100%;display:flex;padding-right:20rpx;margin-top:10rpx}
+.topbanner .right .f3 .t2{display:flex;align-items:center;font-size:24rpx;color:rgba(255,255,255,0.9)}
+.topbanner .right .f3 .img{width:32rpx;height:32rpx;margin-left:10rpx}
+
+.navtab{display:flex;width:100%;height:110rpx;background: #fff;position:absolute;z-index:9;padding:0 50rpx;border-radius:24rpx 24rpx 0 0;margin-top:-24rpx;}
+.navtab .item{flex:1;font-size:32rpx; text-align:center; color:#222222; height: 110rpx; line-height: 110rpx;overflow: hidden;position:relative}
+.navtab .item .after{display:none;position:absolute;left:50%;margin-left:-20rpx;bottom:20rpx;height:4px;border-radius:2px;width:40rpx}
+.navtab .on{font-size:36rpx;font-weight:bold}
+.navtab .on .after{display:block}
+
+.content1 .item{display:flex;flex-direction:column;width:100%;padding:0 40rpx;margin-top:40rpx}
+.content1 .item:last-child{ border-bottom: 0;}
+.content1 .item .t1{width:200rpx;color:#2B2B2B;font-weight:bold;font-size:30rpx;height:60rpx;line-height:60rpx}
+.content1 .item .t2{color:#2B2B2B;font-size:24rpx;line-height:30rpx}
+
+.content2 .comment{padding:0 10rpx;overflow:scroll}
+
+.content2 .comment .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex;margin:0 3%}
+.content2 .comment .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.content2 .comment .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+
+.content2 .comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.content2 .comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.content2 .comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.content2 .comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.content2 .comment .item .f1 .t3{text-align:right;}
+.content2 .comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.content2 .comment .item .score{ font-size: 24rpx;color:#f99716;}
+.content2 .comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.content2 .comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.content2 .comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.content2 .comment .item .f2 .t2{display:flex;width:100%}
+.content2 .comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.content2 .comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.content2 .comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.content2 .comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.content2 .comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.content2 .comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+
+.view-show{background-color: white;line-height: 1;width: 100%;height: 100%;}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.nav_left{width: 25%;height:100%;background:#F6F6F6;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-22rpx;left:0rpx;height:44rpx;border-radius:4rpx;width:6rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #fff;box-sizing: border-box;padding:0 0 100rpx 0}
+.nav_right-content{background: #ffffff;padding:20rpx;height:100%;position:relative}
+.detail-list {height:100%;overflow:scroll}
+.classification-detail-item {width: 100%;overflow: visible;background:#fff}
+.classification-detail-item .head {height: 82rpx;width: 100%;display: flex;align-items:center;justify-content:space-between;}
+.classification-detail-item .head .txt {color:#222222;font-weight:bold;font-size:28rpx;}
+.classification-detail-item .head .show-all {font-size: 22rpx;color:#949494;display:flex;align-items:center}
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:14rpx 0;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:60rpx}
+.product-itemlist .product-info .p2{margin-top:10rpx;height:36rpx;line-height:36rpx;overflow:hidden;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.product-itemlist .addnum {position: absolute;right:10rpx;bottom:20rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.product-itemlist .addnum .plus {width:40rpx;height:40rpx;background:#FD4A46;color:#FFFFFF;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .minus {width:40rpx;height:40rpx;background:#FFFFFF;color:#FD4A46;border:1px solid #FD4A46;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .img{width:24rpx;height:24rpx}
+.product-itemlist .addnum .i {padding: 0 20rpx;color:#999999;font-size:28rpx}
+
+.prolist {max-height: 620rpx;min-height: 320rpx;overflow: hidden;padding:0rpx 20rpx;font-size: 28rpx;border-bottom: 1px solid #e6e6e6;}
+.prolist .nopro {text-align: center;font-size: 26rpx;display: block;margin: 80rpx auto;}
+.prolist .proitem{position: relative;padding:10rpx 0;display:flex;border-bottom:1px solid #eee}
+.prolist .proitem .pic{width: 120rpx;height: 120rpx;margin-right: 20rpx;}
+.prolist .proitem .con{padding-right:180rpx;padding-top:10rpx}
+.prolist .proitem .con .f1{color:#323232;font-size:26rpx;line-height:32rpx;margin-bottom: 10rpx;margin-top: -6rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+.prolist .proitem .con .f2{font-size: 24rpx;line-height:28rpx;color: #999;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;}
+.prolist .proitem .addnum {position: absolute;right: 20rpx;bottom:50rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.prolist .proitem .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .img{width:24rpx;height:24rpx}
+.prolist .proitem .addnum .i {padding: 0 20rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx}
+.prolist .tips {font-size: 22rpx;color: #666;text-align: center;line-height: 56rpx;background: #f5f5f5;}
+
+.paylist{padding:20rpx 30rpx;background:#f5f5f5}
+.paylist .item{width:100%;display: inline-block;position: relative;margin-bottom: 20rpx;background: #fff;display:flex;padding:0;border-radius:10rpx;border-bottom:1px solid #F8F8F8;overflow:hidden}
+.paylist .item .f1{width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.paylist .item .f1 .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.paylist .item .f2{width: 70%;padding:30rpx 20rpx 30rpx 40rpx;position: relative;}
+.paylist .item .f2 .t1 {color:#323232;font-weight:bold;font-size:40rpx;line-height:50rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:100rpx}
+.paylist .item .f2 .t2{font-size:36rpx;line-height:46rpx;}
+.paylist .item .arrowright{position:absolute;top:90rpx;right:20rpx;width:40rpx;height:40rpx}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;z-index:8;display:flex;align-items:center;padding:0 20rpx;border-top:1px solid #EFEFEF}
+.footer .cart_ico{width:64rpx;height:64rpx;border-radius: 10rpx;display:flex;align-items:center;justify-content:center;position:relative}
+.footer .cart_ico .img{width:36rpx;height:36rpx;}
+.footer .cart_ico .cartnum{position:absolute;top:-17rpx;right:-17rpx;width:34rpx;height:34rpx;border:1px solid #fff;border-radius:50%;display:flex;align-items:center;justify-content:center;overflow:hidden;font-size:20rpx;font-weight:bold;color:#fff}
+.footer .text1 {height: 100rpx;line-height: 100rpx;color:#555555;font-weight:bold;font-size: 30rpx;margin-left:40rpx;margin-right:10rpx}
+.footer .text2 {font-size: 32rpx;font-weight:bold}
+.footer .op{width: 200rpx;height: 72rpx;line-height:72rpx;border-radius: 36rpx;font-weight:bold;color:#fff;font-size:28rpx;text-align:center}
+::-webkit-scrollbar{width: 0;height: 0;color: transparent;}
+</style>
\ No newline at end of file
diff --git a/pages/shop/mendian.vue b/pages/shop/mendian.vue
new file mode 100644
index 0000000..0957cec
--- /dev/null
+++ b/pages/shop/mendian.vue
@@ -0,0 +1,178 @@
+<template>
+<view>
+	<block>
+		<view class="container nodiydata" v-if="isload">
+			<view class="bg-red" :style="{background:t('color1')}"></view>
+			<view class="topcontent">
+				<view class="logo"><image class="img" :src="info.pic"/></view>
+				<view class="title">{{info.name}}</view>
+				<view class="desc">
+					{{info.subname}}
+				</view>
+				<view class="tel" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%, rgba('+t('color1rgb')+',0.8) 100%)'}"><view @tap="phone" :data-phone="info.tel" class="tel_online"><image class="img" :src="event_rul +'/static/img/static/img/tel.png'"/>联系门店</view></view>
+				<view class="address" @tap="openLocation" :data-latitude="info.latitude" :data-longitude="info.longitude" :data-company="info.name" :data-address="info.address">
+					<image class="f1" :src="event_rul +'/static/img/static/img/shop_addr.png'"/>
+					<view class="f2">{{info.address}}</view>
+					<image class="f3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+				<view class="img-view">
+					<view v-if="pics.length>0" v-for="(item, index) in pics" :key="index">
+						<image :src="item" mode="widthFix" class="image" @tap="previewImage" :data-url="item"/>
+					</view>
+					<!-- <view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in detail.refund_pics" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+					</view> -->
+				</view>
+			</view>
+
+			<view class="contentbox" v-if="info.content">
+				<view class="cp_detail" style="padding:20rpx">
+					<rich-text :nodes="info.content"></rich-text>
+				</view>				
+			</view>
+			
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+	data() {
+		return {
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+
+			isdiy: 0,
+
+			st: 0,
+			info:{},
+			pics:[],
+			pagenum: 1,
+			datalist: [],
+			topbackhide: false,
+			nomore: false,
+			nodata:false,
+
+			title: "",
+			sysset: "",
+			pageinfo: "",
+			pagecontent: "",
+			
+			event_rul: app.globalData.event_url,
+		}
+	},
+	onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onReachBottom: function () {
+		
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.info.name});
+	},
+	onPageScroll: function (e) {
+		if (this.isdiy == 0) {
+			var that = this;
+			var scrollY = e.scrollTop;
+			if (scrollY > 200 && !that.topbackhide) {
+				that.topbackhide = true;
+			}
+			if (scrollY < 150 && that.topbackhide) {
+				that.topbackhide = false;
+			}
+		}
+	},
+	methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id || 0;
+			that.loading = true;
+			app.get('ApiShop/mendian', {id: id}, function (res) {
+				that.loading = false;
+				that.info = res.info;
+				that.pics = res.info.pics;
+				
+				that.loaded({title:that.info.name,pic:that.info.logo});
+
+				that.isload = 1;
+				uni.setNavigationBarTitle({
+					title: that.info.name
+				});
+			});
+		},
+		openLocation:function(e){
+			//console.log(e)
+			var latitude = parseFloat(e.currentTarget.dataset.latitude)
+			var longitude = parseFloat(e.currentTarget.dataset.longitude)
+			var address = e.currentTarget.dataset.address
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+		 })		
+		},
+		phone:function(e) {
+			var phone = e.currentTarget.dataset.phone;
+			uni.makePhoneCall({
+				phoneNumber: phone,
+				fail: function () {
+				}
+			});
+		},
+	}
+}
+</script>
+<style>
+.container{position:relative}
+.nodiydata{display:flex;flex-direction:column}
+.bg-red { background-color:#f32e28; height: 300rpx;}
+.nodiydata .swiper {width: 100%;height: 400rpx;position:relative;z-index:1}
+.nodiydata .swiper .image {width: 100%;height: 400rpx;overflow: hidden;}
+
+.nodiydata .topcontent{width:96%;margin:-120rpx 2% 20rpx ;padding: 24rpx; border-bottom:1px solid #eee; background: #fff;display:flex;flex-direction:column;align-items:center;border-radius:16rpx;position:relative;z-index:2;}
+.nodiydata .topcontent .logo{margin-top: -100rpx;width:160rpx;height:160rpx;border:2px solid rgba(255,255,255,0.5);border-radius:50%;}
+.nodiydata .topcontent .logo .img{width:100%;height:100%;border-radius:50%;}
+
+.nodiydata .topcontent .title {color:#222222;font-size:36rpx;font-weight:bold;margin-top:12rpx}
+.nodiydata .topcontent .desc {display:flex;align-items:center; margin: 10rpx 0;}
+.nodiydata .topcontent .tel{font-size:26rpx;color:#fff; padding:12rpx 28rpx; border-radius: 10rpx; font-weight: normal }
+.nodiydata .topcontent .tel .img{ width: 28rpx;height: 28rpx; vertical-align: middle;margin-right: 10rpx}
+.nodiydata .topcontent .address{width:100%;display:flex;align-items:center;margin-top:20rpx;margin-bottom:20rpx;padding-top:20rpx}
+.nodiydata .topcontent .address .f1{width:28rpx;height:28rpx;margin-right:8rpx}
+.nodiydata .topcontent .address .f2{flex:1;color:#999999;font-size:26rpx}
+.nodiydata .topcontent .address .f3{display: inline-block; width:26rpx; height: 26rpx}
+.img-view { display: flex; margin-top: 20rpx; flex-wrap:wrap; flex-direction: row; width: 100%;}
+.img-view view { width: 33%; text-align: center;}
+.img-view .image { width: 96%;}
+
+.nodiydata .contentbox{width:96%;margin-left:2%;background: #fff;border-radius:16rpx;margin-bottom:32rpx;overflow:hidden}
+
+.nodiydata .shop_tab{display:flex;width: 100%;height:90rpx;border-bottom:1px solid #eee;}
+.nodiydata .shop_tab .cptab_text{flex:1;text-align:center;color:#646566;height:90rpx;line-height:90rpx;position:relative}
+.nodiydata .shop_tab .cptab_current{color: #323233;}
+.nodiydata .shop_tab .after{display:none;position:absolute;left:50%;margin-left:-16rpx;bottom:10rpx;height:3px;border-radius:1.5px;width:32rpx}
+.nodiydata .shop_tab .cptab_current .after{display:block;}
+
+
+.nodiydata .cp_detail{min-height:500rpx}
+
+.nodiydata .nomore-footer-tips{background:#fff!important}
+
+</style>
\ No newline at end of file
diff --git a/pages/shop/product.vue b/pages/shop/product.vue
new file mode 100644
index 0000000..ab0302e
--- /dev/null
+++ b/pages/shop/product.vue
@@ -0,0 +1,1798 @@
+<template>
+	<view class="pages-product">
+		<block v-if="isload">
+			<block v-if="sysset.showgzts">
+				<view style="width:100%;height:88rpx"> </view>
+				<view class="follow_topbar">
+					<view class="headimg">
+						<image :src="sysset.logo" />
+					</view>
+					<view class="info">
+						<view class="i">欢迎进入 <text :style="{color:t('color1')}">{{sysset.name}}</text></view>
+						<view class="i">关注公众号享更多专属服务</view>
+					</view>
+					<view class="sub" @tap="showsubqrcode" :style="{'background-color':t('color1')}">立即关注</view>
+				</view>
+				<uni-popup id="qrcodeDialog" ref="qrcodeDialog" type="dialog">
+					<view class="qrcodebox">
+						<image :src="sysset.qrcode" @tap="previewImage" :data-url="sysset.qrcode" class="img" />
+						<view class="txt">长按识别二维码关注</view>
+						<view class="close" @tap="closesubqrcode">
+							<image :src="event_rul +'/static/img/static/img/close2.png'" style="width:100%;height:100%" />
+						</view>
+					</view>
+				</uni-popup>
+			</block>
+			<view
+			v-if="bboglist.length>0"
+				style="position:fixed;top:5vh;left:20rpx;z-index:9;background:rgba(153,153,153,0.8);border-radius:20rpx;color:#fff;padding:0 10rpx">
+				<swiper style="position:relative;height:54rpx;width:350rpx;" :autoplay="true" :interval="5000"
+					:vertical="true">
+					<swiper-item v-for="(item, index) in bboglist" :key="index" @tap="goto"
+						:data-url="'/pages/shop/product?id=' + item.proid" class="flex-y-center">
+						<image :src="item.headimg"
+							style="width:40rpx;height:40rpx;border:1px solid rgba(255,255,255,0.7);border-radius:50%;margin-right:4px" />
+						<view
+							style="width:300rpx;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;font-size:22rpx">
+							{{item.nickname}} {{item.showtime}}购买了该商品</view>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="swiper-container" v-if="isplay==0">
+				<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="5000" @change="swiperChange">
+					<block v-for="(item, index) in product.pics" :key="index">
+						<swiper-item class="swiper-item">
+							<view class="swiper-item-view">
+								<image class="img" @click="preImg(product.pics,index)" :src="item" mode="widthFix" />
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="imageCount">{{current+1}}/{{(product.pics).length}}</view>
+				<view v-if="product.video" class="provideo" @tap="payvideo">
+					<image :src="event_rul +'/static/img/static/img/video.png'" />
+					<view class="txt">{{product.video_duration}}</view>
+				</view>
+			</view>
+			<view class="videobox" v-if="isplay==1">
+				<video autoplay="true" class="video" id="video" :src="product.video"></video>
+				<view class="parsevideo" @tap="parsevideo">退出播放</view>
+			</view>
+			<view class="product-detail__con">
+				<view class="product-detail__info">
+					<view class="info-hd flex al-item-center j-between">
+						<view class="price flex al-item-center">
+							<view class="current" :class="{'small-current': product.max_price!=product.min_price}">
+								<text class="symbol">￥</text>{{product.min_price}}<text
+									v-if="product.max_price!=product.min_price">-{{product.max_price}}</text>
+							</view>
+							<view class="original" v-if="product.market_price*1 > product.sell_price*1">
+								￥{{product.market_price}}<text v-if="product.max_price!=product.min_price">起</text>
+							</view>
+							<view class="txt" v-if="shopset.hide_sales != 1">
+								销量：{{product.sales}}
+							</view>
+							<view class="txt" v-if="shopset.hide_sales != 1">
+								库存：{{product.stock}}
+							</view>
+						</view>
+						<view class="info-hd__btn flex al-item-center j-between" @tap="showcuxiaodetail" v-if="couponlist.length>0">
+							<view class="btn-txt">领券</view>
+							<view class="icon-box flex al-item-center j-center">
+								<text class="iconfont icon-arrow-right"></text>
+							</view>
+						</view>
+					</view>
+					<view class="info-bd">{{product.name}}</view>
+					<view class="info-ft flex">
+						<!-- <view class="playback">
+							<text class="iconfont icon-shipin"></text>
+							<text class="playback-txt">点击直播回放</text>
+						</view> -->
+						<view class="share" @tap="shareClick">
+							<text class="iconfont icon-fenxiang"></text>
+							<text class="share-txt">分享</text>
+						</view>
+					</view>
+					<view class="sellpoint" v-if="product.sellpoint">{{product.sellpoint}}</view>
+					<view class="commission" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"
+						v-if="shopset.showcommission==1 && product.commission > 0">分享好友购买预计可得{{t('佣金')}}：<text
+							style="font-weight:bold;padding:0 2px">{{product.commission}}</text>{{product.commission_desc}}
+					</view>
+					<view style="margin:20rpx 0;color:#333;font-size:22rpx" v-if="product.balance_price > 0">
+						首付款金额：{{product.advance_price}}元，尾款金额：{{product.balance_price}}元</view>
+					<view style="margin:20rpx 0;color:#666;font-size:22rpx" v-if="product.buyselect_commission > 0">
+						下单被选奖励预计可得{{t('佣金')}}：<text
+							style="font-weight:bold;padding:0 2px">{{product.buyselect_commission}}</text>元</view>
+
+					<view class="upsavemoney"
+						:style="{background:'linear-gradient(90deg, rgb(255, 180, 153) 0%, #ffcaa8 100%)',color:'#653a2b'}"
+						v-if="product.upsavemoney > 0">
+						<view class="flex1">升级到 {{product.nextlevelname}} 预计可节省<text
+								style="font-weight:bold;padding:0 2px;color:#ca4312">{{product.upsavemoney}}</text>元
+						</view>
+						<view style="margin-left:20rpx;font-weight:bold;display:flex;align-items:center;color:#ca4312"
+							@tap="goto" data-url="/pages/my/levelup">立即升级
+							<!-- <image :src="event_rul +'/static/img/static/img/arrowright2.png'" style="width:30rpx;height:30rpx"/> -->
+							<text class="iconfont icon-arrow-right"></text>
+						</view>
+					</view>
+				</view>
+				<view class="choose" @tap="buydialogChange" data-btntype="2">
+					<view class="f0">规格</view>
+					<view class="f1 flex1">请选择商品规格及数量</view>
+				</view>
+				
+				<view class="cuxiaodiv" v-if="product.givescore > 0">
+					<view class="cuxiaopoint">
+						<view class="f0">送{{t('积分')}}</view>
+						<view class="f1" style="font-size:26rpx">购买可得{{t('积分')}}{{product.givescore}}个</view>
+					</view>
+				</view>
+
+				<view class="cuxiaodiv"
+					v-if="cuxiaolist.length>0 || couponlist.length>0 || fuwulist.length>0 || product.discount_tips!=''">
+					<view class="fuwupoint cuxiaoitem" v-if="fuwulist.length>0">
+						<view class="f0">服务</view>
+						<view class="f1" @tap="showfuwudetail">
+							<view class="t" v-for="(item, index) in fuwulist" :key="index">{{item.name}}</view>
+						</view>
+						<view class="f2" @tap="showfuwudetail">
+							<!-- <image :src="event_rul +'/static/img/static/img/arrow-point.png'" mode="widthFix"/> -->
+							<text class="iconfont icon-arrow-right"></text>
+						</view>
+					</view>
+					<view class="cuxiaopoint cuxiaoitem" v-if="cuxiaolist.length>0">
+						<view class="f0">促销</view>
+						<view class="f1" @tap="showcuxiaodetail">
+							<view v-for="(item, index) in cuxiaolist" :key="index" class="t"
+								:style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text
+									class="t0">{{item.tip}}</text><text class="t1">{{item.name}}</text></view>
+						</view>
+						<view class="f2" @tap="showcuxiaodetail">
+							<!-- <image :src="event_rul +'/static/img/static/img/arrow-point.png'" mode="widthFix"/> -->
+							<text class="iconfont icon-arrow-right"></text>
+						</view>
+					</view>
+					<view class="cuxiaopoint cuxiaoitem" v-if="product.discount_tips!=''">
+						<view class="f0">折扣</view>
+						<view class="f1" style="padding-left:10rpx">{{product.discount_tips}}</view>
+						<view class="f2" @tap="goto" data-url="/pages/my/levelinfo">
+							<!-- <image :src="event_rul +'/static/img/static/img/arrow-point.png'" mode="widthFix"/> -->
+							<text class="iconfont icon-arrow-right"></text>
+						</view>
+					</view>
+				</view>
+				<view v-if="showfuwudialog" class="popup__container">
+					<view class="popup__overlay" @tap.stop="hidefuwudetail"></view>
+					<view class="popup__modal">
+						<view class="popup__title">
+							<text class="popup__title-text">服务</text>
+							<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+								@tap.stop="hidefuwudetail" />
+						</view>
+						<view class="popup__content">
+							<view v-for="(item, index) in fuwulist" :key="index" class="service-item">
+								<view class="fuwudialog-content">
+									<view class="f1">{{item.name}}</view>
+									<text class="f2">{{item.desc}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="showcuxiaodialog" class="popup__container">
+					<view class="popup__overlay" @tap.stop="hidecuxiaodetail"></view>
+					<view class="popup__modal">
+						<view class="popup__title">
+							<text class="popup__title-text">优惠促销</text>
+							<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+								@tap.stop="hidecuxiaodetail" />
+						</view>
+						<view class="popup__content">
+							<view v-for="(item, index) in cuxiaolist" :key="index" class="service-item">
+								<view class="suffix">
+									<view class="type-name"><text
+											style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text>
+										<text style="color:#333;margin-left:20rpx">{{item.name}}</text></view>
+								</view>
+							</view>
+							<couponlist :couponlist="couponlist" @getcoupon="getcoupon"></couponlist>
+						</view>
+					</view>
+				</view>
+				<view class="commentbox" v-if="shopset.comment==1 && commentcount > 0">
+					<view class="commentbox-hd flex al-item-center j-between">
+						<view class="commentbox-hd__title">用户评价({{commentcount}})
+						</view>
+						<view class="commentbox-hd__more flex al-item-center" @tap="goto"
+							:data-url="'commentlist?proid=' + product.id">查看全部
+							<text class="iconfont icon-arrow-right"></text>
+						</view>
+					</view>
+					<view class="commentbox-bd">
+						<view class="commentbox-bd__item" v-if="commentlist.length>0">
+							<view class="item-hd flex al-item-center j-between">
+								<view class="item-hd__userInfo flex al-item-center">
+									<image class="item-hd__userInfo-img" :src="commentlist[0].headimg" />
+									<view class="item-hd__userInfo-bd">
+										<view>
+											<view class="item-hd__userInfo-name">{{commentlist[0].nickname}}</view>
+										</view>
+										<view class="item-hd__userInfo-time">
+											{{commentlist[0].createtime}}
+										</view>
+									</view>
+								</view>
+								<view class="item-hd__userInfo-ft">
+									<image class="grade-star" v-for="(item2,index2) in [0,1,2,3,4]" :key="index2"
+										:src="event_rul +'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'" />
+								</view>
+							</view>
+
+							<view class="item-bd">
+								<text class="item-bd__txt">{{commentlist[0].content}}</text>
+								<view class="item-bd__imgs">
+									<block v-if="commentlist[0].content_pic!=''">
+										<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+											<view @tap="previewImage" :data-url="itemp"
+												:data-urls="commentlist[0].content_pic">
+												<image :src="itemp"/>
+											</view>
+										</block>
+									</block>
+								</view>
+							</view>
+							<!-- <view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view> -->
+						</view>
+						<view v-else class="nocomment">暂无评价~</view>
+					</view>
+				</view>
+
+				<view class="detail_title">
+					<image class="icon2" :src="event_rul +'/static/images/title-decorate.svg'" mode=""></image>
+					<view class="t0">商品描述</view>
+					<image class="icon2" :src="event_rul +'/static/images/title-decorate.svg'" mode=""></image>
+				</view>
+				<view class="detail">
+					<dp :pagecontent="pagecontent"></dp>
+				</view>
+
+				<!-- <view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">猜你喜欢</view><view class="t2"></view><view class="t1"></view></view> -->
+				<view class="detail_title">
+					<image class="icon2" :src="event_rul +'/static/images/title-decorate.svg'" mode=""></image>
+					<view class="t0">猜你喜欢</view>
+					<image class="icon2" :src="event_rul +'/static/images/title-decorate.svg'" mode=""></image>
+				</view>
+				<!-- <dp-product-itemlist :data="loveList"  :menuindex="-1"></dp-product-itemlist> -->
+				<dp-product-item  :data="loveList" :menuindex="-1"></dp-product-item>
+				<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':''"
+					v-if="product.status==1">
+					<view class="f1">
+						<view class="item" @tap="goto" :data-url="product.bid== 0 ? '/pages/index/index':'/pagesA/shop/index?id=' + product.bid">
+							<!-- <image class="img" :src="event_rul +'/static/img/static/img/kefu.png'" /> -->
+							<text class="iconfont" :class="product.bid == 0 ? 'icon-shouye1' : 'icon-dianpu1'" style="font-size: 40rpx; margin-bottom: 3rpx;"></text>
+							<view class="t1">{{product.bid == 0 ? '首页' : '店铺'}}</view>
+						</view>
+					<!-- 	<button class="item" v-else open-type="contact">
+							<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'" />
+							<view class="t1">客服</view>
+						</button> -->
+						<!-- 	<view class="item flex1" @tap="goto" data-url="/pages/shop/cart">
+	 						<image class="img" :src="event_rul +'/static/img/static/img/gwc.png'"/>
+	 						<view class="t1">购物车</view>
+	 						<view class="cartnum" v-if="cartnum>0" :style="{background:'rgba('+t('color1rgb')+',0.8)'}">{{cartnum}}</view>
+	 					</view> -->
+						<view class="item" @tap="addfavorite">
+							<!-- <image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'" />
+							 -->
+							 <text class="iconfont icon-shoucang" v-if="!isfavorite" style="font-size: 40rpx; margin-bottom: 3rpx;"></text>
+							 <text class="iconfont icon-Collection" v-else style="color:#0A5D3B; font-size: 40rpx; margin-bottom: 3rpx;"></text>
+							<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+						</view>
+					</view>
+					<view class="op">
+						<view class="tocart flex-x-center flex-y-center"
+							@tap="buydialogChange" data-btntype="1"
+							v-if="product.freighttype!=3 && product.freighttype!=4">加入购物车</view>
+						<view class="tobuy flex-x-center flex-y-center"
+							@tap="buydialogChange" data-btntype="2">立即购买</view>
+					</view>
+				</view>
+				<buydialog v-if="buydialogShow" :proid="product.id" :btntype="btntype"
+					@buydialogChange="buydialogChange" :menuindex="menuindex" @addcart="addcart" @cartPuch="cartPuch" :showtaos="1"></buydialog>
+				<cart-full v-if="showPurchase" @closePur="closePur" :purchaseDetail="purchaseDetail" :goodscart="goodscart"></cart-full>
+				<scrolltop :isshow="scrolltopshow"></scrolltop>
+
+				<view v-if="sharetypevisible" class="popup__container">
+					<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+					<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+						<!-- <view class="popup__title">
+	 						<text class="popup__title-text">请选择分享方式</text>
+	 						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+	 					</view> -->
+						<view class="popup__content">
+							<view class="sharetypecontent">
+								<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+									<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+									<text class="t1">分享给好友</text>
+								</view>
+								<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+									<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+									<text class="t1">分享给好友</text>
+								</view>
+								<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+									<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+									<text class="t1">分享给好友</text>
+								</view>
+								<button class="f1" open-type="share" v-else>
+									<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'" />
+									<text class="t1">分享给好友</text>
+								</button>
+								<view class="f2" @tap="showPoster">
+									<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'" />
+									<text class="t1">生成分享图片</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="posterDialog" v-if="showposter">
+					<view class="main">
+						<view class="close" @tap="posterDialogClose">
+							<image class="img" :src="event_rul +'/static/img/static/img/close.png'" />
+						</view>
+						<view class="content">
+							<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage"
+								:data-url="posterpic"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- new add -->
+			<view class="right_car" @tap="goto" data-url="/pages/shop/cart">
+				<text class="iconfont icon-gouwuche1" style="font-size: 42rpx; font-weight: bold; color: #0A5D3B;"></text>
+			</view>
+
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+		<popmsg ref="popmsg"></popmsg>
+		
+		<view class="hitn-n position-f" v-show="hintShow">
+			<view class="hint-bx position-a">
+				<image class="hint-img" :src="event_rul + '/static/images/hint-n.png'" mode="widthFix"></image>
+				<view class="content position-a  flex flex-colum al-item-center">
+					<text class="title font-w">温馨提示</text>
+					<text class="text">该商品已下架！</text>
+				</view>
+			</view>
+		</view>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	var interval = null;
+
+	export default {
+		data() {
+			return {
+				loveList: [],
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+				textset: {},
+				isload: false,
+				buydialogShow: false,
+				btntype: 1,
+				isfavorite: false,
+				current: 0,
+				isplay: 0,
+				showcuxiaodialog: false,
+				showfuwudialog: false,
+				business: "",
+				product: [],
+				cartnum: "",
+				commentlist: "",
+				commentcount: "",
+				cuxiaolist: "",
+				couponlist: "",
+				fuwulist: [],
+				pagecontent: "",
+				shopset: {},
+				sysset: {},
+				title: "",
+				bboglist: "",
+				sharepic: "",
+				sharetypevisible: false,
+				showposter: false,
+				posterpic: "",
+				scrolltopshow: false,
+				kfurl: '',
+				showPurchase: false,
+				purchaseDetail: {},
+				goodscart: {},
+				
+				event_rul: app.globalData.event_url,
+				
+				hintShow:false,
+				hintTime: null,
+			};
+		},
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		onShareAppMessage: function() {
+			return this._sharewx({
+				title: this.product.sharetitle || this.product.name,
+				pic: this.product.sharepic || this.product.pic
+			});
+		},
+		onShareTimeline: function() {
+			var sharewxdata = this._sharewx({
+				title: this.product.sharetitle || this.product.name,
+				pic: this.product.sharepic || this.product.pic
+			});
+			var query = (sharewxdata.path).split('?')[1];
+			console.log(sharewxdata)
+			console.log(query)
+			return {
+				title: sharewxdata.title,
+				imageUrl: sharewxdata.imageUrl,
+				query: query
+			}
+		},
+		onUnload: function() {
+			clearInterval(interval);
+			clearTimeout(this.hintTime)
+		},
+
+		methods: {
+	
+			cartPuch(e) {
+				this.purchaseDetail = e
+				this.showPurchase = true
+				
+			},
+			// 关闭购物车满弹框
+			closePur(e) {
+				this.showPurchase = e
+			},
+			preImg(arr,index){
+				console.log(arr,'weism')
+				uni.previewImage({urls:arr,current:index})
+			},
+	
+			getdata: function() {
+				var that = this;
+				var id = this.opt.id || 0;
+				that.loading = true;
+				app.get('ApiShop/product', {
+					id: id
+				}, function(res) {
+					that.loading = false;
+
+					if (res.status == 0) {
+						// app.alert(res.msg);
+						that.hintShow = true
+						that.hintTime = setTimeout(() => {
+							that.hintShow = false
+							uni.navigateBack()
+						}, 2000)
+						return;
+					}
+					that.loveList = res.loveList;
+					that.textset = app.globalData.textset;
+					var product = res.product;
+					var pagecontent = JSON.parse(product.detail);
+					that.business = res.business;
+					that.product = product;
+					that.cartnum = res.cartnum;
+					that.commentlist = res.commentlist;
+					that.commentcount = res.commentcount;
+					that.cuxiaolist = res.cuxiaolist;
+					that.couponlist = res.couponlist;
+					that.fuwulist = res.fuwulist;
+					that.pagecontent = pagecontent;
+					that.shopset = res.shopset;
+					that.sysset = res.sysset;
+					that.title = product.name;
+					that.isfavorite = res.isfavorite;
+					that.bboglist = res.bboglist;
+					that.sharepic = product.pics[0];
+					uni.setNavigationBarTitle({
+						title: product.name
+					});
+
+					that.kfurl = '/pages/kefu/index?bid=' + product.bid;
+					if (app.globalData.initdata.kfurl != '') {
+						that.kfurl = app.globalData.initdata.kfurl;
+					}
+					that.loaded({
+						title: product.sharetitle || product.name,
+						pic: product.sharepic || product.pic,
+						desc: product.sharedesc || product.sellpoint
+					});
+				});
+			},
+			swiperChange: function(e) {
+				var that = this;
+				that.current = e.detail.current
+			},
+			payvideo: function() {
+				this.isplay = 1;
+				uni.createVideoContext('video').play();
+			},
+			parsevideo: function() {
+				this.isplay = 0;
+				uni.createVideoContext('video').stop();
+			},
+			buydialogChange: function(e) {
+				if (!this.buydialogShow) {
+					this.btntype = e.currentTarget.dataset.btntype
+				}
+				this.buydialogShow = !this.buydialogShow;
+			},
+			//收藏操作
+			addfavorite: function() {
+				var that = this;
+				var proid = that.product.id;
+				app.post('ApiShop/addfavorite', {
+					proid: proid,
+					type: 'shop'
+				}, function(data) {
+					if (data.status == 1) {
+						that.isfavorite = !that.isfavorite;
+					}
+					app.success(data.msg);
+				});
+			},
+			shareClick: function() {
+				this.sharetypevisible = true;
+			},
+			handleClickMask: function() {
+				this.sharetypevisible = false
+			},
+			showPoster: function() {
+				var that = this;
+				that.showposter = true;
+				that.sharetypevisible = false;
+				app.showLoading('生成海报中');
+				app.post('ApiShop/getposter', {
+					proid: that.product.id
+				}, function(data) {
+					app.showLoading(false);
+					if (data.status == 0) {
+						app.alert(data.msg);
+					} else {
+						that.posterpic = data.poster;
+					}
+				});
+			},
+			posterDialogClose: function() {
+				this.showposter = false;
+			},
+			showfuwudetail: function() {
+				this.showfuwudialog = true;
+			},
+			hidefuwudetail: function() {
+				this.showfuwudialog = false
+			},
+			showcuxiaodetail: function() {
+				this.showcuxiaodialog = true;
+			},
+			hidecuxiaodetail: function() {
+				this.showcuxiaodialog = false
+			},
+			getcoupon: function() {
+				this.showcuxiaodialog = false;
+				this.getdata();
+			},
+			onPageScroll: function(e) {
+				var that = this;
+				var scrollY = e.scrollTop;
+				if (scrollY > 200) {
+					that.scrolltopshow = true;
+				}
+				if (scrollY < 150) {
+					that.scrolltopshow = false
+				}
+			},
+			sharemp: function() {
+				app.error('点击右上角发送给好友或分享到朋友圈');
+				this.sharetypevisible = false
+			},
+			shareapp: function() {
+				var that = this;
+				that.sharetypevisible = false;
+				uni.showActionSheet({
+					itemList: ['发送给微信好友', '分享到微信朋友圈'],
+					success: function(res) {
+						if (res.tapIndex >= 0) {
+							var scene = 'WXSceneSession';
+							if (res.tapIndex == 1) {
+								scene = 'WXSenceTimeline';
+							}
+							var sharedata = {};
+							sharedata.provider = 'weixin';
+							sharedata.type = 0;
+							sharedata.scene = scene;
+							sharedata.title = that.product.sharetitle || that.product.name;
+							sharedata.summary = that.product.sharedesc || that.product.sellpoint;
+							sharedata.href = app.globalData.pre_url + '/h5/' + app.globalData.aid +
+								'.html#/pages/shop/product?scene=id_' + that.product.id + '-pid_' + app
+								.globalData.mid;
+							sharedata.imageUrl = that.product.pic;
+							var sharelist = app.globalData.initdata.sharelist;
+							if (sharelist) {
+								for (var i = 0; i < sharelist.length; i++) {
+									if (sharelist[i]['indexurl'] == '/pages/shop/product') {
+										sharedata.title = sharelist[i].title;
+										sharedata.summary = sharelist[i].desc;
+										sharedata.imageUrl = sharelist[i].pic;
+										if (sharelist[i].url) {
+											var sharelink = sharelist[i].url;
+											if (sharelink.indexOf('/') === 0) {
+												sharelink = app.globalData.pre_url + '/h5/' + app
+													.globalData.aid + '.html#' + sharelink;
+											}
+											if (app.globalData.mid > 0) {
+												sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') +
+													'pid=' + app.globalData.mid;
+											}
+											sharedata.href = sharelink;
+										}
+									}
+								}
+							}
+							uni.share(sharedata);
+						}
+					}
+				});
+			},
+			showsubqrcode: function() {
+				this.$refs.qrcodeDialog.open();
+			},
+			closesubqrcode: function() {
+				this.$refs.qrcodeDialog.close();
+			},
+			addcart: function(e) {
+				console.log(e)
+				this.cartnum = this.cartnum + e.num;
+				this.goodscart = e
+			}
+
+		}
+
+	};
+</script>
+<style lang="scss">
+.pages-product {
+	min-height: 100vh;
+	box-sizing: border-box;
+	background: #F5F5F5;
+	padding-bottom: calc(124rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(124rpx + env(safe-area-inset-bottom));
+}
+	.icon2 {
+		height: 26rpx;
+		width: 50rpx;
+	}
+
+	.info_live {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 26rpx;
+		margin-top: 20rpx;
+		color: #999;
+
+		.left {
+			display: flex;
+
+			.icon {
+				padding: 0 10rpx;
+				border-radius: 6rpx;
+				color: #fff;
+				background-color: #f3bf72;
+				margin-right: 16rpx;
+			}
+		}
+
+		.right {
+			display: flex;
+
+			.iconfont {
+				margin-right: 16rpx;
+			}
+		}
+	}
+
+	.right_car {
+		position: fixed;
+		padding: 15rpx;
+		top: 4vh;
+		right: 30rpx;
+		width: 80rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 2;
+		background-color: #e2f7ef;
+		height: 80rpx;
+		border-radius: 80rpx;
+		box-shadow: 0 0 10rpx 0 #ccc;
+
+		image {
+			height: 100%;
+			width: 100%;
+		}
+	}
+
+	.follow_topbar {
+		height: 88rpx;
+		width: 100%;
+		max-width: 640px;
+		background: rgba(0, 0, 0, 0.8);
+		position: fixed;
+		top: 0;
+		z-index: 13;
+	}
+
+	.follow_topbar .headimg {
+		height: 64rpx;
+		width: 64rpx;
+		margin: 6px;
+		float: left;
+	}
+
+	.follow_topbar .headimg image {
+		height: 64rpx;
+		width: 64rpx;
+	}
+
+	.follow_topbar .info {
+		height: 56rpx;
+		padding: 16rpx 0;
+	}
+
+	.follow_topbar .info .i {
+		height: 28rpx;
+		line-height: 28rpx;
+		color: #ccc;
+		font-size: 24rpx;
+	}
+
+	.follow_topbar .info {
+		height: 80rpx;
+		float: left;
+	}
+
+	.follow_topbar .sub {
+		height: 48rpx;
+		width: auto;
+		background: #FC4343;
+		padding: 0 20rpx;
+		margin: 20rpx 16rpx 20rpx 0;
+		float: right;
+		font-size: 24rpx;
+		color: #fff;
+		line-height: 52rpx;
+		border-radius: 6rpx;
+	}
+
+	.qrcodebox {
+		background: #fff;
+		padding: 50rpx;
+		position: relative;
+		border-radius: 20rpx
+	}
+
+	.qrcodebox .img {
+		width: 400rpx;
+		height: 400rpx
+	}
+
+	.qrcodebox .txt {
+		color: #666;
+		margin-top: 20rpx;
+		font-size: 26rpx;
+		text-align: center
+	}
+
+	.qrcodebox .close {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		bottom: -100rpx;
+		left: 50%;
+		margin-left: -25rpx;
+		border: 1px solid rgba(255, 255, 255, 0.5);
+		border-radius: 50%;
+		padding: 8rpx
+	}
+
+	.swiper-container {
+		position: relative;
+		height: 750rpx;
+		overflow: hidden;
+	}
+
+	.swiper {
+		width: 100%;
+		height: 750rpx;
+		overflow: hidden;
+	}
+
+	.swiper-item-view {
+		width: 100%;
+		height: 750rpx;
+	}
+
+	.swiper .img {
+		width: 100%;
+		height: 750rpx;
+		overflow: hidden;
+	}
+
+	.imageCount {
+		width: 100rpx;
+		height: 50rpx;
+		background-color: rgba(0, 0, 0, 0.3);
+		border-radius: 40rpx;
+		line-height: 50rpx;
+		color: #fff;
+		text-align: center;
+		font-size: 26rpx;
+		position: absolute;
+		right: 13px;
+		bottom: 20rpx;
+	}
+
+	.provideo {
+		background: rgba(255, 255, 255, 0.7);
+		width: 160rpx;
+		height: 54rpx;
+		padding: 0 20rpx 0 4rpx;
+		border-radius: 27rpx;
+		position: absolute;
+		bottom: 30rpx;
+		left: 50%;
+		margin-left: -80rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between
+	}
+
+	.provideo image {
+		width: 50rpx;
+		height: 50rpx;
+	}
+
+	.provideo .txt {
+		flex: 1;
+		text-align: center;
+		padding-left: 10rpx;
+		font-size: 24rpx;
+		color: #333
+	}
+
+	.videobox {
+		width: 100%;
+		height: 750rpx;
+		text-align: center;
+		background: #000
+	}
+
+	.videobox .video {
+		width: 100%;
+		height: 650rpx;
+	}
+
+	.videobox .parsevideo {
+		margin: 0 auto;
+		margin-top: 20rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		color: #333;
+		background: #ccc;
+		width: 140rpx;
+		border-radius: 25rpx;
+		font-size: 24rpx
+	}
+	.product-detail__con {
+		padding: 24rpx;
+		.product-detail__info {
+			padding: 14rpx 24rpx 24rpx;
+			background: #fff;
+			border-radius: 12rpx;
+		}
+		.current {
+			font-size: 56rpx;
+			color: #ED5925;
+			line-height: 80rpx;
+			padding-right: 20rpx;
+			&.small-current {
+				font-size: 40rpx;
+			}
+			.symbol {
+				font-size: 28rpx;
+			}
+		}
+		.original {
+			font-size: 24rpx;
+			color: #999999;
+			text-decoration: line-through;
+			margin-right: 20rpx;
+		}
+		.txt {
+			font-size: 26rpx;
+			color: #999999;
+			&:not(:last-child) {
+				margin-right: 20rpx;
+			}
+		}
+		.info-hd{
+			&__btn {
+				width: 104rpx;
+				height: 42rpx;
+				border-radius: 42rpx;
+				background: linear-gradient(to right, #00AE68 0%, #096742 100%);
+				padding: 0 8rpx 0 16rpx;
+			}
+		}
+		.btn-txt {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 34rpx;
+		}
+		.icon-box {
+			width: 22rpx;
+			height: 26rpx;
+			border-radius: 50%;
+			background: #FFFFFF;
+		}
+		.icon-arrow-right {
+			font-size: 20rpx;
+		}
+		.info-bd {
+			color: #333333;
+			font-size: 32rpx;
+			line-height: 44rpx;
+			font-weight: bold;
+		}
+		.info-ft {
+			justify-content: flex-end;
+			margin-top: 46rpx;
+			font-size: 26rpx;
+			color: #999999;
+			line-height: 36rpx;
+			.iconfont {
+				font-size: 30rpx;
+				margin-right: 12rpx;
+			}
+			.share {
+				margin-left: 54rpx;
+			}
+		}
+	}
+
+	.product-detail__info .sellpoint {
+		font-size: 28rpx;
+		color: #666;
+		padding-top: 20rpx;
+	}
+
+	.product-detail__info .sales_stock {
+		display: flex;
+		justify-content: space-between;
+		height: 60rpx;
+		line-height: 60rpx;
+		margin-top: 30rpx;
+		font-size: 24rpx;
+		color: #777777
+	}
+
+	.product-detail__info .commission {
+		display: inline-block;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		border-radius: 10rpx;
+		font-size: 20rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 0 20rpx
+	}
+
+	.product-detail__info .upsavemoney {
+		display: flex;
+		align-items: center;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		border-radius: 10rpx;
+		font-size: 20rpx;
+		height: 70rpx;
+		padding: 0 20rpx
+	}
+
+	.choose {
+		border-radius: 12rpx;
+		display: flex;
+		align-items: center;
+		background: #fff;
+		margin-top: 24rpx;
+		font-size: 28rpx;
+		line-height: 40rpx;
+		padding: 20rpx 24rpx;
+		color: #333;
+	}
+
+	.choose .f0 {
+		color: #999999;
+		padding-right: 26rpx;
+	}
+
+	.choose .f2 {
+		flex: 1;
+	}
+
+	.cuxiaodiv {
+		border-radius: 20rpx;
+		background: #fff;
+		margin-top: 20rpx;
+		padding: 0 3%;
+	}
+
+	.fuwupoint {
+		width: 100%;
+		font-size: 24rpx;
+		color: #333;
+		height: 88rpx;
+		line-height: 88rpx;
+		padding: 12rpx 0;
+		display: flex;
+		align-items: center
+	}
+
+	.fuwupoint .f0 {
+		color: #555;
+		font-weight: bold;
+		height: 32rpx;
+		font-size: 24rpx;
+		padding-right: 30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center
+	}
+
+	.fuwupoint .f1 {
+		margin-right: 20rpx;
+		flex: 1;
+		display: flex;
+		flex-wrap: nowrap;
+		overflow: hidden
+	}
+
+	.fuwupoint .f1 .t {
+		padding: 4rpx 20rpx 4rpx 0;
+		color: #777;
+		flex-shrink: 0
+	}
+
+	.fuwupoint .f1 .t:before {
+		content: "";
+		display: inline-block;
+		vertical-align: middle;
+		margin-top: -4rpx;
+		margin-right: 10rpx;
+		width: 24rpx;
+		height: 24rpx;
+		background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;
+		background-size: 24rpx auto;
+	}
+
+	.fuwupoint .f2 {
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.fuwupoint .f2 .img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.fuwudialog-content {
+		font-size: 24rpx
+	}
+
+	.fuwudialog-content .f1 {
+		color: #333;
+		height: 80rpx;
+		line-height: 80rpx;
+		font-weight: bold
+	}
+
+	.fuwudialog-content .f1:before {
+		content: "";
+		display: inline-block;
+		vertical-align: middle;
+		margin-top: -4rpx;
+		margin-right: 10rpx;
+		width: 24rpx;
+		height: 24rpx;
+		background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYBAMAAAASWSDLAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAwUExURUdwTOU5O+Q5POU5POQ4O+U4PN80P+M4O+Q4O+Q4POQ5POQ4OuQ4O+Q4O+I4PuQ5PJxkAycAAAAPdFJOUwAf+VSoeAvzws7ka7miLboUzckAAADJSURBVBjTY2BgYGCMWVR5VIABDBid/gPBFwjP/JOzQKKtfjGIzf3fEUSJ/N8AJO21Iao3fQbqqA+AcLi/CzCwfGGAAn8HBnlFMIttBoP4R4b4C2BOzk8G3q8M5w3AnPsLGZj/MKwHW8b6/QED4y8G/QQQx14ZSHwCcWYkMOtvAHOAyvqnPf8KcuMvkAGZP9eDjAQaEO/AwDb/D0gj0GiQpRnTQIYIfUR1DopDGexVIZygz8ieC4B6WyzRBOJtBkZ/pAABBZUWOKgAispF5e7ibycAAAAASUVORK5CYII=') no-repeat;
+		background-size: 24rpx auto;
+	}
+
+	.fuwudialog-content .f2 {
+		color: #777
+	}
+
+	.cuxiaopoint {
+		width: 100%;
+		font-size: 24rpx;
+		color: #333;
+		height: 88rpx;
+		line-height: 88rpx;
+		padding: 12rpx 0;
+		display: flex;
+		align-items: center
+	}
+
+	.cuxiaopoint .f0 {
+		color: #555;
+		font-weight: bold;
+		height: 32rpx;
+		font-size: 24rpx;
+		padding-right: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center
+	}
+
+	.cuxiaopoint .f1 {
+		margin-right: 20rpx;
+		flex: 1;
+		display: flex;
+		flex-wrap: nowrap;
+		overflow: hidden
+	}
+
+	.cuxiaopoint .f1 .t {
+		margin-left: 10rpx;
+		border-radius: 3px;
+		font-size: 24rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		padding-right: 10rpx;
+		flex-shrink: 0;
+		overflow: hidden
+	}
+
+	.cuxiaopoint .f1 .t0 {
+		display: inline-block;
+		padding: 0 5px;
+	}
+
+	.cuxiaopoint .f1 .t1 {
+		padding: 0 4px
+	}
+
+	.cuxiaopoint .f2 {
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.cuxiaopoint .f2 .img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.cuxiaodiv .cuxiaoitem {
+		border-bottom: 1px solid #E6E6E6;
+	}
+
+	.cuxiaodiv .cuxiaoitem:last-child {
+		border-bottom: 0
+	}
+
+	.popup__container {
+		border-radius: 20rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: auto;
+		z-index: 10;
+		background: #fff
+	}
+
+	.popup__overlay {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 11;
+		opacity: 0.3;
+		background: #000
+	}
+
+	.popup__modal {
+		width: 100%;
+		position: absolute;
+		bottom: 0;
+		color: #3d4145;
+		overflow-x: hidden;
+		overflow-y: hidden;
+		opacity: 1;
+		padding-bottom: 20rpx;
+		background: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+		z-index: 12;
+		min-height: 600rpx;
+		max-height: 1000rpx;
+	}
+
+	.popup__title {
+		text-align: center;
+		padding: 30rpx;
+		position: relative;
+		position: relative
+	}
+
+	.popup__title-text {
+		font-size: 32rpx
+	}
+
+	.popup__close {
+		position: absolute;
+		top: 34rpx;
+		right: 34rpx
+	}
+
+	.popup__content {
+		width: 100%;
+		max-height: 880rpx;
+		overflow-y: scroll;
+		padding: 20rpx 0;
+	}
+
+	.service-item {
+		display: flex;
+		padding: 0 40rpx 20rpx 40rpx;
+	}
+
+	.service-item .prefix {
+		padding-top: 2px;
+	}
+
+	.service-item .suffix {
+		padding-left: 10rpx;
+	}
+
+	.service-item .suffix .type-name {
+		font-size: 28rpx;
+		color: #49aa34;
+		margin-bottom: 10rpx;
+	}
+
+
+	.shop {
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		background: #fff;
+		margin-top: 20rpx;
+		padding: 20rpx 3%;
+		position: relative;
+		min-height: 100rpx;
+	}
+
+	.shop .p1 {
+		width: 90rpx;
+		height: 90rpx;
+		border-radius: 6rpx;
+		flex-shrink: 0
+	}
+
+	.shop .p2 {
+		padding-left: 10rpx
+	}
+
+	.shop .p2 .t1 {
+		width: 100%;
+		height: 40rpx;
+		line-height: 40rpx;
+		overflow: hidden;
+		color: #111;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+
+	.shop .p2 .t2 {
+		width: 100%;
+		height: 30rpx;
+		line-height: 30rpx;
+		overflow: hidden;
+		color: #999;
+		font-size: 24rpx;
+		margin-top: 8rpx
+	}
+
+	.shop .p4 {
+		height: 64rpx;
+		line-height: 64rpx;
+		color: #FFFFFF;
+		border-radius: 32rpx;
+		margin-left: 20rpx;
+		flex-shrink: 0;
+		padding: 0 30rpx;
+		font-size: 24rpx;
+		font-weight: bold
+	}
+
+	.detail {
+		border-radius: 20rpx;
+		min-height: 200rpx;
+	}
+
+	.detail_title {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 28rpx 0 24rpx;
+	}
+
+	.detail_title .t0 {
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #0A5D3B;
+		line-height: 50rpx;
+		letter-spacing: 2rpx;
+		margin: 0 10rpx;
+	}
+
+	.detail_title .t1 {
+		width: 12rpx;
+		height: 12rpx;
+		background: rgba(253, 74, 70, 0.2);
+		transform: rotate(45deg);
+		margin: 0 4rpx;
+		margin-top: 6rpx
+	}
+
+	.detail_title .t2 {
+		width: 18rpx;
+		height: 18rpx;
+		background: rgba(253, 74, 70, 0.4);
+		transform: rotate(45deg);
+		margin: 0 4rpx
+	}
+
+	.commentbox {
+		border-radius: 12rpx;
+		background: #fff;
+		padding: 20rpx 24rpx 28rpx;
+		margin-top: 24rpx;
+		font-weight: 500;
+		&-hd {
+			&__title {
+				font-size: 32rpx;
+				color: #333333;
+				line-height: 50rpx;
+			}
+			&__more {
+				font-size: 24rpx;
+				color: #0A5D3B;
+				line-height: 34rpx;
+				.iconfont {
+					font-size: 36rpx;
+					font-weight: 500;
+				}
+			}
+		}
+		&-bd {
+			margin-top: 24rpx;
+			&__item {
+				&:not(:last-child) {
+					margin-bottom: 24rpx;
+				}
+				.item-hd {
+					&__userInfo {
+						flex: 1;
+						&-img {
+							width: 68rpx;
+							height: 68rpx;
+							box-sizing: border-box;
+							flex-shrink: 0;
+							margin-right: 14rpx;
+						}
+						&-bd {
+							flex: 1;
+							font-weight: 500;
+						}
+						&-name {
+							font-size: 26rpx;
+							color: #333333;
+							line-height: 36rpx;
+						}
+						&-time {
+							margin-top: 2rpx;
+							font-size: 22rpx;
+							color: #999999;
+							line-height: 32rpx;
+						}
+						&-ft {
+							.grade-star {
+								width: 28rpx;
+								height: 28rpx;
+								margin-left: 6rpx;
+							}
+						}
+
+					}
+				}
+				.item-bd {
+					margin-top: 16rpx;
+					&__txt {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #333333;
+						line-height: 32rpx;
+					}
+					&__imgs {
+						margin: 24rpx -12rpx 0 0;
+						image {
+							margin-right: 12rpx;
+							width: 164rpx;
+							height: 164rpx;
+							border-radius: 12rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	.commentbox .title .f1 {
+		flex: 1;
+		color: #333;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+
+	.commentbox .title .f2 {
+		color: #666;
+		font-weight: bold;
+		font-size: 28rpx;
+		display: flex;
+		align-items: center
+	}
+
+	.commentbox .nocomment {
+		height: 100rpx;
+		line-height: 100rpx
+	}
+
+	.comment {
+		border-radius: 20rpx;
+		display: flex;
+		flex-direction: column;
+		min-height: 200rpx;
+	}
+
+	.comment .item {
+		background-color: #fff;
+		padding: 10rpx 20rpx;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.comment .item .f1 {
+		display: flex;
+		width: 100%;
+		align-items: center;
+		padding: 10rpx 0;
+	}
+
+	.comment .item .f1 .t1 {
+		width: 70rpx;
+		height: 70rpx;
+		border-radius: 50%;
+	}
+
+	.comment .item .f1 .t2 {
+		padding-left: 10rpx;
+		color: #333;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+
+	.comment .item .f1 .t3 {
+		text-align: right;
+	}
+
+	.comment .item .f1 .t3 .img {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 10rpx
+	}
+
+	.comment .item .score {
+		font-size: 24rpx;
+		color: #f99716;
+	}
+
+	.comment .item .score image {
+		width: 140rpx;
+		height: 50rpx;
+		vertical-align: middle;
+		margin-bottom: 6rpx;
+		margin-right: 6rpx;
+	}
+
+	.comment .item .f2 {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		padding: 10rpx 0;
+	}
+
+	.comment .item .f2 .t1 {
+		color: #333;
+		font-size: 28rpx;
+	}
+
+	.comment .item .f2 .t2 {
+		display: flex;
+		width: 100%
+	}
+
+	.comment .item .f2 .t2 image {
+		width: 100rpx;
+		height: 100rpx;
+		margin: 10rpx;
+	}
+
+	.comment .item .f2 .t3 {
+		color: #aaa;
+		font-size: 24rpx;
+	}
+
+	.comment .item .f3 {
+		margin: 20rpx auto;
+		padding: 0 30rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		border: 1px solid #E6E6E6;
+		border-radius: 30rpx;
+		color: #111111;
+		font-weight: bold;
+		font-size: 26rpx
+	}
+
+	.bottombar {
+		position: fixed;
+		bottom: 0px;
+		left: 0px;
+		right: 0;
+		padding: 16rpx 24rpx 30rpx;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+	}
+
+	.bottombar .f1 {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		// margin-right: 30rpx
+		justify-content: space-around;
+	}
+
+	.bottombar .f1 .item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 80rpx;
+		position: relative
+	}
+
+	.bottombar .f1 .item .img {
+		width: 44rpx;
+		height: 44rpx
+	}
+
+	.bottombar .f1 .item .t1 {
+		font-size: 20rpx;
+		color: #666666;
+		line-height: 28rpx;
+	}
+
+	.bottombar .op {
+		width: 520rpx;
+		border-radius: 78rpx;
+		overflow: hidden;
+		display: flex;
+	}
+
+	.bottombar .tocart,.bottombar .tobuy {
+		flex: 1;
+		height: 78rpx;
+		line-height: 78rpx;
+		font-size: 28rpx;
+		font-weight: bold
+	}
+	.bottombar .tocart {
+		background: linear-gradient(to right,#e9faf4 0%,#c1f9e5 100%);
+		color: #0A5D3B;
+	}
+	.bottombar .tobuy {
+		background: linear-gradient(to right,#00ad68 0%,#096741 100%);
+		color: #fff;
+	}
+
+	.bottombar .cartnum {
+		position: absolute;
+		right: 4rpx;
+		top: -4rpx;
+		color: #fff;
+		border-radius: 50%;
+		width: 32rpx;
+		height: 32rpx;
+		line-height: 32rpx;
+		text-align: center;
+		font-size: 22rpx;
+	}
+
+	.sharetypecontent {
+		border-radius: 20rpx;
+		height: 250rpx;
+		width: 710rpx;
+		margin: 20rpx;
+		display: flex;
+		padding: 50rpx;
+		align-items: flex-end
+	}
+
+	.sharetypecontent .f1 {
+		color: #51c332;
+		width: 50%;
+		height: 150rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background: #fff;
+		font-size: 28rpx;
+		border: 0
+	}
+
+	.sharetypecontent button::after {
+		border: 0
+	}
+
+	.sharetypecontent .f1 .img {
+		width: 90rpx;
+		height: 90rpx
+	}
+
+	.sharetypecontent .f2 {
+		color: #51c332;
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.sharetypecontent .f2 .img {
+		width: 90rpx;
+		height: 90rpx
+	}
+
+	.sharetypecontent .t1 {
+		height: 60rpx;
+		line-height: 60rpx;
+		color: #666
+	}
+
+	.posterDialog {
+		border-radius: 20rpx;
+		position: fixed;
+		z-index: 9;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.8);
+		top: var(--window-top);
+		left: 0
+	}
+
+	.posterDialog .main {
+		width: 80%;
+		margin: 60rpx 10% 30rpx 10%;
+		background: #fff;
+		position: relative;
+		border-radius: 20rpx
+	}
+
+	.posterDialog .close {
+		position: absolute;
+		padding: 20rpx;
+		top: 0;
+		right: 0
+	}
+
+	.posterDialog .close .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.posterDialog .content {
+		width: 100%;
+		padding: 70rpx 20rpx 30rpx 20rpx;
+		color: #333;
+		font-size: 30rpx;
+		text-align: center
+	}
+
+	.posterDialog .content .img {
+		width: 540rpx;
+		height: 960rpx
+	}
+	
+	// 提示弹框
+	
+	.hitn-n {
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		background-color: #7F7F7F;
+		z-index: 3;
+		.hint-bx {
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			z-index: 6;
+			.hint-img {
+				width: 600rpx;
+			}
+			
+			.content {
+				width: 100%;
+				top: 180rpx;
+				left: 0;
+				.title {
+					font-size: 36rpx;
+				}
+				
+				.text {
+					margin-top: 40rpx;
+					color: #666;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/shop/prolist.vue b/pages/shop/prolist.vue
new file mode 100644
index 0000000..aff4d64
--- /dev/null
+++ b/pages/shop/prolist.vue
@@ -0,0 +1,378 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container" :style="history_show?'height:100%;':''">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<text class="iconfont icon-search"></text>
+					<input :value="keyword" placeholder="商品搜索..." placeholder-style="font-size:24rpx;color:#FFFFFF" @confirm="searchConfirm" @input="searchChange" />
+				</view>
+				<view class="search-btn" @tap="searchbtn">
+					<text class="iconfont icon-pailie" v-if="!history_show && productlisttype=='itemlist'"></text>
+					<text class="iconfont icon-shipailie" v-if="!history_show && productlisttype=='item2'"></text>
+					<text v-if="history_show">搜索</text>
+				</view>
+			</view>
+			<view class="search-history" v-show="history_show">
+				<view>
+					<text class="search-history-title">最近搜索</text>
+					<view class="delete-search-history" @tap="deleteSearchHistory">
+						<image :src="event_rul +'/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+					</view>
+				</view>
+				<view class="search-history-list">
+					<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+					</view>
+					<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul +'/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+				</view>
+			</view>
+			<view class="search-navbar" v-show="!history_show">
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="(!field||field=='sort')?'color:'+t('color1'):''" data-field="sort" data-order="desc">综合</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='sales'?'color:'+t('color1'):''" data-field="sales" data-order="desc">销量</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+					<text :style="field=='sell_price'?'color:'+t('color1'):''">价格</text>
+					<text class="iconfont icon-danbianjiantou1" :style="field=='sell_price'&&order=='asc'?'color:'+t('color1'):''"></text>
+					<text class="iconfont icon-danbianjiantou" :style="field=='sell_price'&&order=='desc'?'color:'+t('color1'):''"></text>
+				</view>
+				<view class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view>
+			</view>
+			<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+				<view class="filter-scroll-view">
+					<scroll-view class="filter-scroll-view-box" scroll-y="true">
+						<view class="search-filter">
+							<view class="filter-title">筛选</view>
+							<view class="filter-content-title">商品分组</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchegid==''?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="groupClick" data-gid="">全部</view>
+								<block v-for="(item, index) in glist" :key="index">
+									<view class="filter-item" :style="catchegid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="groupClick" :data-gid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<block v-if="!bid || bid <=0">
+							<view class="filter-content-title">商品分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+								<block v-for="(item, index) in clist" :key="index">
+									<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							</block>
+							<block v-else>
+							<view class="filter-content-title">商品分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid2==oldcid2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cate2Click" :data-cid2="oldcid2">全部</view>
+								<block v-for="(item, index) in clist2" :key="index">
+									<view class="filter-item" :style="catchecid2==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cate2Click" :data-cid2="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							</block>
+
+							<view class="search-filter-btn">
+								<view class="btn" @tap="filterReset">重置</view>
+								<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</uni-drawer>
+
+			
+		</view>
+		<view class="product-container">
+			<block v-if="datalist && datalist.length>0">
+				<dp-product-item v-if="productlisttype=='item2'" :data="datalist" :menuindex="menuindex"></dp-product-item>
+				<dp-product-itemlist v-if="productlisttype=='itemlist'" :data="datalist" :menuindex="menuindex"></dp-product-itemlist>
+			</block>
+			<nomore text="没有更多商品了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: false,
+		order: '',
+		field:'',
+		oldcid: "",
+		catchecid: "",
+		catchegid: "",
+		cid: "",
+		gid: '',
+		cid2:'',
+		oldcid2: "",
+		catchecid2: "",
+		clist: [],
+		clist2: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		bid:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.cid2 = this.opt.cid2 || '';
+		this.oldcid2 = this.opt.cid2 || '';
+		this.catchecid2 = this.opt.cid2;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		this.bid = this.opt.bid ? this.opt.bid : 0;
+		//console.log(this.bid);
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用商品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list');
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getprolist();
+    }
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var cid2 = that.cid2;
+			that.loading = true;
+			app.get('ApiShop/prolist', {cid: cid,gid: gid,bid:bid,cid2:cid2}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.clist2 = res.clist2;
+			  that.glist = res.glist;
+				that.loaded();
+				that.getprolist();
+			});
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+			var cid2 = that.cid2;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			var bid = that.opt.bid ? that.opt.bid : '';
+      app.post('ApiShop/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cid2:cid2,cpid:cpid,bid:bid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+    cate2Click: function (e) {
+      var that = this;
+      var cid2 = e.currentTarget.dataset.cid2;
+			if(cid2 === true) cid2 = '';
+      that.catchecid2 = cid2
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.cid2 = this.catchecid2;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchecid2 = this.oldcid2;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    }
+  }
+};
+</script>
+<style lang="scss">
+.container {background: #F5F5F5;height: 100vh;}
+.search-container {position: fixed;width: 100%;z-index:9;top:var(--window-top);background: #0A5D3B;}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height: 80rpx;border-radius: 40rpx;border: 0;background: rgba(255,255,255,.3);flex:1;padding: 0 28rpx;}
+.topsearch .f1 .icon-search{font-size: 40rpx;margin-right: 16rpx;color:#FFFFFF;}
+.topsearch .f1 input{height: 100%;flex: 1;font-size: 28rpx;color:#FFFFFF;}
+.topsearch .search-btn{
+	display:flex;align-items:center;color:#FFFFFF;text-align:center;margin-left:20rpx;
+	.iconfont {font-size:40rpx;}
+}
+.search-navbar {border-radius: 12rpx 12rpx 0 0;overflow: hidden;background: #F5F5F5;display: flex;text-align: center;align-items:center;padding:32rpx 0}
+.search-navbar-item {flex: 1;height: 28rpx;line-height: 28rpx;position: relative;font-size:28rpx;font-weight:bold;color:#333333}
+
+.search-navbar-item .icon-danbianjiantou,.icon-danbianjiantou1{font-size: 28rpx;color:#7D7D7D}
+.search-navbar-item .icon-danbianjiantou {margin-left: -10rpx;}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{min-width: 140rpx;box-sizing: border-box;background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 20rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%;font-size:26rpx;padding:206rpx 24rpx 0;}
+</style>
\ No newline at end of file
diff --git a/pages/shop/search.vue b/pages/shop/search.vue
new file mode 100644
index 0000000..a730c36
--- /dev/null
+++ b/pages/shop/search.vue
@@ -0,0 +1,649 @@
+<template>
+<view class="container" style="height: 100vh;">
+	<block v-if="isload">
+		<view class="pages-hd">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<!-- <image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image> -->
+					<text class="iconfont icon-search" style="color: #999999; font-size: 50rpx; margin-left: 20rpx;"></text>
+					<input :value="keyword" placeholder="搜索感兴趣的商品" placeholder-style="font-size:26rpx;color:#666666" @confirm="searchConfirm" @input="searchChange" @focus="searchFocus" />
+					<text class="iconfont icon-shanchu" @click="delSearch"></text>
+				</view>
+				<view class="search-btn" v-if="false" @tap="searchbtn">
+					<image :src="event_rul +'/static/img/static/img/show-cascades.png'" style="height:36rpx;width:36rpx" v-if="!history_show && productlisttype=='itemlist'"/>
+					<image :src="event_rul +'/static/img/static/img/show-list.png'" style="height:36rpx;width:36rpx" v-if="!history_show && productlisttype=='item2'"/>
+					<text v-if="history_show">搜索</text>
+				</view>
+			</view>
+			<view v-if="!history_show">
+				<view class="shop_head">
+					<view class="item" :class="{'itemz':homeType === 0}" @click="homeTypeFn(0)">
+						商品
+					</view>
+					<view class="item" :class="{'itemz':homeType === 1}"  @click="homeTypeFn(1)">
+						店铺
+					</view>
+				</view>
+				<view class="search-navbar" v-show="homeType == 0">
+					<view @tap.stop="sortClick" :class="{'itemz':(!field||field=='sort')}" class="search-navbar-item"  data-field="sort" data-order="desc">
+						<text class="txt">推荐</text>
+						<text class="heng" v-if="!field||field=='sort'"></text>
+						</view>
+					<view @tap.stop="sortClick" :class="{'itemz':(field=='sales')}" class="search-navbar-item"  data-field="sales" data-order="desc">
+						<text class="txt">销量</text>
+						<text class="heng" v-if="field=='sales'"></text>
+						</view>
+					<view @tap.stop="sortClick" :class="{'itemz':(field=='createtime')}" class="search-navbar-item"  data-field="createtime" data-order="desc">
+						<text class="txt">上新</text>
+						<text class="heng" v-if="field=='createtime'"></text>
+						</view>
+					<view style="color: color: #666;" @tap.stop="sortClick" :class="{'itemz':(field=='sell_price')}"   class="search-navbar-item" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+						<text  class="txt">价格</text>
+						<text class="heng" style="margin-left: -42rpx;" v-if="field=='sell_price'"></text>
+							<!-- <text style="font-size: 26rpx;" class="iconfont icon-jiantou_shangxiaqiehuan_o"></text> -->
+							
+						<text style="font-size: 26rpx; " class="iconfont icon-danbianjiantou1" :class="{'itemzz':(field=='sell_price')}" :style="field=='sell_price'&&order=='asc'?'color:'+'#0A5D3B':''"></text>
+						<text style="font-size: 26rpx; margin-left: -10rpx;" class="iconfont icon-danbianjiantou" :class="{'itemzz':(field=='sell_price')}" :style="field=='sell_price'&&order=='desc'?'color:'+'#0A5D3B':''"></text>
+					</view>
+					<!-- <view  class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view> -->
+				</view>
+			</view>
+		</view>
+		<scroll-view class="pages-bd" :style="'height:' + 'calc(100vh - '+ hdHeight + 'px)'" scroll-y="true" @scrolltolower="scrollBot">
+			<view class="product-hot" v-if="history_show" >
+					<view class="search-history" >
+						<view>
+							<text class="search-history-title" style="font-size: 32rpx; font-weight: bold; color: #333;">历史搜索</text>
+							<view class="delete-search-history" @tap="deleteSearchHistory">
+								<image :src="event_rul +'/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+							</view>
+						</view>
+						
+						<view class="search-history-list">
+							<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+							</view>
+							<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul +'/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+						</view>
+					</view>
+					
+					<view class="rsbox" >
+						<view class="title">
+							商品热搜榜
+						</view>
+						
+						<view class="item_box">
+							<view class="item" v-for="(item,index) in topList"  @click="goto" :data-url="'/pages/shop/product?id='+item.proid" :key='index'>
+							<view class="left">
+								<image :src="item.pic" mode=""></image>
+							</view>
+							<view class="right">
+								<view class="right_left">
+									{{item.name || ''}}
+								</view>
+								<view class="right_right">
+									<text class="iconfont icon-arrow-right"></text>
+								</view>
+							</view>
+							</view>
+						</view>
+					</view>
+			</view>
+			<view class="product-list" v-else-if="homeType == 0 && !history_show">
+				
+				<view class="product-container">
+					<block v-if="datalist && datalist.length>0">
+				
+						<dp-product-itemlist v-if="productlisttype=='itemlist'" :data="datalist" :menuindex="menuindex"></dp-product-itemlist>
+						<dp-product-item types='search' v-if="productlisttype=='item2'" :data="datalist" :menuindex="menuindex"></dp-product-item>
+					</block>
+					<nomore text="没有更多商品了" v-if="nomore"></nomore>
+					<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+					<loading v-if="loading"></loading>
+				</view>
+			</view>
+			<view class="shop-list" v-else-if="!history_show">
+				<shopList v-if="datalist.length" :list='datalist'></shopList>
+				<nomore text="没有更多店铺了" v-if="nomore"></nomore>
+				<nodata text="没有查找到相关店铺" v-if="nodata"></nodata>
+				<loading v-if="loading"></loading>
+			</view>
+			<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+				<view class="filter-scroll-view">
+					<scroll-view class="filter-scroll-view-box" scroll-y="true">
+						<view class="search-filter">
+							<view class="filter-title">筛选</view>
+							<view class="filter-content-title">商品分组</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchegid==''?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="groupClick" data-gid="">全部</view>
+								<block v-for="(item, index) in glist" :key="index">
+									<view class="filter-item" :style="catchegid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="groupClick" :data-gid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<block v-if="!bid || bid <=0">
+							<view class="filter-content-title">商品分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+								<block v-for="(item, index) in clist" :key="index">
+									<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							</block>
+							<block v-else>
+							<view class="filter-content-title">商品分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item" :style="catchecid2==oldcid2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cate2Click" :data-cid2="oldcid2">全部</view>
+								<block v-for="(item, index) in clist2" :key="index">
+									<view class="filter-item" :style="catchecid2==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cate2Click" :data-cid2="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							</block>
+
+							<view class="search-filter-btn">
+								<view class="btn" @tap="filterReset">重置</view>
+								<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</uni-drawer>
+		</scroll-view>	
+	</block>
+	<loading v-if="loading"></loading>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+	import shopList from './shop_list'
+var app = getApp();
+export default {
+	components:{
+		shopList
+	},
+  data() {
+    return {
+		homeType:0,
+		opt:{},
+		loading:false,
+		isload: true,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: true,
+		order: '',
+		field:'',
+		oldcid: "",
+		catchecid: "",
+		catchegid: "",
+		cid: "",
+		gid: '',
+		cid2:'',
+		oldcid2: "",
+		catchecid2: "",
+		clist: [],
+		clist2: [],
+		glist: [],
+		productlisttype: 'item2',
+		showfilter: "",
+		cpid:0,
+		bid:0,
+		topList:[],
+		hdHeight: 0, // 头部高度
+		timeOut: null,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getTopSerach();
+		this.oldcid = this.opt.cid || '';
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.cid2 = this.opt.cid2 || '';
+		this.oldcid2 = this.opt.cid2 || '';
+		this.catchecid2 = this.opt.cid2;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		this.bid = this.opt.bid ? this.opt.bid : 0;
+		if(this.opt.keyword) {
+			this.keyword = this.opt.keyword;
+		}
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用商品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list');
+  },
+  onReady() {
+  	this.getHdHeight();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+	// 获取头部的高度
+	getHdHeight() {
+		uni.createSelectorQuery().select('.pages-hd').boundingClientRect(data => {
+			this.hdHeight = data.height;
+			// console.log("this.hdHeight",this.hdHeight)
+		}).exec();
+	},
+	// 清空搜索
+	delSearch() {
+		this.keyword = "";
+	},
+	// 获取店铺列表
+	  getDataList: function (loadmore) {
+	  		if(!loadmore){
+	  			this.pagenum = 1;
+	  			this.datalist = [];
+	  		}
+	    var that = this;
+	    var pagenum = that.pagenum;
+		that.history_show = false;
+	    var keyword = that.keyword;
+	  		that.loading = true;
+	  		that.nodata = false;
+	  		that.nomore = false;
+	    app.post('ApiBusiness/blist', {pagenum: pagenum,keyword: keyword}, function (res) {
+	      that.loading = false;
+	  			// uni.stopPullDownRefresh();
+	      var data = res.data;
+	      if (pagenum == 1) {
+	        that.datalist = data;
+	        if (data.length == 0) {
+	          that.nodata = true;
+	        }
+	      }else{
+	        if (data.length == 0) {
+	          that.nomore = true;
+	        } else {
+	          var datalist = that.datalist;
+	          var newdata = datalist.concat(data);
+	          that.datalist = newdata;
+	        }
+	      }
+	    });
+	  },
+	// 商品，店铺切换tabbar
+	  homeTypeFn(e){
+		  this.homeType = e;
+		  this.datalist = [];
+		  if(e === 0){
+			  this.getprolist()
+		  }else{
+			  this.getDataList()
+		  }
+		this.timeOut = setTimeout(() => {
+			this.getHdHeight();
+		})
+	  },
+	// 获取热搜商品
+	  getTopSerach:function(){
+		  var that = this;
+		app.get('ApiShop/goodsHotSearch', {'cece':'cece'}, function (res) {
+			
+		  that.topList = res.data
+		});
+	  },
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var cid2 = that.cid2;
+			that.loading = true;
+			app.get('ApiShop/prolist', {cid: cid,gid: gid,bid:bid,cid2:cid2}, function (res) {
+				that.loading = false;
+			  that.clist = res.clist;
+			  that.clist2 = res.clist2;
+			  that.glist = res.glist;
+				that.loaded();
+				that.getprolist();
+			});
+		},
+	// 获取商品列表
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+			var cid2 = that.cid2;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			var bid = that.opt.bid ? that.opt.bid : '';
+      app.post('ApiShop/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cid2:cid2,cpid:cpid,bid:bid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+	scrollBot() { 
+		if(this.homeType === 0){
+			if (!this.nodata && !this.nomore &&!this.history_show) {
+			this.pagenum = this.pagenum + 1;
+			this.getprolist();
+			}
+		}else{
+			if (!this.nodata && !this.nomore&&!this.history_show) {
+			this.pagenum = this.pagenum + 1;
+			this.getDataList(true);
+			}
+		}
+	},
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+		searchFocus: function (e) {
+      this.history_show = true;
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+	  that.searchproduct();
+	  this.timeOut = setTimeout(() => {
+		  this.getHdHeight();
+	  })
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+	  if(this.homeType === 0){
+		  that.getprolist();
+	  }else{
+	  		  that.getDataList();
+	  }
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    groupClick: function (e) {
+      var that = this;
+      var gid = e.currentTarget.dataset.gid;
+			if(gid === true) gid = '';
+      that.catchegid = gid
+    },
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+			if(cid === true) cid = '';
+      that.catchecid = cid
+    },
+    cate2Click: function (e) {
+      var that = this;
+      var cid2 = e.currentTarget.dataset.cid2;
+			if(cid2 === true) cid2 = '';
+      that.catchecid2 = cid2
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.cid2 = this.catchecid2;
+			this.gid = this.catchegid;
+			this.searchproduct();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchecid2 = this.oldcid2;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list");
+    }
+  },
+  beforeDestroy() {
+	clearTimeout(this.timeOut);
+},
+};
+</script>
+<style lang="scss">
+	
+	.shop_head{
+	display: flex;
+	justify-content: space-around;
+	padding: 4rpx 150rpx 20rpx;
+	color: #333;
+	font-size: 28rpx;
+	
+	.itemz{
+		font-size: 32rpx;
+		color: #0A5D3B;
+		font-weight: bold;
+	}
+	}
+	.rsbox{
+		padding: 30rpx;
+		.title{
+			font-size: 32rpx; font-weight: bold; color: #333;
+		}
+		.item_box{
+			.item{
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+			  .left{
+				  width: 100rpx;
+				  height: 100rpx;
+				  image{
+					  border-radius: 10rpx;
+					  width: 100%;
+					  height: 100%;
+				  }
+			  }
+			  .right{
+				  height: 100rpx;
+				  flex: 1;
+				  display: flex;
+				  align-items: center;
+				  margin-left: 20rpx;
+				  justify-content: space-between;
+				  border-bottom: 1px solid #EBEBEB;
+				  overflow: hidden;
+				  color: #333;
+				  .right_left{
+					 // width: 80%;
+					 flex: 1;
+					  overflow: hidden;
+					  text-overflow:ellipsis;
+					  white-space: nowrap;
+				  }
+				  .right_right{
+					  // width: 20%;
+					  .iconfont{
+						  font-size: 50rpx;
+						  color: #999;
+					  }
+				  }
+			  }
+			}
+		}
+	}
+	.container{
+		background: #F4F4F4;
+	}
+.pages-hd {
+	background: #FFF;
+}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height:72rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1;padding-right: 12rpx;}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 16rpx;font-size:28rpx;color:#333;}
+.topsearch .search-btn{display:flex;align-items:center;color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.icon-shanchu {
+	font-size: 48rpx;
+	color: #cccccc;
+}
+.product-hot {
+	height: 100%;
+	background: #FFF;
+}
+.shop-list {
+	padding: 20rpx;
+}
+.search-navbar {
+	background: #fff;
+	.iconfont{
+	   // font-size: 16prx;
+	   color: #999;
+	}
+	.itemz{
+	   // color:#efbd
+	  
+	   // font-size: 36rpx;
+	   .txt{
+			font-size: 28rpx;
+			font-weight: bold;
+			z-index: 1;
+			color: #333333;
+	   }
+	   .heng{
+		   display: flex;
+		   width: 42rpx;
+		   height: 6rpx;
+		   background-color: #0A5D3B;
+		   border-radius: 6rpx;
+		   position: absolute;
+		   bottom: 10rpx;
+		   
+	   }
+	   
+	}
+	display: flex;text-align: center;align-items:center;
+
+
+}
+.search-navbar-item {
+	display: flex;
+	justify-content: center;
+	flex: 1;height: 62rpx; line-height: 40rpx;position: relative;font-size:24rpx;color:#999999}
+
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {
+	display: inline-block;width: 120rpx;height: 60rpx;line-height: 60rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;padding: 0 12rpx;box-sizing: border-box;margin: 0 20rpx 20rpx 0;background: #F7F7F7;border-radius: 30rpx;font-size: 24rpx;color: #666;text-align: center;
+	&:last-child {
+		margin-right: 0;
+	}
+}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 30rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%; padding-top: 20rpx; font-size:26rpx;padding:20rpx 24rpx 0;}
+</style>
\ No newline at end of file
diff --git a/pages/shop/shop_list.vue b/pages/shop/shop_list.vue
new file mode 100644
index 0000000..d92d758
--- /dev/null
+++ b/pages/shop/shop_list.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="content">
+		<view class="item" v-for="(item,index) in list" :key='index'>
+			<view class="top"  @click="toShop(item.id)">
+			    <view class="tl">
+			    	<view class="t1" @click="toShop(item.id)">
+			    		<image :src="item.logo" mode=""></image>
+			    	</view>
+			    	<view class="t2">
+			    		<view class="t2t">
+			    			{{item.name}}
+			    		</view>
+			    		<view class="t2b">
+			    			关注数 {{item.followCount}}
+			    		</view>
+			    	</view>
+			    </view>
+				<view class="t3">
+					进店
+				</view>
+			</view>
+			<view class="bottom">
+				<scroll-view  class="scroll-box" scroll-x="true">
+				<view class="scroll-view">
+					<view class="items" @click="toDetail(itemz.id)" v-for="(itemz,indexz) in item.prolist" :key='indexz'>
+						 <image :src="itemz.pic" mode=""></image>
+						<view class="mo">
+							￥{{itemz.sell_price}}
+						</view>
+					</view>
+				</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default{
+	props:{
+		list:{
+			default:()=>{
+				return[]
+			}
+		},
+	},
+	mounted: function() {
+		console.log("店铺信息=====",this.list)
+	},
+	methods:{
+		toShop(id){
+			uni.navigateTo({
+				url:'/pagesA/shop/index?id='+id
+				// url:'/pages/business/index?id='+id
+			})
+		},
+		toDetail(id){
+			uni.navigateTo({
+				url:'/pages/shop/product?id='+id
+			})
+		}
+	},
+}
+</script>
+
+<style lang="scss">
+	.item {
+		padding: 20rpx;
+		// border: 1px sol#000000;
+		box-shadow:  0 4rpx 8rpx 0 rgba(0,0,0,0.03);
+		margin-bottom: 24rpx;
+		border-radius: 12rpx;
+		background: #FFF;
+		.bottom{
+			margin-top: 20rpx;
+			.scroll-box {
+				& ::-webkit-scrollbar {
+					display: none;
+				}
+			}
+			.scroll-view  {
+				// width: 100%;
+				// overflow: hidden;
+				 white-space: nowrap;
+				// display: flex;
+				.items{
+					border-radius: 16rpx;
+					display: inline-block;
+					width: 208rpx;
+					height: 208rpx;
+					margin-right: 16rpx;
+					position: relative;
+					image{
+						width: 100%;
+						height: 100%;
+						border-radius: 6rpx;
+					}
+					.mo{
+						position: absolute;
+						height: 32rpx;
+						line-height: 32rpx;
+						font-size: 24rpx;
+						padding: 0 14rpx;
+						border-radius: 16rpx;
+						background-color: rgba($color: #000000, $alpha: 0.4);
+						right: 0;
+						bottom: 16rpx;
+						color: #fff;
+					}
+				}
+			}
+		}
+		.top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			.tl{
+				display: flex;
+				flex: 1;
+				margin-right: 20rpx;
+			}
+
+			.t1 {
+				image {
+					width: 76rpx;
+					height: 76rpx;
+					border-radius: 50%;
+					margin-right: 14rpx;
+				}
+			}
+
+			.t2 {
+				.t2t {
+					font-size: 28rpx;
+					font-weight: bold;
+					margin-bottom: 4rpx;
+				}
+
+				.t2b {
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+
+			.t3 {
+				width: 96rpx;
+				height: 48rpx;
+				line-height: 48rpx;
+				text-align: center;
+				border-radius: 24rpx;
+				box-sizing: border-box;
+				padding: 0rpx 10rpx;
+				background: linear-gradient(to right,#00AE68, #096742);
+				color: #FFFFFF;
+				flex-shrink: 0;
+			}
+		}
+	}
+</style>
diff --git a/pages/sign/index.vue b/pages/sign/index.vue
new file mode 100644
index 0000000..1e83a1b
--- /dev/null
+++ b/pages/sign/index.vue
@@ -0,0 +1,129 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="qd_head">
+			<image :src="pre_url + '/static/img/sign-bg.png'" class="qdbg"></image>
+			<view class="myscore"><view class="f1">{{userinfo.score}}</view><view class="f2">{{t('积分')}}</view></view>
+			<view class="signlog" @tap="goto" data-url="signrecord">签到记录</view>
+			
+			<view class="signbtn" v-if="!hassign">
+				<button class="btn" :style="{background:t('color1')}" @tap="signin">立即签到</button>
+			</view>
+			<view class="signbtn" v-else>
+				<button class="btn2">今日已签到</button>
+				<view class="signtip">已连续签到{{userinfo.signtimeslx}}天</view>
+			</view>
+		</view>
+
+		<view class="qd_guize">
+			<view class="gztitle"> — 签到规则 — </view>
+			<view class="guize_txt">
+				<parse :content="signset.guize" />
+			</view>
+		</view>
+		<!-- <view class="qd_guize">
+			<view class="gztitle"> — 签到排名 — </view>
+			<view class="content">
+				<view v-for="(item, index) in list" :key="index" class="item">
+					<view class="f1">
+							<text class="t1">{{item.nickname}}</text>
+					</view>
+					<view class="f2">
+						    <text class="t2">连续签到</text>
+							<text class="t1">{{item.signtimeslx}}</text>
+							<text class="t2">天</text>
+					</view>
+				</view>
+			</view>
+		</view> -->
+		
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+            isload: false,
+			menuindex:-1,
+			pre_url:app.globalData.pre_url,
+			hassign:false,
+			signset:{},
+			userinfo:{},
+			list: [],
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiSign/index', {}, function (res) {
+				that.loading = false;
+				that.hassign = res.hassign;
+				that.signset = res.signset;
+				that.userinfo = res.userinfo;
+				//that.list = res.list;
+				that.loaded();
+			});
+		},
+    signin: function () {
+      var that = this;
+      app.post('ApiSign/signin', {}, function (data) {
+        if (data.status == 1) {
+          app.success('+' + data.scoreadd + that.t('积分'));
+          that.getdata();
+        } else {
+          app.alert(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+page{background:#f4f4f4}
+.qd_head{width: 100%;height:940rpx;position: relative;}
+.qdbg{width: 100%;height:940rpx;}
+.myscore{position:absolute;top:60rpx;width:100%;display:flex;color:#fff;flex-direction:column;align-items:center;z-index:2}
+.myscore .f1{font-size:56rpx;font-weight:bold}
+.myscore .f2{font-size:32rpx}
+.signlog{position:absolute;top:50rpx;right:20rpx;color:#fff;font-size:28rpx;z-index:2}
+.signbtn{position:absolute;top:760rpx;width:100%;display:flex;flex-direction:column;align-items:center;z-index:2}
+.signbtn .btn{width:440rpx;height:80rpx;border-radius:40rpx;font-size:32rpx;font-weight:bold;color:#fff}
+.signbtn .btn2{width:440rpx;height:80rpx;background:#FCB0B0;border-radius:40rpx;font-size:32rpx;font-weight:bold;color:#fff}
+.signbtn .signtip{color:#999999;margin-top:20rpx}
+
+.qd_guize{width:100%;margin:0;margin-bottom:20rpx}
+.qd_guize .gztitle{width:100%;text-align:center;font-size:32rpx;color:#656565;font-weight:bold;height:100rpx;line-height:100rpx}
+.guize_txt{box-sizing: border-box;padding:0 30rpx;line-height:42rpx;}
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{flex:1;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+</style>
\ No newline at end of file
diff --git a/pages/sign/signrecord.vue b/pages/sign/signrecord.vue
new file mode 100644
index 0000000..9f6f30b
--- /dev/null
+++ b/pages/sign/signrecord.vue
@@ -0,0 +1,114 @@
+<template>
+<view class="container">
+	<view class="content">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+					<text class="t1">{{item.remark}}</text>
+					<text class="t2">{{item.createtime}}</text>
+			</view>
+			<view class="f2">
+					<text class="t1">+{{item.score}}</text>
+			</view>
+		</view>
+	</view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nomore:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			this.nomore = false;
+			this.nodata = false;
+			that.loading = true;
+      app.post('ApiSign/signrecord', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        } else {
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{flex:1;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+</style>
\ No newline at end of file
diff --git a/pages/store/detail.vue b/pages/store/detail.vue
new file mode 100644
index 0000000..571fb9d
--- /dev/null
+++ b/pages/store/detail.vue
@@ -0,0 +1,211 @@
+<template>
+	<view class="store-detail">
+		<view class="attention">
+			<view class="attention-box">
+				<view class="attention-l">
+					<image class="attention-l-img" :src="info.logo" mode=""></image>
+					<view class="attention-l-text">
+						<text class="attention-l-title">{{info.name}}</text>
+						<view class="attention-l-text-s">
+							<text class="">粉丝数 {{info.fans_count}}</text>
+							<!-- <text class="icon_arrow_right iconfont icon-arrow-right"></text> -->
+						</view>
+					</view>
+				</view>
+				<view :style="{border:info.isFollow?'1px solid #efbd6f':'',color:info.isFollow?'#efbd6f':'#fff','background-color':info.isFollow?'':t('color1')}" class="attention-r" @click="followFn">
+					<text class="attention-r-text">{{info.isFollow?'已关注':'关注'}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="store-detail-conten">
+			<view class="detail-conten-b">
+				<view class="detail-conten-c" style="letter-spacing:rpx;">
+					<view class="detail-conten-t">
+						<view class="detail-conten-t-tilt">店铺简介</view>
+						<view class="detail-conten-t-text" >{{info.content}}</view>
+					</view>
+					<view class="detail-conten-t">
+						<view class="detail-conten-t-tilt">店铺地址</view>
+						<view class="detail-conten-t-text">{{info.address}}</view>
+					</view>
+					
+					<view class="detail-conten-t">
+						<view class="detail-conten-t-tilt">开店时间</view>
+						<view class="detail-conten-t-text">{{info.createtime}}</view>
+					</view>
+					
+					<view class="detail-conten-t">
+						<view class="detail-conten-t-tilt">营业时间</view>
+						<view class="detail-conten-t-text">{{info.start_hours||''}}-{{info.end_hours||''}}</view>
+					</view>
+					<view class="detail-conten-t">
+						<view class="detail-conten-t-tilt">联系电话</view>
+						<view class="detail-conten-t-text">{{info.tel}}</view>
+					</view>
+					
+				</view>
+				<button class="btn"  @tap="goback">去看看全部商品</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				info:{},
+				isattention: true,
+			}
+		},
+		onLoad(opt) {
+			this.opt = opt
+			this.getInfo();
+		},
+		methods: {
+			goback(){
+				uni.navigateBack(1)
+			},
+			followFn(){
+					  var that = this;
+					 app.post('ApiMy/addFollow', {follow_id: that.opt.id ||'',type:'store'}, function (res) {
+					 	  
+					     console.log(res)	
+						 uni.showToast({
+						 	title:res.msg,
+							icon:'none'
+						 })
+						 that.getInfo()
+					 				 // that.info = res.business
+					 	  
+					 }) 
+			},
+			getInfo(){
+				var that = this;
+				 app.get('ApiBusiness/newIndex', {id: that.opt.id ||''}, function (res) {
+				  
+			         console.log(res)	
+					 that.info = res.business
+				  
+				 })
+			  },
+			attention() {
+				this.isattention = !this.isattention
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.store-detail {
+		letter-spacing:2rpx;
+		color: #333;
+		.attention {
+			padding: 30rpx 20rpx;
+			
+			.attention-box {
+				padding: 30rpx 20rpx;
+				background: #fff;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				border-radius: 10rpx;
+				
+				.attention-l {
+					display: flex;
+					align-items: center;
+					
+					.attention-l-img {
+						width: 120rpx;
+						height: 120rpx;
+						border-radius: 16rpx;
+					}
+					.attention-l-text {
+						height: 100%;
+						padding-left: 20rpx;
+						display: flex;
+						flex-direction: column;
+						.attention-l-title {
+							font-size: 30rpx;
+							font-weight: bold;
+						}
+						.attention-l-text-s {
+							padding-top: 10rpx;
+							display: flex;
+							align-items: center;
+							font-size: 24rpx;
+							color: #bdbdbd;
+							
+							.icon_arrow_right {
+								padding-left: 20rpx;
+							}
+						}
+						
+					}
+				}
+				.attention-r {
+					width: 120rpx;
+					height: 54rpx;
+					line-height: 54rpx;
+					text-align: center;
+					// background-color: #EFBD6F;
+					// color: #fff;
+					color: #ccc;
+					border-radius: 8rpx;
+				}
+			}
+		}
+		
+		.store-detail-conten {
+			padding: 0 20rpx;
+			.detail-conten-b {
+				display: flex;
+				flex-direction: column;
+				border-radius: 10rpx;
+				background-color: #fff;
+				
+				.detail-conten-c {
+					min-height: 400rpx;
+					padding:0 20rpx ;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-evenly;
+				}
+				.detail-conten-t {
+					display: flex;
+					// align-items: center;
+					.detail-conten-t-tilt {
+						width: 150rpx;
+						font-weight: bold;
+						font-size: 30rpx;
+					}
+					
+					.detail-conten-t-text {
+						flex: 1;
+						// color: #bdbdbd;
+						padding-top: 4rpx;
+						// font-weight: bold;
+						color: #111111;
+					}
+				}
+				
+				.btn {
+					font-size: 30rpx; font-weight: bold;
+					width: 650rpx;
+					margin: 30rpx auto;
+					border-radius: 400rpx;
+					height: 70rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background-image: linear-gradient(to right, #fbd89e , #eec071);
+					color: #fff;
+				}
+			}
+
+		}
+	}
+</style>
diff --git a/pages/yuebao/withdraw.vue b/pages/yuebao/withdraw.vue
new file mode 100644
index 0000000..3197368
--- /dev/null
+++ b/pages/yuebao/withdraw.vue
@@ -0,0 +1,242 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+        <form @submit="formSubmit">
+            <view class="mymoney" :style="{background:t('color1')}">
+                <view class="f1">我的{{t('余额宝')}}收益</view>
+                <view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.yuebao_money}}</view>
+                <view class="f3" @tap="goto" data-url="yuebaolog?st=1"><text>提现记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+            </view>
+            <view class="content2">
+                <view class="item2"><view class="f1">提现金额(元)</view></view>
+                <view class="item3"><view class="f1">￥</view><view class="f2"><input class="input" type="digit" name="money" value="" placeholder="请输入提现金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput"/></view></view>
+                <view class="item4" v-if="sysset.yuebao_withdrawfee>0 || sysset.yuebao_withdrawmin>0">
+                    <text v-if="sysset.yuebao_withdrawmin>0" style="margin-right:10rpx">最低提现金额{{sysset.yuebao_withdrawmin}}元 </text>
+                    <text v-if="sysset.yuebao_withdrawfee>0">提现手续费{{sysset.yuebao_withdrawfee}}% </text>
+                </view>
+            </view>
+            <view class="withdrawtype">
+                <view class="f1">选择提现方式：</view>
+                <view class="f2">
+                    <view class="item" v-if="sysset.withdraw_weixin==1" @tap.stop="changeradio" data-paytype="微信钱包">
+                        <view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信钱包</view>
+                        <view class="radio" :style="paytype=='微信钱包' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+                    </view>
+                    <label class="item" v-if="sysset.withdraw_aliaccount==1" @tap.stop="changeradio" data-paytype="支付宝">
+                        <view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝</view>
+                        <view class="radio" :style="paytype=='支付宝' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+                    </label>
+                    <label class="item" v-if="sysset.withdraw_bankcard==1" @tap.stop="changeradio" data-paytype="银行卡">
+                        <view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-cash.png'"/>银行卡</view>
+                        <view class="radio" :style="paytype=='银行卡' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+                    </label>
+                </view>
+            </view>
+            <button class="opbtn2" v-if="sysset.yuebao_turn_yue=='1'" @tap="tomoney">直接转到账户{{t('余额')}}</button>
+            <button class="btn" @tap="formSubmit" :style="{background:t('color1')}">立即提现</button>
+            
+            <view v-if="paytype=='支付宝'" style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="/pages/my/setaliaccount">设置支付宝账户<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+            <view v-if="paytype=='银行卡'" style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="/pages/my/setbankinfo">设置银行卡账户<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+        </form>
+        <uni-popup id="dialogInput" ref="dialogInput" type="dialog">
+        	<uni-popup-dialog mode="input" :title="t('余额宝') + '收益转' + t('余额')" value="" placeholder="请输入转入金额" @confirm="tomonenyconfirm"></uni-popup-dialog>
+        </uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+    data() {
+        return {
+            opt:{},
+            loading:false,
+            isload: false,
+            menuindex:-1,
+            
+            userinfo: [],
+            sysset: false,
+            paytype: '微信钱包',
+            show: 0,
+            money:0,
+            tmplids:[],
+			
+			event_rul: app.globalData.event_url,
+                
+        };
+    },
+
+    onShow: function (opt) {
+        this.opt = app.getopts(opt);
+        this.getdata();
+    },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+    methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/yuebao_withdraw', {}, function (res) {
+                if(res.status == 1){
+                    that.loading = false;
+                    uni.setNavigationBarTitle({
+                    	title: that.t('余额宝') + '提现'
+                    });
+                    that.userinfo = res.userinfo;
+                    that.sysset = res.sysset;
+                    that.tmplids = res.tmplids;
+                    var sysset = res.sysset;
+                    var paytype = '微信钱包';
+                    if (sysset.withdraw_weixin == 1) {
+                    	paytype = '微信钱包';
+                    }
+                    if (!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) {
+                    	paytype = '支付宝';
+                    }
+                    if ((!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) && (!sysset.withdraw_aliaccount || sysset.withdraw_aliaccount == 0)) {
+                    	paytype = '银行卡';
+                    }
+                    that.paytype = paytype;
+                    that.loaded();
+                }else{
+                    app.error(res.msg);
+                }
+				
+			});
+		},
+        moneyinput: function (e) {
+            var usermoney = parseFloat(this.userinfo.yuebao_money);
+            var money = parseFloat(e.detail.value);
+            if (money < 0) {
+                app.error('必须大于0');
+            } else if (money > usermoney) {
+                app.error('可提现' + this.t('余额宝') + '收益不足');
+            }
+            this.money = money;
+        },
+        changeradio: function (e) {
+            var that = this;
+            var paytype = e.currentTarget.dataset.paytype;
+            that.paytype = paytype;
+        },
+        formSubmit: function () {
+            var that = this;
+            var usermoney = parseFloat(this.userinfo.yuebao_money);
+            var withdrawmin = parseFloat(this.sysset.yuebao_withdrawmin); //var formdata = e.detail.value;
+            var money = parseFloat(that.money);
+            var paytype = this.paytype;
+            if (isNaN(money) || money <= 0) {
+                app.error('提现金额必须大于0');
+                return;
+            }
+            if (withdrawmin > 0 && money < withdrawmin) {
+                app.error('提现金额必须大于¥' + withdrawmin);
+                return;
+            }
+            if (money > usermoney) {
+                app.error(this.t('余额宝') + '收益不足');
+                return;
+            }
+            if (paytype == '支付宝' && !this.userinfo.aliaccount) {
+                app.alert('请先设置支付宝账号', function () {
+                  app.goto('/pages/my/setaliaccount');
+                });
+                return;
+            }
+            if (paytype == '银行卡' && (!this.userinfo.bankname || !this.userinfo.bankcarduser || !this.userinfo.bankcardnum)) {
+                app.alert('请先设置完整银行卡信息', function () {
+                  app.goto('/pages/my/setbankinfo');
+                });
+                return;
+            }
+            app.showLoading('提交中');
+            app.post('ApiMy/yuebao_withdraw', {money: money,paytype: paytype}, function (res) {
+                app.showLoading(false);
+                if (res.status == 0) {
+                  app.error(res.msg);
+                  
+                  return;
+                } else {
+                  app.success(res.msg);
+                  that.subscribeMessage(function () {
+                    setTimeout(function () {
+                      app.goto('yuebaolog?st=1');
+                    }, 1000);
+                  });
+                }
+            });
+        },
+        tomoney: function () {
+          this.$refs.dialogInput.open()
+        },
+        tomonenyconfirm: function (done, val) {
+            console.log(val)
+            var that = this;
+            var money = val;
+            if (money == '' || parseFloat(money) <= 0) {
+                app.alert('请输入转入金额');
+                return;
+            }
+            if (parseFloat(money) > this.userinfo.yuebao_money) {
+                app.alert('可转入' + that.t('余额宝') + '收益不足');
+                return;
+            }
+            done();
+            app.post('ApiMy/yuebao_turn_money', {money: money}, function (data) {
+                if (data.status == 0) {
+                    app.error(data.msg);
+                } else {
+                    that.hiddenmodalput = true;
+                    app.success(data.msg);
+                    setTimeout(function () {
+                    that.getdata();
+                    }, 1000);
+                }
+            });
+        }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:60rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.withdrawtype{width:94%;margin:20rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.withdrawtype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+
+
+.withdrawtype .f2{padding:0 30rpx}
+.withdrawtype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.withdrawtype .f2 .item:last-child{border-bottom:0}
+.withdrawtype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#333}
+.withdrawtype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.withdrawtype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.withdrawtype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold;margin-bottom: 40rpx;}
+.opbtn2{width: 90%;margin: 0 5%;margin-top: 20rpx;height: 80rpx;line-height: 80rpx;border:1px solid #eee;background:#fff;margin-bottom: 20rpx;}
+</style>
\ No newline at end of file
diff --git a/pages/yuebao/yuebaolog.vue b/pages/yuebao/yuebaolog.vue
new file mode 100644
index 0000000..ad90139
--- /dev/null
+++ b/pages/yuebao/yuebaolog.vue
@@ -0,0 +1,143 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="[t('余额宝')+'明细','提现记录']" :itemst="['0','1']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="content">
+			<block v-if="st==0">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{item.createtime}}</text>
+						<text class="t3">变更后余额: {{item.after}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t2" v-else>{{item.money}}</text>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==1">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{item.createtime}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+    data() {
+        return {
+            opt:{},
+            loading:false,
+            isload: false,
+            menuindex:-1,
+
+            canwithdraw:false,
+            textset:{},
+            st: 0,
+            datalist: [],
+            pagenum: 1,
+            nodata:false,
+            nomore: false
+        };
+    },
+
+    onLoad: function (opt) {
+        this.opt = app.getopts(opt);
+        this.st = this.opt.st || 0;
+        this.getdata();
+    },
+    onPullDownRefresh: function () {
+        this.getdata(true);
+    },
+    onReachBottom: function () {
+        if (!this.nodata && !this.nomore) {
+          this.pagenum = this.pagenum + 1;
+          this.getdata(true);
+        }
+    },
+    methods: {
+        getdata: function (loadmore) {
+            if(!loadmore){
+                this.pagenum = 1;
+                this.datalist = [];
+            }
+            var that = this;
+            var pagenum = that.pagenum;
+            var st = that.st;
+            that.nodata = false;
+            that.nomore = false;
+            that.loading = true;
+            app.post('ApiMy/yuebaolog', {st: st,pagenum: pagenum}, function (res) {
+                that.loading = false;
+                var data = res.data;
+                if (pagenum == 1) {
+                    that.textset = app.globalData.textset;
+                    uni.setNavigationBarTitle({
+                        title: that.t('余额宝') + '明细'
+                    });
+                    that.canwithdraw = res.canwithdraw;
+                    that.datalist = data;
+                    if (data.length == 0) {
+                        that.nodata = true;
+                    }
+                    that.loaded();
+                }else{
+                    if (data.length == 0) {
+                        that.nomore = true;
+                    } else {
+                        var datalist = that.datalist;
+                        var newdata = datalist.concat(data);
+                        that.datalist = newdata;
+                    }
+                }
+            });
+        },
+        changetab: function (st) {
+            this.st = st;
+            uni.pageScrollTo({
+                scrollTop: 0,
+                duration: 0
+            });
+            this.getdata();
+        },
+    }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx;display:flex;flex-direction:column}
+.content{ width:94%;margin:0 3% 20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:20rpx 20rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/pagesA/article/artlist.vue b/pagesA/article/artlist.vue
new file mode 100644
index 0000000..843acd1
--- /dev/null
+++ b/pagesA/article/artlist.vue
@@ -0,0 +1,209 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="搜索感兴趣的文章" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm"></input>
+			</view>
+		</view>
+		<dd-tab :itemdata="cnamelist" :itemst="cidlist" :st="cid" :isfixed="false" @changetab="changetab" v-if="clist.length>0"></dd-tab>
+		
+
+		<view class="article_list">
+			<!--横排-->
+			<view v-if="listtype=='0'" class="article-itemlist" v-for="(item,index) in datalist" :key="item.id" @click="goto" :data-url="'/pagesA/article/detail?id='+item.id">
+				<view class="article-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+				</view>
+				<view class="article-info">
+					<view class="p1">{{item.name}}</view>
+					<view class="p2">
+						<text style="overflow:hidden" class="flex1">{{item.createtime}}</text>
+						<text style="overflow:hidden">阅读 {{item.readcount}}</text>
+					</view>
+				</view>
+			</view>
+			<!--双排-->
+			<view v-if="listtype=='1'" class="article-item2" v-for="(item,index) in datalist" :style="{marginRight:index%2==0?'2%':'0'}" :key="item.id" @click="goto" :data-url="'/pagesA/article/detail?id='+item.id">
+				<view class="article-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+				</view>
+				<view class="article-info">
+					<view class="p1">{{item.name}}</view>
+					<view class="p2">
+						<text style="overflow:hidden" class="flex1">{{item.createtime}}</text>
+						<text style="overflow:hidden">阅读 {{item.readcount}}</text>
+					</view>
+				</view>
+			</view>
+			<waterfall-article v-if="listtype=='2'" :list="datalist" ref="waterfall"></waterfall-article>
+			<!--单排-->
+			<view v-if="listtype=='3'" class="article-item1" v-for="(item,index) in datalist" :key="item.id" @click="goto" :data-url="'/pagesA/article/detail?id='+item.id">
+				<view class="article-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+				</view>
+				<view class="article-info">
+					<view class="p1">{{item.name}}</view>
+					<view class="p2">
+						<text style="overflow:hidden" class="flex1">{{item.createtime}}</text>
+						<text style="overflow:hidden">阅读 {{item.readcount}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		nodata:false,
+		nomore:false,
+		keyword:'',
+		datalist: [],
+		pagenum: 1,
+		clist:[],
+		cnamelist:[],
+		cidlist:[],
+		datalist: [],
+		cid: 0,
+		bid: 0,
+		listtype:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.cid = this.opt.cid || 0;	
+		this.bid = this.opt.bid || 0;
+    this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nomore && !this.nodata) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var cid = that.cid;
+			console.log(cid)
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiArticle/getartlist', {bid:that.bid,cid: cid,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.listtype = res.listtype || 0;
+					that.clist = res.clist
+					if((res.clist).length > 0){
+						var cnamelist = [];
+						var cidlist = [];
+						cnamelist.push('全部');
+						cidlist.push('0');
+						for(var i in that.clist){
+							cnamelist.push(that.clist[i].name);
+							cidlist.push(that.clist[i].id);
+						}
+						that.cnamelist = cnamelist;
+						that.cidlist = cidlist;
+					}
+
+					uni.setNavigationBarTitle({
+						title: res.title
+					});
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.getdata();
+    },
+    changetab: function (cid) {
+      this.cid = cid;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+			if(this.listtype==2){
+				this.$refs.waterfall.refresh();
+			}
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+page{background:#f6f6f7}
+.topsearch{width:100%;padding:20rpx 20rpx;background:#fff}
+.topsearch .f1{height:70rpx;border-radius:35rpx;border:0;background-color:#f5f5f5;flex:1;overflow:hidden}
+.topsearch .f1 image{width:30rpx;height:30rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;background-color:#f5f5f5;}
+
+.article_list{padding:10rpx 16rpx;background:#f6f6f7;margin-top:6rpx;}
+.article_list .article-item1 {width:100%;display: inline-block;position: relative;margin-bottom:16rpx;background: #fff;border-radius:12rpx;overflow:hidden}
+.article_list .article-item1 .article-pic {width:100%;height:auto;overflow:hidden;background: #ffffff;}
+.article_list .article-item1 .article-pic .image{width: 100%;height:auto}
+.article_list .article-item1 .article-info {padding:10rpx 20rpx 20rpx 20rpx;}
+.article_list .article-item1 .article-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.article_list .article-item1 .article-info .t1{word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: block;font-size: 32rpx;}
+.article_list .article-item1 .article-info .t2{word-break: break-all;text-overflow: ellipsis;padding-top:4rpx;overflow:hidden;}
+.article_list .article-item1 .article-info .p2{flex-grow:0;flex-shrink:0;display:flex;padding:10rpx 0;font-size:24rpx;color:#a88;overflow:hidden}
+
+.article_list .article-item2 {width: 49%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;border-radius:8rpx;}
+/*.article-item2:nth-child(even){margin-right:2%}*/
+.article_list .article-item2 .article-pic {width: 100%;height:0;overflow:hidden;background: #ffffff;padding-bottom:70%;position: relative;border-radius:8rpx 8rpx 0 0;}
+.article_list .article-item2 .article-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.article_list .article-item2 .article-info {padding:10rpx 20rpx 20rpx 20rpx;display:flex;flex-direction:column;}
+.article_list .article-item2 .article-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.article_list .article-item2 .article-info .p2{flex-grow:0;flex-shrink:0;display:flex;align-items:center;padding-top:10rpx;font-size:24rpx;color:#a88;overflow:hidden}
+
+.article_list .article-itemlist {width:100%;display: inline-block;position: relative;margin-bottom:12rpx;padding:12rpx;background: #fff;display:flex;border-radius:8rpx;}
+.article_list .article-itemlist .article-pic {width: 35%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 25%;position: relative;}
+.article_list .article-itemlist .article-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.article_list .article-itemlist .article-info {width: 65%;height:172rpx;overflow:hidden;padding:0 20rpx;display:flex;flex-direction:column;justify-content:space-between}
+.article_list .article-itemlist .article-info .p1{color:#222222;font-weight:bold;font-size:28rpx;line-height:46rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:92rpx}
+.article_list .article-itemlist .article-info .p2{display:flex;flex-grow:0;flex-shrink:0;font-size:24rpx;color:#a88;overflow:hidden;padding-bottom:6rpx}
+</style>
\ No newline at end of file
diff --git a/pagesA/article/detail.vue b/pagesA/article/detail.vue
new file mode 100644
index 0000000..b8cd5f6
--- /dev/null
+++ b/pagesA/article/detail.vue
@@ -0,0 +1,237 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="container">
+			<view class="header">
+				<text class="title" v-if="detail.showname==1">{{detail.name}}</text>
+				<view class="artinfo" v-if="detail.showsendtime==1 || detail.showauthor==1 || detail.showreadcount==1">
+					<text class="t1" v-if="detail.showsendtime==1">{{detail.createtime}}</text>
+					<text class="t2" v-if="detail.showauthor==1">{{detail.author}}</text>
+					<text class="t3" v-if="detail.showreadcount==1">阅读：{{detail.readcount}}</text>
+				</view>
+				<view style="padding:8rpx 0">
+					<dp :pagecontent="pagecontent"></dp>
+				</view>
+			</view>
+		
+			<!--评论-->
+			<block v-if="detail.canpl==1">
+			<view class="plbox">
+				<view class="plbox_title"><text class="t1">评论</text><text>({{plcount}})</text></view>
+				<view class="plbox_content">
+					<block v-for="(item, idx) in datalist" :key="item.id">
+					<view class="item1 flex">
+						<view class="f1 flex0"><image :src="item.headimg"></image></view>
+						<view class="f2 flex-col">
+							<text class="t1">{{item.nickname}}</text>
+							<view class="t2 plcontent"><rich-text :nodes="item.content"></rich-text></view>
+							<block v-if="item.replylist.length>0">
+							<view class="relist">
+								<block v-for="(hfitem, index) in item.replylist" :key="index">
+								<view class="item2">
+									<view>{{hfitem.nickname}}：</view>
+									<view class="f2 plcontent"> <rich-text :nodes="hfitem.content"></rich-text></view>
+								</view>
+								 </block>
+							</view>
+							</block>
+							<view class="t3 flex">
+								<text>{{item.createtime}}</text>
+								<view class="flex1"><text v-if="detail.canplrp==1" class="phuifu" style="cursor:pointer" @tap="goto" :data-url="'pinglun?type=1&id=' + detail.id + '&hfid=' + item.id">回复</text></view>
+								<view class="flex-y-center pzan" @tap="pzan" :data-id="item.id" :data-index="idx"><image :src="event_rul +'/static/img/static/img/zan-' + (item.iszan==1?'2':'1') + '.png'"></image>{{item.zan}}</view>
+							</view>
+						</view>
+					</view>
+					</block>
+				</view>
+				<!-- <nodata v-if="nodata"></nodata> -->
+				<!-- <nomore v-if="nomore"></nomore> -->
+				<loading v-if="loading"></loading>
+			</view>
+			<view style="height:160rpx"></view>
+			<view class="pinglun notabbarbot">
+				<view class="pinput" @tap="goto" :data-url="'pinglun?type=0&id=' + detail.id">发表评论</view>
+				<view class="zan flex-y-center" @tap="zan" :data-id="detail.id">
+					<image :src="event_rul +'/static/img/static/img/zan-' + (iszan?'2':'1') + '.png'"/><text style="padding-left:2px">{{detail.zan}}</text>
+				</view>
+				<block v-if="detail.btntxt && detail.btnurl">
+						<view class="buybtn" style="cursor:pointer" :onclick="'location.href=' + detail.btnurl">{{detail.btntxt}}</view>
+				</block>
+			</view>
+			</block>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		detail:[],
+		datalist: [],
+		pagenum: 1,
+		id: 0,
+		pagecontent: "",
+		title: "",
+		sharepic: "",
+		nodata:false,
+		nomore:false,
+		iszan: "",
+		plcount:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+    this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.detail.name,desc:this.detail.subname,pic:this.detail.pic});
+	},
+	onShareTimeline:function(){
+		var sharewxdata = this._sharewx({title:this.detail.name,desc:this.detail.subname,pic:this.detail.pic});
+		var query = (sharewxdata.path).split('?')[1];
+		return {
+			title: sharewxdata.title,
+			imageUrl: sharewxdata.imageUrl,
+			query: query
+		}
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore && this.detail.canpl==1) {
+      this.pagenum = this.pagenum + 1
+      this.getpllist();
+    }
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiArticle/detail', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 1){
+					that.detail = res.detail;
+					that.pagecontent = res.pagecontent;
+					that.plcount = res.plcount;
+					that.iszan = res.iszan;
+					that.title = res.detail.name;
+					that.sharepic = res.detail.pic;
+					uni.setNavigationBarTitle({
+						title: res.detail.name
+					});
+				} else {
+					app.alert(res.msg);
+				}
+				that.pagenum = 1;
+				that.datalist = [];
+				that.getpllist();
+				that.loaded({title:res.detail.name,desc:res.detail.subname,pic:res.detail.pic});
+			});
+		},
+    getpllist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiArticle/getpllist', {pagenum: pagenum,id: that.detail.id}, function (res) {
+				that.loading = false;
+        var data = res.data;
+				if (data.length == 0) {
+					if(pagenum == 1){
+						that.nodata = true;
+					}else{
+						that.nomore = true;
+					}
+				}
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+      });
+    },
+    zan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      app.post("ApiArticle/zan", {id: id}, function (res) {
+        if (res.type == 0) {
+          //取消点赞
+          var iszan = 0;
+        } else {
+          var iszan = 1;
+        }
+        that.iszan = iszan;
+        that.detail.zan = res.zancount;
+      });
+    },
+    pzan: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var index = e.currentTarget.dataset.index;
+      var datalist = that.datalist;
+      app.post("ApiArticle/pzan", {id: id}, function (res) {
+        if (res.type == 0) {
+          //取消点赞
+          var iszan = 0;
+        } else {
+          var iszan = 1;
+        }
+
+        datalist[index].iszan = iszan;
+        datalist[index].zan = res.zancount;
+        that.datalist = datalist;
+      });
+    }
+  }
+};
+</script>
+<style>
+.header{ background-color: #fff;padding: 10rpx 20rpx 0 20rpx;position: relative;display:flex;flex-direction:column;}
+.header .title{width:100%;font-size: 36rpx;color:#333;line-height: 1.4;margin:10rpx 0;margin-top:20rpx;font-weight:bold}
+.header .artinfo{width:100%;font-size:28rpx;color: #8c8c8c;font-style: normal;overflow: hidden;display:flex;margin:10rpx 0;}
+.header .artinfo .t1{padding-right:8rpx}
+.header .artinfo .t2{color:#777;padding-right:8rpx}
+.header .artinfo .t3{text-align:right;flex:1;}
+.header .subname{width:100%;font-size:28rpx;color: #888;border:1px dotted #ddd;border-radius:10rpx;margin:10rpx 0;padding:10rpx}
+
+
+.pinglun{ width:96%;max-width:750px;margin:0 auto;position:fixed;display:flex;align-items:center;bottom:0;left:0;right:0;height:100rpx;background:#fff;z-index:995;border-top:1px solid #f7f7f7;padding:0 2%;box-sizing:content-box}
+.pinglun .pinput{flex:1;color:#a5adb5;font-size:32rpx;padding:0;line-height:100rpx}
+.pinglun .zan{padding:0 12rpx;line-height:100rpx}
+.pinglun .zan image{width:48rpx;height:48rpx}
+.pinglun .zan span{height:40rpx;line-height:50rpx;font-size:32rpx}
+.pinglun .buybtn{margin-left:0.08rpx;background:#31C88E;height:72rpx;line-height:72rpx;padding:0 20rpx;color:#fff;border-radius:6rpx}
+
+.plbox{width:100%;padding:40rpx 20rpx;background:#fff;margin-top:10px}
+.plbox_title{font-size:28rpx;height:60rpx;line-height:60rpx;margin-bottom:20rpx}
+.plbox_title .t1{color:#000;font-weight:bold}
+.plbox_content .plcontent{vertical-align: middle;color:#111}
+.plbox_content .plcontent image{ width:44rpx;height:44rpx;vertical-align: inherit;}
+.plbox_content .item1{width:100%;margin-bottom:20rpx}
+.plbox_content .item1 .f1{width:80rpx;}
+.plbox_content .item1 .f1 image{width:60rpx;height:60rpx;border-radius:50%}
+.plbox_content .item1 .f2{flex:1}
+.plbox_content .item1 .f2 .t1{}
+.plbox_content .item1 .f2 .t2{color:#000;margin:10rpx 0;line-height:60rpx;}
+.plbox_content .item1 .f2 .t3{color:#999;font-size:20rpx}
+.plbox_content .item1 .f2 .pzan image{width:32rpx;height:32rpx;margin-right:2px}
+.plbox_content .item1 .f2 .phuifu{margin-left:6px;color:#507DAF}
+.plbox_content .relist{width:100%;background:#f5f5f5;padding:4rpx 20rpx;margin-bottom:20rpx}
+.plbox_content .relist .item2{font-size:24rpx;margin-bottom:10rpx}
+
+.copyright{display:none}
+</style>
\ No newline at end of file
diff --git a/pagesA/article/pinglun.vue b/pagesA/article/pinglun.vue
new file mode 100644
index 0000000..abc65d0
--- /dev/null
+++ b/pagesA/article/pinglun.vue
@@ -0,0 +1,135 @@
+<template>
+<view class="container">
+	<view class="box2">
+		<view class="header">
+			<view class="f1" @tap="goback"><image :src="event_rul + '/static/img/static/img/arrowright.png'" style="width:40rpx;height:40rpx;transform:rotateY(180deg)"/></view>
+			<view class="f2" id="box2_title">{{title}}</view>
+			<view class="f3" @tap="subpinglun">发表</view>
+		</view>
+		<textarea style="width:100%;height:50vh" placeholder="写评论..." id="editcontent" :value="content" @input="setcontent"></textarea>
+		<view style="height:100rpx"></view>
+		<view class="bottom notabbarbot">
+			<view @tap="showface"><image :src="event_rul + '/static/img/static/img/emote.png'"></image></view>
+		</view>
+		<wxface v-if="faceshow" @selectface="selectface"></wxface>
+	</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url: app.globalData.pre_url,
+		title: '发表评论',
+		type: 0,
+		id: '',
+		hfid: '',
+		faceshow: false,
+		content: '',
+
+		event_rul: app.globalData.event_url,
+    }
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+    var that = this;
+    that.type = that.opt.type;
+		that.id = that.opt.id;
+		that.hfid = that.opt.hfid;
+    if(that.hfid){
+      that.title = '回复评论'
+    }
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.loading = true;
+			app.get('ApiArticle/detail',{id:this.id},function(res){
+				that.loading = false;
+				uni.setNavigationBarTitle({
+					title: res.detail.name
+				});
+				that.loaded();
+			})
+		},
+    showface: function () {
+      this.faceshow = !this.faceshow
+    },
+    selectface: function (face) {
+      var content = this.content + face;
+      this.faceshow = false;
+      this.content = content;
+    },
+    setcontent: function (e) {
+      this.content = e.detail.value;
+    },
+    subpinglun: function () {
+      var that = this;
+      var id = that.id;
+      var type = that.type;
+      var hfid = that.hfid;
+      var content = that.content;
+      if (content == '') {
+        app.error('请输入评论内容');
+        return;
+      }
+      app.showLoading('提交中');
+      app.post("ApiArticle/subpinglun", {id: id,type: type,hfid: hfid,content: content}, function (res) {
+        app.showLoading(false);
+        if (res.status == 1) {
+          app.success(res.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        } else {
+          app.error(res.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+/* m/dietitian/detail.wxss */
+page{ background: #fff}
+
+.box2{background:#fff;height:100vh;}
+.box2 .header{width:100%;height:92rpx;line-height:92rpx;background:#fafafa;border-bottom:1px solid #cfcfcf;display:flex;text-align:center}
+.box2 .header .f1{width:80rpx;font-size:44rpx}
+.box2 .header .f2{flex:1;font-size:32rpx;color:#111}
+.box2 .header .f3{width:100rpx;font-size:32rpx;color:#1b9af4}
+.box2 textarea{width:100%;height:80vh;border:0;color:#333;padding:20rpx;font-size:32rpx}
+.box2 .bottom{width:96%;max-width:750px;margin:0 auto;position:fixed;display:flex;align-items:center;bottom:0;left:0;right:0;height:100rpx;background:#fff;z-index:996;border-top:1px solid #f7f7f7;padding:0 2%;box-sizing:content-box}
+.box2 .bottom image{width:60rpx;height:60rpx}
+
+.plbox{width:100%;padding:40rpx 20rpx}
+.plbox_title{font-size:28rpx;height:6rpx;line-height:6rpx;margin-bottom:20rpx}
+.plbox_title .t1{color:#000;font-weight:bold}
+.plbox_content .plcontent{vertical-align: middle;color:#111}
+.plbox_content .plcontent image{ width:44rpx;height:44rpx;vertical-align: inherit;}
+.plbox_content .item1{width:100%;margin-bottom:20rpx}
+.plbox_content .item1 .f1{width:80rpx;}
+.plbox_content .item1 .f1 image{width:60rpx;height:60rpx;border-radius:50%}
+.plbox_content .item1 .f2{flex:1}
+.plbox_content .item1 .f2 .t1{}
+.plbox_content .item1 .f2 .t2{color:#000;margin:10rpx 0;line-height:60rpx;}
+.plbox_content .item1 .f2 .t3{color:#999;font-size:20rpx}
+.plbox_content .item1 .f2 .pzan image{width:32rpx;height:32rpx;margin-right:2px}
+.plbox_content .item1 .f2 .phuifu{margin-left:6px;color:#507DAF}
+.plbox_content .relist{width:100%;background:#f5f5f5;padding:4rpx 20rpx;margin-bottom:20rpx}
+.plbox_content .relist .item2{font-size:24rpx;margin-bottom:10rpx}
+
+.copyright{display:none}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/areafenhong.vue b/pagesA/commission/areafenhong.vue
new file mode 100644
index 0000000..6da7440
--- /dev/null
+++ b/pagesA/commission/areafenhong.vue
@@ -0,0 +1,170 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topfix">
+			<view class="toplabel">
+				<text class="t1">分红订单（{{count}}）</text>
+				<text class="t2">预计：+{{commissionyj}}元</text>
+			</view>
+			<dd-tab :itemdata="['待结算','已结算']" :itemst="['1','2']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		</view>
+		<view style="margin-top:190rpx"></view>
+		<block v-if="datalist && datalist.length>0">
+		<view class="content">
+			<block v-if="st==1">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.ordernum}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<text class="x1">{{item.name}} ×{{item.num}}</text>
+						<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item.real_totalprice}}</text>
+						<text class="x2">{{date(item.createtime)}}</text>
+						<view class="x3"><image :src="item.headimg"></image>{{item.nickname}}</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+						<text class="dior-sp6 yfk" v-if="item.status==1 || item.status==2">已付款</text>
+						<text class="dior-sp6 dfk" v-if="item.status==0">待付款</text>
+						<text class="dior-sp6 ywc" v-if="item.status==3">已完成</text>
+						<text class="dior-sp6 ygb" v-if="item.status==4">已关闭</text>
+						<text class="dior-sp6 ygb" v-if="item.refund_money > 0">退款/售后</text>
+					</view>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==2">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.remark}} {{date(item.createtime)}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<view v-for="(item2, index) in item.oglist" class="item2">
+							<text class="x1">{{item2.name}} ×{{item2.num}}</text>
+							<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item2.real_totalprice}}</text>
+							<text class="x2">{{date(item2.createtime)}}</text>
+							<view class="x3"><image :src="item2.headimg"></image>{{item2.nickname}}</view>
+						</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+					</view>
+				</view>
+			</view>
+			</block>
+		</view>
+		</block>
+		<view style="width:100%;height:20rpx"></view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: '1',
+			count:0,
+      commissionyj: 0,
+      pagenum: 1,
+      datalist: [],
+      nodata: false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.pagenum = 1;
+		this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore && this.st !=1) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			app.get('ApiAgent/areafenhong',{st:st,pagenum: pagenum},function(res){
+				that.loading = false;
+				var data = res.datalist;
+        if (pagenum == 1) {
+					if(st == 1){
+						that.commissionyj = res.commissionyj;
+						that.count = res.count;
+					}
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+			});
+		},
+    changetab: function (st) {
+      this.pagenum = 1;
+      this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.topfix{width: 100%;position:relative;position:fixed;background: #f9f9f9;top:var(--window-top);z-index:11;}
+.toplabel{width: 100%;background: #f9f9f9;padding: 20rpx 20rpx;border-bottom: 1px #e3e3e3 solid;display:flex;}
+.toplabel .t1{color: #666;font-size:30rpx;flex:1}
+.toplabel .t2{color: #666;font-size:30rpx;text-align:right}
+

+.content{ width:100%;}
+.content .item{width:94%;margin-left:3%;border-radius:10rpx;background: #fff;margin-bottom:16rpx;}
+.content .item .f1{width:100%;padding: 16rpx 20rpx;color: #666;border-bottom: 1px #f5f5f5 solid;}
+.content .item .f2{display:flex;padding:20rpx;align-items:center}
+.content .item .f2 .t1{display:flex;flex-direction:column;flex:auto}
+.content .item .f2 .t1 .item2{display:flex;flex-direction:column;flex:auto;margin:10rpx 0;padding:10rpx 0;border-bottom:1px dotted #f5f5f5}
+.content .item .f2 .t1 .x2{color:#999;font-size:24rpx;height:40rpx;line-height:40rpx}
+.content .item .f2 .t1 .x3{display:flex;align-items:center}
+.content .item .f2 .t1 .x3 image{width:40rpx;height:40rpx;border-radius:50%;margin-right:4px}
+.content .item .f2 .t2{ width:360rpx;text-align:right;display:flex;flex-direction:column;}
+.content .item .f2 .t2 .x1{color: #000;height:44rpx;line-height: 44rpx;overflow: hidden;font-size:36rpx;}
+.content .item .f2 .t2 .x2{height:44rpx;line-height: 44rpx;overflow: hidden;}
+
+.dfk{color: #ff9900;}
+.yfk{color: red;}
+.ywc{color: #ff6600;}
+.ygb{color: #aaaaaa;}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/commissionlog.vue b/pagesA/commission/commissionlog.vue
new file mode 100644
index 0000000..4eb40b9
--- /dev/null
+++ b/pagesA/commission/commissionlog.vue
@@ -0,0 +1,141 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="[t('佣金')+'明细','提现记录']" :itemst="['0','1']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		<view class="content">
+			<block v-if="st==0">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{item.createtime}}</text>
+						<text class="t3">变更后余额: {{item.after}}元</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t2" v-else>{{item.money}}</text>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==1">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{item.createtime}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+			</block>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      nodata: false,
+      nomore: false,
+      st: 0,
+      datalist: [],
+			textset:{},
+      pagenum: 1,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		var that = this;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiAgent/commissionlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.textset = app.globalData.textset;
+					uni.setNavigationBarTitle({
+						title: that.t('佣金') + '明细'
+					});
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    }
+  }
+};
+</script>
+<style>
+
+.content{ width:94%;margin:20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:40rpx 30rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f1 .t3{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/commissionlogMendian.vue b/pagesA/commission/commissionlogMendian.vue
new file mode 100644
index 0000000..8334240
--- /dev/null
+++ b/pagesA/commission/commissionlogMendian.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<block v-if="st==0">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{item.createtime}}</text>
+						<text class="t3">变更后余额: {{item.after}}元</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t2" v-else>{{item.money}}</text>
+				</view>
+			</view>
+			</block>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      nodata: false,
+      nomore: false,
+      st: 0,
+      datalist: [],
+			textset:{},
+      pagenum: 1,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		var that = this;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiAgent/commissionlog', {st: st,pagenum: pagenum,keyword:'门店核销'}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.textset = app.globalData.textset;
+					uni.setNavigationBarTitle({
+						title: '服务' + that.t('佣金')
+					});
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    }
+  }
+};
+</script>
+<style>
+
+.content{ width:94%;margin:20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:40rpx 30rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f1 .t3{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/downorder.vue b/pagesA/commission/downorder.vue
new file mode 100644
index 0000000..bdcf144
--- /dev/null
+++ b/pagesA/commission/downorder.vue
@@ -0,0 +1,145 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topfix">
+			<view class="toplabel">
+				<text class="t1">分销订单（{{count}}）</text>
+				<text class="t2">预计：+{{commissionyj}}元</text>
+			</view>
+			<dd-tab :itemdata="['所有订单','待付款','已付款','已完成','退款/售后']" :itemst="['0','1','2','3','5']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		</view>
+		<view style="margin-top:190rpx"></view>
+		<block v-if="datalist && datalist.length>0">
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1 flex"><text class="flex1">{{item.ordernum}}({{item.dengji}})</text><text v-if="item.dannum && item.dannum > 0" style="color:#a55">第{{item.dannum}}单</text></view>
+				<view class="f2">
+					<view class="t1">
+						<text class="x1">{{item.name}} ×{{item.num}}</text>
+						<text class="x2">{{item.createtime}}</text>
+						<view class="x3"><image :src="item.headimg"></image>{{item.nickname}}</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+						<text class="dior-sp6 yfk" v-if="item.status==1 || item.status==2">已付款</text>
+						<text class="dior-sp6 dfk" v-if="item.status==0">待付款</text>
+						<text class="dior-sp6 ywc" v-if="item.status==3">已完成</text>
+						<text class="dior-sp6 ygb" v-if="item.status==4">已关闭</text>
+						<text class="dior-sp6 ygb" v-if="item.refund_money > 0">退款/售后</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		</block>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 0,
+			count:0,
+      commissionyj: 0,
+      pagenum: 1,
+      datalist: [],
+      nodata: false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.pagenum = 1;
+		this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			app.get('ApiAgent/agorder',{st:st,pagenum: pagenum},function(res){
+				that.loading = false;
+				var data = res.datalist;
+        if (pagenum == 1) {
+					that.commissionyj = res.commissionyj;
+					that.count = res.count;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+			});
+		},
+    changetab: function (st) {
+      this.pagenum = 1;
+      this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.topfix{width: 100%;position:relative;position:fixed;background: #f9f9f9;top:var(--window-top);z-index:11;}
+.toplabel{width: 100%;background: #f9f9f9;padding: 20rpx 20rpx;border-bottom: 1px #e3e3e3 solid;display:flex;}
+.toplabel .t1{color: #666;font-size:30rpx;flex:1}
+.toplabel .t2{color: #666;font-size:30rpx;text-align:right}
+

+.content{ width:100%;}
+.content .item{width:94%;margin-left:3%;border-radius:10rpx;background: #fff;margin-bottom:16rpx;}
+.content .item .f1{width:100%;padding: 16rpx 20rpx;color: #666;border-bottom: 1px #f5f5f5 solid;}
+.content .item .f2{display:flex;padding:20rpx;align-items:center}
+.content .item .f2 .t1{display:flex;flex-direction:column;flex:auto}
+.content .item .f2 .t1 .x2{ color:#999}
+.content .item .f2 .t1 .x3{display:flex;align-items:center}
+.content .item .f2 .t1 .x3 image{width:40rpx;height:40rpx;border-radius:50%;margin-right:4px}
+.content .item .f2 .t2{ width:360rpx;text-align:right;display:flex;flex-direction:column;}
+.content .item .f2 .t2 .x1{color: #000;height:44rpx;line-height: 44rpx;overflow: hidden;font-size:36rpx;}
+.content .item .f2 .t2 .x2{height:44rpx;line-height: 44rpx;overflow: hidden;}
+
+.dfk{color: #ff9900;}
+.yfk{color: red;}
+.ywc{color: #ff6600;}
+.ygb{color: #aaaaaa;}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/fenhong.vue b/pagesA/commission/fenhong.vue
new file mode 100644
index 0000000..65052d9
--- /dev/null
+++ b/pagesA/commission/fenhong.vue
@@ -0,0 +1,170 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topfix">
+			<view class="toplabel">
+				<text class="t1">分红订单（{{count}}）</text>
+				<text class="t2">预计：+{{commissionyj}}元</text>
+			</view>
+			<dd-tab :itemdata="['待结算','已结算']" :itemst="['1','2']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		</view>
+		<view style="margin-top:190rpx"></view>
+		<block v-if="datalist && datalist.length>0">
+		<view class="content">
+			<block v-if="st==1">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.ordernum}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<text class="x1">{{item.name}} ×{{item.num}}</text>
+						<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item.real_totalprice}}</text>
+						<text class="x2">{{date(item.createtime)}}</text>
+						<view class="x3"><image :src="item.headimg"></image>{{item.nickname}}</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+						<text class="dior-sp6 yfk" v-if="item.status==1 || item.status==2">已付款</text>
+						<text class="dior-sp6 dfk" v-if="item.status==0">待付款</text>
+						<text class="dior-sp6 ywc" v-if="item.status==3">已完成</text>
+						<text class="dior-sp6 ygb" v-if="item.status==4">已关闭</text>
+						<text class="dior-sp6 ygb" v-if="item.refund_money > 0">退款/售后</text>
+					</view>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==2">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.remark}} {{date(item.createtime)}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<view v-for="(item2, index) in item.oglist" class="item2">
+							<text class="x1">{{item2.name}} ×{{item2.num}}</text>
+							<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item2.real_totalprice}}</text>
+							<text class="x2">{{date(item2.createtime)}}</text>
+							<view class="x3"><image :src="item2.headimg"></image>{{item2.nickname}}</view>
+						</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+					</view>
+				</view>
+			</view>
+			</block>
+		</view>
+		</block>
+		<view style="width:100%;height:20rpx"></view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: '1',
+			count:0,
+      commissionyj: 0,
+      pagenum: 1,
+      datalist: [],
+      nodata: false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.pagenum = 1;
+		this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore && this.st !=1) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			app.get('ApiAgent/fenhong',{st:st,pagenum: pagenum},function(res){
+				that.loading = false;
+				var data = res.datalist;
+        if (pagenum == 1) {
+					if(st == 1){
+						that.commissionyj = res.commissionyj;
+						that.count = res.count;
+					}
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+			});
+		},
+    changetab: function (st) {
+      this.pagenum = 1;
+      this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.topfix{width: 100%;position:relative;position:fixed;background: #f9f9f9;top:var(--window-top);z-index:11;}
+.toplabel{width: 100%;background: #f9f9f9;padding: 20rpx 20rpx;border-bottom: 1px #e3e3e3 solid;display:flex;}
+.toplabel .t1{color: #666;font-size:30rpx;flex:1}
+.toplabel .t2{color: #666;font-size:30rpx;text-align:right}
+

+.content{ width:100%;}
+.content .item{width:94%;margin-left:3%;border-radius:10rpx;background: #fff;margin-bottom:16rpx;}
+.content .item .f1{width:100%;padding: 16rpx 20rpx;color: #666;border-bottom: 1px #f5f5f5 solid;}
+.content .item .f2{display:flex;padding:20rpx;align-items:center}
+.content .item .f2 .t1{display:flex;flex-direction:column;flex:auto}
+.content .item .f2 .t1 .item2{display:flex;flex-direction:column;flex:auto;margin:10rpx 0;padding:10rpx 0;border-bottom:1px dotted #f5f5f5}
+.content .item .f2 .t1 .x2{color:#999;font-size:24rpx;height:40rpx;line-height:40rpx}
+.content .item .f2 .t1 .x3{display:flex;align-items:center}
+.content .item .f2 .t1 .x3 image{width:40rpx;height:40rpx;border-radius:50%;margin-right:4px}
+.content .item .f2 .t2{ width:360rpx;text-align:right;display:flex;flex-direction:column;}
+.content .item .f2 .t2 .x1{color: #000;height:44rpx;line-height: 44rpx;overflow: hidden;font-size:36rpx;}
+.content .item .f2 .t2 .x2{height:44rpx;line-height: 44rpx;overflow: hidden;}
+
+.dfk{color: #ff9900;}
+.yfk{color: red;}
+.ywc{color: #ff6600;}
+.ygb{color: #aaaaaa;}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/fhlog.vue b/pagesA/commission/fhlog.vue
new file mode 100644
index 0000000..ba28237
--- /dev/null
+++ b/pagesA/commission/fhlog.vue
@@ -0,0 +1,120 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{date(item.createtime,'Y-m-d H:i')}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.commission>0">+{{item.commission}}</text>
+						<text class="t2" v-else>{{item.commission}}</text>
+				</view>
+			</view>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      nodata: false,
+      nomore: false,
+      st: 0,
+      datalist: [],
+			textset:{},
+      pagenum: 1,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		var that = this;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiAgent/fhlog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.textset = app.globalData.textset;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    }
+  }
+};
+</script>
+<style>
+
+.content{ width:94%;margin:20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:40rpx 30rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f1 .t3{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/fhorder.vue b/pagesA/commission/fhorder.vue
new file mode 100644
index 0000000..dd73b96
--- /dev/null
+++ b/pagesA/commission/fhorder.vue
@@ -0,0 +1,174 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topfix">
+			<view class="toplabel">
+				<text class="t1">分红订单（{{count}}）</text>
+				<text class="t2">预计：+{{commissionyj}}元</text>
+			</view>
+			<dd-tab :itemdata="['待结算','已结算']" :itemst="['1','2']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		</view>
+		<view style="margin-top:190rpx"></view>
+		<block v-if="datalist && datalist.length>0">
+		<view class="content">
+			<block v-if="st==1">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1 flex-y-center">
+					<text>{{item.ordernum}}</text>
+					<text class="flex1"></text>
+					<text style="font-size:24rpx;color:#999">{{item.fhname}}</text>
+				</view>
+				<view class="f2">
+					<view class="t1">
+						<text class="x1">{{item.name}} ×{{item.num}}</text>
+						<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item.real_totalprice}}</text>
+						<text class="x2">{{date(item.createtime)}}</text>
+						<view class="x3"><image :src="item.headimg"></image>{{item.nickname}}</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+						<text class="dior-sp6 yfk" v-if="item.status==1 || item.status==2">已付款</text>
+						<text class="dior-sp6 dfk" v-if="item.status==0">待付款</text>
+						<text class="dior-sp6 ywc" v-if="item.status==3">已完成</text>
+						<text class="dior-sp6 ygb" v-if="item.status==4">已关闭</text>
+						<text class="dior-sp6 ygb" v-if="item.refund_money > 0">退款/售后</text>
+					</view>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==2">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.remark}} {{date(item.createtime)}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<view v-for="(item2, index) in item.oglist" class="item2">
+							<text class="x1">{{item2.name}} ×{{item2.num}}</text>
+							<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item2.real_totalprice}}</text>
+							<text class="x2">{{date(item2.createtime)}}</text>
+							<view class="x3"><image :src="item2.headimg"></image>{{item2.nickname}}</view>
+						</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+					</view>
+				</view>
+			</view>
+			</block>
+			<view style="width:100%;height:20rpx"></view>
+		</view>
+		</block>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: '1',
+			count:0,
+      commissionyj: 0,
+      pagenum: 1,
+      datalist: [],
+      nodata: false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.pagenum = 1;
+		this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore && this.st !=1) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			app.get('ApiAgent/fhorder',{st:st,pagenum: pagenum},function(res){
+				that.loading = false;
+				var data = res.datalist;
+        if (pagenum == 1) {
+					if(st == 1){
+						that.commissionyj = res.commissionyj;
+						that.count = res.count;
+					}
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+			});
+		},
+    changetab: function (st) {
+      this.pagenum = 1;
+      this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.topfix{width: 100%;position:relative;position:fixed;background: #f9f9f9;top:var(--window-top);z-index:11;}
+.toplabel{width: 100%;background: #f9f9f9;padding: 20rpx 20rpx;border-bottom: 1px #e3e3e3 solid;display:flex;}
+.toplabel .t1{color: #666;font-size:30rpx;flex:1}
+.toplabel .t2{color: #666;font-size:30rpx;text-align:right}
+

+.content{ width:100%;}
+.content .item{width:94%;margin-left:3%;border-radius:10rpx;background: #fff;margin-bottom:16rpx;}
+.content .item .f1{width:100%;padding: 16rpx 20rpx;color: #666;border-bottom: 1px #f5f5f5 solid;}
+.content .item .f2{display:flex;padding:20rpx;align-items:center}
+.content .item .f2 .t1{display:flex;flex-direction:column;flex:auto}
+.content .item .f2 .t1 .item2{display:flex;flex-direction:column;flex:auto;margin:10rpx 0;padding:10rpx 0;border-bottom:1px dotted #f5f5f5}
+.content .item .f2 .t1 .x2{color:#999;font-size:24rpx;height:40rpx;line-height:40rpx}
+.content .item .f2 .t1 .x3{display:flex;align-items:center}
+.content .item .f2 .t1 .x3 image{width:40rpx;height:40rpx;border-radius:50%;margin-right:4px}
+.content .item .f2 .t2{ width:360rpx;text-align:right;display:flex;flex-direction:column;}
+.content .item .f2 .t2 .x1{color: #000;height:44rpx;line-height: 44rpx;overflow: hidden;font-size:36rpx;}
+.content .item .f2 .t2 .x2{height:44rpx;line-height: 44rpx;overflow: hidden;}
+
+.dfk{color: #ff9900;}
+.yfk{color: red;}
+.ywc{color: #ff6600;}
+.ygb{color: #aaaaaa;}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/index.vue b/pagesA/commission/index.vue
new file mode 100644
index 0000000..160edbb
--- /dev/null
+++ b/pagesA/commission/index.vue
@@ -0,0 +1,321 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="banner" :style="{background:'linear-gradient(180deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0) 100%)'}">
+			<image :src="userinfo.headimg" background-size="cover"/>
+			<view class="info">
+				 <text class="nickname">{{userinfo.nickname}}</text>
+				 <text>推荐人：{{userinfo.pid > 0 ? userinfo.pnickname : '无'}}</text>
+			</view>
+		</view>
+		<view class="contentdata">
+			<view class="order">
+				<view class="head">
+					<text class="f1">我的{{t('佣金')}}</text>
+					<view class="f2" @tap="goto" data-url="withdraw" v-if="comwithdraw==1"><text>立即提现</text><image :src="event_rul +'/static/img/static/img/arrowright.png'"></image></view>
+					<view class="f2" @tap="tomoney" v-else-if="commission2money=='1'"><text>转到{{t('余额')}}账户</text><image :src="event_rul +'/static/img/static/img/arrowright.png'"></image></view>
+				</view>
+				<view class="content">
+					 <view class="item" @tap="goto" data-url="../order/shoporder?st=0">
+							<text class="t1">￥{{userinfo.commission}}</text>
+							<text class="t3">{{comwithdraw==1?'可提现':'剩余'}}{{t('佣金')}}</text>
+					 </view>
+					 <view class="item" @tap="goto" data-url="../order/shoporder?st=0">
+							<text class="t1">￥{{count3}}</text>
+							<text class="t3">已提现{{t('佣金')}}</text>
+					 </view>
+					 <view class="item" @tap="goto" data-url="../order/shoporder?st=0">
+							<text class="t1">￥{{userinfo.commission_yj}}</text>
+							<text class="t3">在路上</text>
+					 </view>
+				</view>
+			</view>
+			<view class="order" v-if="hasfenhong">
+				<view class="head">
+					<text class="f1">{{t('股东分红')}}</text>
+					<view class="f2" @tap="goto" data-url="fenhong"><text>查看详情</text><image :src="event_rul +'/static/img/static/img/arrowright.png'"></image></view>
+				</view>
+				<view class="content">
+					 <view class="item">
+							<text class="t1">￥{{userinfo.fenhong}}</text>
+							<text class="t3">累计获得</text>
+					 </view>
+					 <view class="item">
+							<text class="t1">￥{{userinfo.fenhong_yj}}</text>
+							<text class="t3">在路上</text>
+					 </view>
+					 <view class="item"></view>
+				</view>
+			</view>
+			<view class="order" v-if="hasteamfenhong">
+				<view class="head">
+					<text class="f1">{{t('团队分红')}}</text>
+					<view class="f2" @tap="goto" data-url="teamfenhong"><text>查看详情</text><image :src="event_rul +'/static/img/static/img/arrowright.png'"></image></view>
+				</view>
+				<view class="content">
+					 <view class="item">
+							<text class="t1">￥{{userinfo.teamfenhong}}</text>
+							<text class="t3">累计获得</text>
+					 </view>
+					 <view class="item">
+							<text class="t1">￥{{userinfo.teamfenhong_yj}}</text>
+							<text class="t3">在路上</text>
+					 </view>
+					 <view class="item"></view>
+				</view>
+			</view>
+			<view class="order" v-if="hasareafenhong">
+				<view class="head">
+					<text class="f1">{{t('区域代理分红')}}</text>
+					<view class="f2" @tap="goto" data-url="areafenhong"><text>查看详情</text><image :src="event_rul +'/static/img/static/img/arrowright.png'"></image></view>
+				</view>
+				<view class="content">
+					 <view class="item">
+							<text class="t1">￥{{userinfo.areafenhong}}</text>
+							<text class="t3">累计获得</text>
+					 </view>
+					 <view class="item">
+							<text class="t1">￥{{userinfo.areafenhong_yj}}</text>
+							<text class="t3">在路上</text>
+					 </view>
+					 <view class="item"></view>
+				</view>
+			</view>
+			<view class="order" v-if="hasteamfenhong && (teamnum_show==1 || teamyeji_show==1)">
+				<view class="head">
+					<text class="f1">我的团队</text>
+					<view class="f2" @tap="goto" data-url="myteam"><text>查看详情</text><image :src="event_rul +'/static/img/static/img/arrowright.png'"></image></view>
+				</view>
+				<view class="content">
+					 <view class="item" v-if="teamnum_show==1">
+							<text class="t1">{{userinfo.teamnum}}</text>
+							<text class="t3">团队总人数</text>
+					 </view>
+					 <view class="item">
+					 		<block v-if="teamyeji_show==1">
+							<text class="t1">￥{{userinfo.teamyeji}}</text>
+							<text class="t3">团队总业绩</text>
+							</block>
+					 </view>
+					 <view class="item">
+							<block v-if="gongxianfenhong_show==1">
+							<text class="t1">￥{{userinfo.gongxianfenhong}}</text>
+							<text class="t3">预计{{userinfo.gongxianfenhong_txt || '股东贡献量分红'}}</text>
+							</block>
+					 </view>
+				</view>
+			</view>
+
+			<view class="list">
+				<view class="item" @tap="tomoney" v-if="comwithdraw==1 && commission2money=='1'">
+					<view class="f2">{{t('佣金')}}转{{t('余额')}}</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="myteam">
+					<view class="f2">我的团队</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="downorder">
+					<view class="f2">分销订单</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="commissionlog">
+					<view class="f2">{{t('佣金')}}明细</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="poster">
+					<view class="f2">分享海报</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="fhorder" v-if="showfenhong">
+					<view class="f2">分红订单</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="fhlog" v-if="showfenhong">
+					<view class="f2">分红记录</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="orderMendian" v-if="showMendianOrder">
+					<view class="f2">服务订单</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="commissionlogMendian" v-if="showMendianOrder">
+					<view class="f2">服务佣金</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+				<view class="item" @tap="goto" data-url="orderYeji" v-if="showYeji">
+					<view class="f2">业绩统计</view>
+					<text class="f3"></text>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f4"></image>
+				</view>
+			</view>
+		</view>
+		<view style="width:100%;height:20rpx"></view>
+		
+		<uni-popup id="dialogInput" ref="dialogInput" type="dialog">
+			<uni-popup-dialog mode="input" :title="t('佣金') + '转' + t('余额')" value="" placeholder="请输入转入金额" @confirm="tomonenyconfirm"></uni-popup-dialog>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		hiddenmodalput: true,
+		userinfo: [],
+		count: 0,
+		count1: 0,
+		count2: 0,
+		count3: 0,
+		count4: 0,
+		comwithdraw: 0,
+		canwithdraw: true,
+		money: 0,
+		count0: "",
+		countdqr: "",
+		commission2money: "",
+		showfenhong:false,
+		showMendianOrder:false,
+		hasfenhong:false,
+		hasareafenhong:false,
+		hasteamfenhong:false,
+		showYeji:false,
+		fxjiesuantime:0,
+		teamyeji_show:0,
+		teamnum_show:0,
+		gongxianfenhong_show:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		var that = this;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAgent/commissionSurvey', {}, function (res) {
+				that.loading = false;
+				uni.setNavigationBarTitle({
+					title: '我的' + that.t('佣金')
+				});
+				that.userinfo = res.userinfo;
+				that.count = res.count;
+				that.count1 = res.count1;
+				that.count2 = res.count2;
+				that.count3 = res.count3;
+				that.count0 = res.count0;
+				that.countdqr = res.countdqr;
+				that.comwithdraw = res.comwithdraw;
+				that.commission2money = res.commission2money;
+				that.showfenhong = res.showfenhong;
+				that.showMendianOrder = res.showMendianOrder;
+				that.hasfenhong = res.hasfenhong;
+				that.hasareafenhong = res.hasareafenhong;
+				that.hasteamfenhong = res.hasteamfenhong;
+				that.showYeji = res.hasYeji;
+				that.fxjiesuantime = res.fxjiesuantime;
+				that.teamyeji_show = res.teamyeji_show;
+				that.teamnum_show = res.teamnum_show;
+				that.gongxianfenhong_show = res.gongxianfenhong_show;
+				that.loaded();
+			});
+		},
+    cancel: function () {
+      this.hiddenmodalput = true;
+    },
+    tomoney: function () {
+      this.$refs.dialogInput.open()
+    },
+    tomonenyconfirm: function (done, val) {
+			console.log(val)
+      var that = this;
+      var money = val;
+      if (money == '' || parseFloat(money) <= 0) {
+        app.alert('请输入转入金额');
+        return;
+      }
+      if (parseFloat(money) > this.userinfo.commission) {
+        app.alert('可转入' + that.t('佣金') + '不足');
+        return;
+      }
+			done();
+			app.showLoading('提交中');
+      app.post('ApiAgent/commission2money', {money: money}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.error(data.msg);
+        } else {
+          that.hiddenmodalput = true;
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.banner{ display:flex;width:100%;height:560rpx;padding:40rpx 32rpx;color:#fff;position:relative}
+.banner image{ width:120rpx;height:120rpx;border-radius:50%;margin-right:20rpx}
+.banner .info{display:flex;flex:auto;flex-direction:column;padding-top:10rpx}
+.banner .info .nickname{font-size:32rpx;font-weight:bold;padding-bottom:12rpx}
+.banner .set{ width:70rpx;height:100rpx;line-height:100rpx;font-size:40rpx;text-align:center}
+.banner .set image{width:50rpx;height:50rpx;border-radius:0}
+
+.contentdata{display:flex;flex-direction:column;width:100%;padding:0 30rpx;margin-top:-380rpx;position:relative;margin-bottom:20rpx}
+
+.order{width:100%;background:#fff;padding:0 20rpx;margin-top:20rpx;border-radius:16rpx}
+.order .head{ display:flex;align-items:center;width:100%;padding:10rpx 0;border-bottom:0px solid #eee}
+.order .head .f1{flex:auto;color:#333}
+.order .head .f2{ display:flex;align-items:center;color:#FE2B2E;width:200rpx;padding:10rpx 0;text-align:right;justify-content:flex-end}
+.order .head .f2 image{ width:30rpx;height:30rpx;}
+.order .head .t3{ width: 40rpx; height: 40rpx;}
+.order .content{ display:flex;width:100%;padding:10rpx 0;align-items:center;font-size:24rpx}
+.order .content .item{padding:10rpx 0;flex:1;display:flex;flex-direction:column;align-items:center;position:relative}
+.order .content .item image{ width:50rpx;height:50rpx}
+.order .content .item .t1{color:#FE2B2E;font-size:36rpx;font-weight:bold;}
+.order .content .item .t3{ padding-top:3px;color:#666}
+.order .content .item .t2{background: red;color: #fff;border-radius:50%;padding: 0 10rpx;position: absolute;top: 0px;right:40rpx;width:34rpx;height:34rpx;text-align:center;}
+
+.list{ width: 100%;background: #fff;margin-top:20rpx;padding:0 20rpx;font-size:30rpx;border-radius:16rpx}
+.list .item{ height:100rpx;display:flex;align-items:center;border-bottom:0px solid #eee}
+.list .item:last-child{border-bottom:0;}
+.list .f1{width:50rpx;height:50rpx;line-height:50rpx;display:flex;align-items:center;}
+.list .f1 image{ width:40rpx;height:40rpx;}
+.list .f1 span{ width:40rpx;height:40rpx;font-size:40rpx}
+.list .f2{color:#222}
+.list .f3{ color: #FC5648;text-align:right;flex:1;}
+.list .f4{ width: 24rpx; height: 24rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/mysameline.vue b/pagesA/commission/mysameline.vue
new file mode 100644
index 0000000..8741411
--- /dev/null
+++ b/pagesA/commission/mysameline.vue
@@ -0,0 +1,241 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入昵称/姓名/手机号搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">成员信息</text>
+				<text class="t2"></text>
+			</view>
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="item">
+					<view class="f1">
+						<image :src="item.headimg"></image>
+						<view class="t2">
+							<text class="x1">{{item.nickname}}</text>
+							<text class="x2">{{date(item.createtime,'Y-m-d H:i')}}</text>
+							<text class="x2">等级：{{item.levelname}}</text>
+							<text class="x2" v-if="item.tel">手机号：{{item.tel}}</text>
+						</view>
+					</view>
+					<view class="f2">
+						<!-- <text class="t1">+{{item.commission}}</text> -->
+						<!-- <text class='t2'>{{item.downcount}}个成员</text> -->
+						<view class="t3">
+							<view v-if="userlevel && userlevel.team_givemoney==1" class="x1" @tap="givemoneyshow" :data-id="item.id">转{{t('余额')}}</view>
+							<view v-if="userlevel && userlevel.team_givescore==1" class="x1" @tap="givescoreshow" :data-id="item.id" >转{{t('积分')}}</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<uni-popup id="dialogmoneyInput" ref="dialogmoneyInput" type="dialog">
+			<uni-popup-dialog mode="input" title="转账金额" value="" placeholder="请输入转账金额" @confirm="givemoney"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="dialogscoreInput" ref="dialogscoreInput" type="dialog">
+			<uni-popup-dialog mode="input" title="转账数量" value="" placeholder="请输入转账数量" @confirm="givescore"></uni-popup-dialog>
+		</uni-popup>
+		
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 1,
+		datalist: [],
+		pagenum: 1,
+		userlevel:{},
+		userinfo:{},
+		textset:{},
+		levelList:{},
+		keyword:'',
+		tomid:'',
+		tomoney:0,
+		toscore:0,
+		nodata: false,
+		nomore: false,
+		dialogShow: false,
+		tempMid: '',
+		tempLevelid: '',
+		tempLevelsort: '',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiAgent/sameline', {st: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.userinfo = res.userinfo;
+					that.userlevel = res.userlevel;
+					that.textset = app.globalData.textset;
+          that.datalist = data;
+					that.levelList = res.levelList;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+			this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		givemoneyshow:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.tomid = id;
+			that.$refs.dialogmoneyInput.open();
+		},
+		givescoreshow:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.tomid = id;
+			that.$refs.dialogscoreInput.open();
+		},
+		givemoney:function(done, money){
+			var that = this;
+			var id = that.tomid;
+			app.showLoading('提交中');
+			app.post('ApiAgent/givemoney', {id:id,money:money}, function (res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+					that.getdata();
+					that.$refs.dialogmoneyInput.close();
+				}
+			})
+		},
+		givescore:function(done, score){
+			var that = this;
+			var id = that.tomid;
+			app.showLoading('提交中');
+			app.post('ApiAgent/givescore', {id:id,score:score}, function (res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+					that.getdata();
+					that.$refs.dialogscoreInput.close();
+				}
+			})
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    },
+		showDialog:function(e){
+			let that = this;
+			that.tempMid = e.currentTarget.dataset.id;
+			that.tempLevelid = e.currentTarget.dataset.levelid;
+			that.tempLevelsort = e.currentTarget.dataset.levelsort;
+			this.dialogShow = !this.dialogShow
+		},
+  }
+};
+</script>
+<style>
+
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width:94%;margin:0 3%;border-radius:16rpx;background: #fff;margin-top: 20rpx;}
+.content .label{display:flex;width: 100%;padding: 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{width: 100%;padding: 32rpx;border-top: 1px #eaeaea solid;min-height: 112rpx;display:flex;align-items:center;}
+.content .item image{width: 90rpx;height: 90rpx;border-radius:4px}
+.content .item .f1{display:flex;flex:1;align-items:center;}
+.content .item .f1 .t2{display:flex;flex-direction:column;padding-left:20rpx}
+.content .item .f1 .t2 .x1{color: #333;font-size:26rpx;}
+.content .item .f1 .t2 .x2{color: #999;font-size:24rpx;}
+
+.content .item .f2{display:flex;flex-direction:column;width:200rpx;text-align:right;border-left:1px solid #eee}
+.content .item .f2 .t1{ font-size: 40rpx;color: #666;height: 40rpx;line-height: 40rpx;}
+.content .item .f2 .t2{ font-size: 28rpx;color: #999;height: 50rpx;line-height: 50rpx;}
+.content .item .f2 .t3{ display:flex;justify-content:space-around;margin-top:10rpx; flex-wrap: wrap;}
+.content .item .f2 .t3 .x1{height:40rpx;line-height:40rpx;padding:0 8rpx;border:1px solid #ccc;border-radius:6rpx;font-size:22rpx;color:#666;margin-top: 10rpx;}
+
+	.sheet-item {display: flex;align-items: center;padding:20rpx 30rpx;}
+	.sheet-item .item-img {width: 44rpx;height: 44rpx;}
+	.sheet-item .item-text {display: block;color: #333;height: 100%;padding: 20rpx;font-size: 32rpx;position: relative; width: 90%;}
+	.sheet-item .item-text:after {position: absolute;content: '';height: 1rpx;width: 100%;bottom: 0;left: 0;border-bottom: 1rpx solid #eee;}
+	.man-btn {
+		line-height: 100rpx;
+		text-align: center;
+		background: #FFFFFF;
+		font-size: 30rpx;
+		color: #FF4015;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/myteam.vue b/pagesA/commission/myteam.vue
new file mode 100644
index 0000000..0fa1c48
--- /dev/null
+++ b/pagesA/commission/myteam.vue
@@ -0,0 +1,279 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+
+		<dd-tab :itemdata="['一级('+userinfo.myteamCount1+')','二级('+userinfo.myteamCount2+')']" :itemst="['1','2','3']" :st="st" :isfixed="false" @changetab="changetab" v-if="userlevel && userlevel.can_agent==2"></dd-tab>
+		<dd-tab :itemdata="['一级('+userinfo.myteamCount1+')','二级('+userinfo.myteamCount2+')','三级('+userinfo.myteamCount3+')']" :itemst="['1','2','3']" :st="st" :isfixed="false" @changetab="changetab" v-if="userlevel && userlevel.can_agent==3"></dd-tab>
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入昵称/姓名/手机号搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">成员信息</text>
+				<text class="t2">来自TA的{{t('佣金')}}</text>
+			</view>
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="item">
+					<view class="f1">
+						<image :src="item.headimg"></image>
+						<view class="t2">
+							<text class="x1">{{item.nickname}}</text>
+							<text class="x2">{{item.createtime}}</text>
+							<text class="x2">等级：{{item.levelname}}</text>
+							<text class="x2" v-if="item.tel">手机号：{{item.tel}}</text>
+						</view>
+					</view>
+					<view class="f2">
+						<text class="t1">+{{item.commission}}</text>
+						<!-- <text class='t2'>{{item.downcount}}个成员</text> -->
+						<view class="t3">
+							<view v-if="userlevel && userlevel.team_givemoney==1" class="x1" @tap="givemoneyshow" :data-id="item.id">转{{t('余额')}}</view>
+							<view v-if="userlevel && userlevel.team_givescore==1" class="x1" @tap="givescoreshow" :data-id="item.id" >转{{t('积分')}}</view>
+							<view v-if="userlevel && userlevel.team_levelup==1" class="x1" @tap="showDialog" :data-id="item.id" :data-levelid="item.levelid" :data-levelsort="item.levelsort">升级</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<uni-popup id="dialogmoneyInput" ref="dialogmoneyInput" type="dialog">
+			<uni-popup-dialog mode="input" title="转账金额" value="" placeholder="请输入转账金额" @confirm="givemoney"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="dialogscoreInput" ref="dialogscoreInput" type="dialog">
+			<uni-popup-dialog mode="input" title="转账数量" value="" placeholder="请输入转账数量" @confirm="givescore"></uni-popup-dialog>
+		</uni-popup>
+		
+		<view v-if="dialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="showDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">升级</text>
+					<image :src="event_rul + '/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="showDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="sheet-item" v-for="(item, index) in levelList" :key="index">
+						<text class="item-text flex-item">{{item.name}}</text>
+						<view class="flex1"></view><view @tap="changeLevel" :data-id="item.id" :data-name="item.name" v-if="item.id != tempLevelid && item.sort > tempLevelsort" :style="{'color':t('color1')}">选择</view><view v-else style="color: #ccc;">选择</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 1,
+		datalist: [],
+		pagenum: 1,
+		userlevel:{},
+		userinfo:{},
+		textset:{},
+		levelList:{},
+		keyword:'',
+		tomid:'',
+		tomoney:0,
+		toscore:0,
+		nodata: false,
+		nomore: false,
+		dialogShow: false,
+		tempMid: '',
+		tempLevelid: '',
+		tempLevelsort: '',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiAgent/team', {st: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.userinfo = res.userinfo;
+					that.userlevel = res.userlevel;
+					that.textset = app.globalData.textset;
+          that.datalist = data;
+					that.levelList = res.levelList;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+			this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		givemoneyshow:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.tomid = id;
+			that.$refs.dialogmoneyInput.open();
+		},
+		givescoreshow:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.tomid = id;
+			that.$refs.dialogscoreInput.open();
+		},
+		givemoney:function(done, money){
+			var that = this;
+			var id = that.tomid;
+			app.showLoading('提交中');
+			app.post('ApiAgent/givemoney', {id:id,money:money}, function (res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+					that.getdata();
+					that.$refs.dialogmoneyInput.close();
+				}
+			})
+		},
+		givescore:function(done, score){
+			var that = this;
+			var id = that.tomid;
+			app.showLoading('提交中');
+			app.post('ApiAgent/givescore', {id:id,score:score}, function (res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+					that.getdata();
+					that.$refs.dialogscoreInput.close();
+				}
+			})
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    },
+		showDialog:function(e){
+			let that = this;
+			that.tempMid = e.currentTarget.dataset.id;
+			that.tempLevelid = e.currentTarget.dataset.levelid;
+			that.tempLevelsort = e.currentTarget.dataset.levelsort;
+			this.dialogShow = !this.dialogShow
+		},
+		changeLevel: function (e) {
+			var that = this;
+			var mid = that.tempMid;
+			var levelId = e.currentTarget.dataset.id;
+			var levelName = e.currentTarget.dataset.name;
+			app.confirm('确定要升级为'+levelName+'吗?', function () {
+				app.showLoading('提交中');
+			  app.post('ApiAgent/levelUp', {mid: mid,levelId:levelId}, function (res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+					  app.error(res.msg);
+					} else {
+						app.success(res.msg);
+						that.dialogShow = false;
+						that.getdata();
+					}
+			  });
+			});
+    },
+  }
+};
+</script>
+<style>
+
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width:94%;margin:0 3%;border-radius:16rpx;background: #fff;margin-top: 20rpx;}
+.content .label{display:flex;width: 100%;padding: 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{width: 100%;padding: 32rpx;border-top: 1px #eaeaea solid;min-height: 112rpx;display:flex;align-items:center;}
+.content .item image{width: 90rpx;height: 90rpx;border-radius:4px}
+.content .item .f1{display:flex;flex:1;align-items:center;}
+.content .item .f1 .t2{display:flex;flex-direction:column;padding-left:20rpx}
+.content .item .f1 .t2 .x1{color: #333;font-size:26rpx;}
+.content .item .f1 .t2 .x2{color: #999;font-size:24rpx;}
+
+.content .item .f2{display:flex;flex-direction:column;width:200rpx;text-align:right;border-left:1px solid #eee}
+.content .item .f2 .t1{ font-size: 40rpx;color: #666;height: 40rpx;line-height: 40rpx;}
+.content .item .f2 .t2{ font-size: 28rpx;color: #999;height: 50rpx;line-height: 50rpx;}
+.content .item .f2 .t3{ display:flex;justify-content:space-around;margin-top:10rpx; flex-wrap: wrap;}
+.content .item .f2 .t3 .x1{height:40rpx;line-height:40rpx;padding:0 8rpx;border:1px solid #ccc;border-radius:6rpx;font-size:22rpx;color:#666;margin-top: 10rpx;}
+
+	.sheet-item {display: flex;align-items: center;padding:20rpx 30rpx;}
+	.sheet-item .item-img {width: 44rpx;height: 44rpx;}
+	.sheet-item .item-text {display: block;color: #333;height: 100%;padding: 20rpx;font-size: 32rpx;position: relative; width: 90%;}
+	.sheet-item .item-text:after {position: absolute;content: '';height: 1rpx;width: 100%;bottom: 0;left: 0;border-bottom: 1rpx solid #eee;}
+	.man-btn {
+		line-height: 100rpx;
+		text-align: center;
+		background: #FFFFFF;
+		font-size: 30rpx;
+		color: #FF4015;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/myteamline.vue b/pagesA/commission/myteamline.vue
new file mode 100644
index 0000000..504470b
--- /dev/null
+++ b/pagesA/commission/myteamline.vue
@@ -0,0 +1,241 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topsearch flex-y-center">
+			<view class="f1 flex-y-center">
+				<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+				<input :value="keyword" placeholder="输入昵称/姓名/手机号搜索" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange"></input>
+			</view>
+		</view>
+		<view class="content" v-if="datalist && datalist.length>0">
+			<view class="label">
+				<text class="t1">成员信息</text>
+				<text class="t2"></text>
+			</view>
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="item">
+					<view class="f1">
+						<image :src="item.headimg"></image>
+						<view class="t2">
+							<text class="x1">{{item.nickname}}</text>
+							<text class="x2">{{date(item.createtime,'Y-m-d H:i')}}</text>
+							<text class="x2">等级：{{item.levelname}}</text>
+							<text class="x2" v-if="item.tel">手机号：{{item.tel}}</text>
+						</view>
+					</view>
+					<view class="f2">
+						<!-- <text class="t1">+{{item.commission}}</text> -->
+						<!-- <text class='t2'>{{item.downcount}}个成员</text> -->
+						<view class="t3">
+							<view v-if="userlevel && userlevel.team_givemoney==1" class="x1" @tap="givemoneyshow" :data-id="item.id">转{{t('余额')}}</view>
+							<view v-if="userlevel && userlevel.team_givescore==1" class="x1" @tap="givescoreshow" :data-id="item.id" >转{{t('积分')}}</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<uni-popup id="dialogmoneyInput" ref="dialogmoneyInput" type="dialog">
+			<uni-popup-dialog mode="input" title="转账金额" value="" placeholder="请输入转账金额" @confirm="givemoney"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup id="dialogscoreInput" ref="dialogscoreInput" type="dialog">
+			<uni-popup-dialog mode="input" title="转账数量" value="" placeholder="请输入转账数量" @confirm="givescore"></uni-popup-dialog>
+		</uni-popup>
+		
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 1,
+		datalist: [],
+		pagenum: 1,
+		userlevel:{},
+		userinfo:{},
+		textset:{},
+		levelList:{},
+		keyword:'',
+		tomid:'',
+		tomoney:0,
+		toscore:0,
+		nodata: false,
+		nomore: false,
+		dialogShow: false,
+		tempMid: '',
+		tempLevelid: '',
+		tempLevelsort: '',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiAgent/teamline', {st: st,pagenum: pagenum,keyword:keyword}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.userinfo = res.userinfo;
+					that.userlevel = res.userlevel;
+					that.textset = app.globalData.textset;
+          that.datalist = data;
+					that.levelList = res.levelList;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+			this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+		givemoneyshow:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.tomid = id;
+			that.$refs.dialogmoneyInput.open();
+		},
+		givescoreshow:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			that.tomid = id;
+			that.$refs.dialogscoreInput.open();
+		},
+		givemoney:function(done, money){
+			var that = this;
+			var id = that.tomid;
+			app.showLoading('提交中');
+			app.post('ApiAgent/givemoney', {id:id,money:money}, function (res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+					that.getdata();
+					that.$refs.dialogmoneyInput.close();
+				}
+			})
+		},
+		givescore:function(done, score){
+			var that = this;
+			var id = that.tomid;
+			app.showLoading('提交中');
+			app.post('ApiAgent/givescore', {id:id,score:score}, function (res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+          app.error(res.msg);
+        } else {
+          app.success(res.msg);
+					that.getdata();
+					that.$refs.dialogscoreInput.close();
+				}
+			})
+		},
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+      that.getdata();
+    },
+		showDialog:function(e){
+			let that = this;
+			that.tempMid = e.currentTarget.dataset.id;
+			that.tempLevelid = e.currentTarget.dataset.levelid;
+			that.tempLevelsort = e.currentTarget.dataset.levelsort;
+			this.dialogShow = !this.dialogShow
+		},
+  }
+};
+</script>
+<style>
+
+.topsearch{width:94%;margin:16rpx 3%;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#fff;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+
+.content{width:94%;margin:0 3%;border-radius:16rpx;background: #fff;margin-top: 20rpx;}
+.content .label{display:flex;width: 100%;padding: 16rpx;color: #333;}
+.content .label .t1{flex:1}
+.content .label .t2{ width:300rpx;text-align:right}
+
+.content .item{width: 100%;padding: 32rpx;border-top: 1px #eaeaea solid;min-height: 112rpx;display:flex;align-items:center;}
+.content .item image{width: 90rpx;height: 90rpx;border-radius:4px}
+.content .item .f1{display:flex;flex:1;align-items:center;}
+.content .item .f1 .t2{display:flex;flex-direction:column;padding-left:20rpx}
+.content .item .f1 .t2 .x1{color: #333;font-size:26rpx;}
+.content .item .f1 .t2 .x2{color: #999;font-size:24rpx;}
+
+.content .item .f2{display:flex;flex-direction:column;width:200rpx;text-align:right;border-left:1px solid #eee}
+.content .item .f2 .t1{ font-size: 40rpx;color: #666;height: 40rpx;line-height: 40rpx;}
+.content .item .f2 .t2{ font-size: 28rpx;color: #999;height: 50rpx;line-height: 50rpx;}
+.content .item .f2 .t3{ display:flex;justify-content:space-around;margin-top:10rpx; flex-wrap: wrap;}
+.content .item .f2 .t3 .x1{height:40rpx;line-height:40rpx;padding:0 8rpx;border:1px solid #ccc;border-radius:6rpx;font-size:22rpx;color:#666;margin-top: 10rpx;}
+
+	.sheet-item {display: flex;align-items: center;padding:20rpx 30rpx;}
+	.sheet-item .item-img {width: 44rpx;height: 44rpx;}
+	.sheet-item .item-text {display: block;color: #333;height: 100%;padding: 20rpx;font-size: 32rpx;position: relative; width: 90%;}
+	.sheet-item .item-text:after {position: absolute;content: '';height: 1rpx;width: 100%;bottom: 0;left: 0;border-bottom: 1rpx solid #eee;}
+	.man-btn {
+		line-height: 100rpx;
+		text-align: center;
+		background: #FFFFFF;
+		font-size: 30rpx;
+		color: #FF4015;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/orderMendian.vue b/pagesA/commission/orderMendian.vue
new file mode 100644
index 0000000..b964712
--- /dev/null
+++ b/pagesA/commission/orderMendian.vue
@@ -0,0 +1,139 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topfix">
+		</view>
+		<block v-if="datalist && datalist.length>0">
+		<view class="content">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.ordernum}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<text class="x1">{{item.name}}</text>
+						<text class="x2">{{item.createtime}}</text>
+						<view class="x3"><image :src="item.headimg"></image>{{item.nickname}}</view>
+					</view>
+					<view class="t2">
+						<!-- <text class="x1">+{{item.commission}}</text> -->
+						<text class="dior-sp6 yfk" v-if="item.status==1 || item.status==2">已付款</text>
+						<text class="dior-sp6 dfk" v-if="item.status==0">待付款</text>
+						<text class="dior-sp6 ywc">已完成</text>
+						<text class="dior-sp6 ygb" v-if="item.status==4">已关闭</text>
+						<text class="dior-sp6 ygb" v-if="item.refund_money > 0">退款/售后</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		</block>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: 0,
+			count:0,
+      commissionyj: 0,
+      pagenum: 1,
+      datalist: [],
+      nodata: false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.pagenum = 1;
+		this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			app.get('ApiAgent/orderMendian',{st:st,pagenum: pagenum},function(res){
+				that.loading = false;
+				var data = res.datalist;
+        if (pagenum == 1) {
+					that.commissionyj = res.commissionyj;
+					that.count = res.count;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+			});
+		},
+    changetab: function (st) {
+      this.pagenum = 1;
+      this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.topfix{width: 100%;position:relative;position:fixed;background: #f9f9f9;top:var(--window-top);z-index:11;}
+.toplabel{width: 100%;background: #f9f9f9;padding: 20rpx 20rpx;border-bottom: 1px #e3e3e3 solid;display:flex;}
+.toplabel .t1{color: #666;font-size:30rpx;flex:1}
+.toplabel .t2{color: #666;font-size:30rpx;text-align:right}
+

+.content{ width:100%;}
+.content .item{width:94%;margin-left:3%;border-radius:10rpx;background: #fff;margin-bottom:16rpx;}
+.content .item .f1{width:100%;padding: 16rpx 20rpx;color: #666;border-bottom: 1px #f5f5f5 solid;}
+.content .item .f2{display:flex;padding:20rpx;align-items:center}
+.content .item .f2 .t1{display:flex;flex-direction:column;flex:auto}
+.content .item .f2 .t1 .x2{ color:#999}
+.content .item .f2 .t1 .x3{display:flex;align-items:center}
+.content .item .f2 .t1 .x3 image{width:40rpx;height:40rpx;border-radius:50%;margin-right:4px}
+.content .item .f2 .t2{ width:300rpx;text-align:right;display:flex;flex-direction:column;}
+.content .item .f2 .t2 .x1{color: #000;height:44rpx;line-height: 44rpx;overflow: hidden;font-size:36rpx;}
+.content .item .f2 .t2 .x2{height:44rpx;line-height: 44rpx;overflow: hidden;}
+
+.dfk{color: #ff9900;}
+.yfk{color: red;}
+.ywc{color: #ff6600;}
+.ygb{color: #aaaaaa;}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/orderYeji.vue b/pagesA/commission/orderYeji.vue
new file mode 100644
index 0000000..6c135fe
--- /dev/null
+++ b/pagesA/commission/orderYeji.vue
@@ -0,0 +1,121 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content">
+			<block v-if="st==0">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.date}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t1" v-else>{{item.num}}</text>
+				</view>
+			</view>
+			</block>
+		</view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      nodata: false,
+      nomore: false,
+      st: 0,
+      datalist: [],
+			textset:{},
+      pagenum: 1,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		var that = this;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var st = that.st;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+      app.post('ApiAgent/orderYeji', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.textset = app.globalData.textset;
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    }
+  }
+};
+</script>
+<style>
+
+.content{ width:94%;margin:20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:40rpx 30rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f1 .t3{color:#666666;font-size:24rpx;margin-top:10rpx}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/poster.vue b/pagesA/commission/poster.vue
new file mode 100644
index 0000000..7c19023
--- /dev/null
+++ b/pagesA/commission/poster.vue
@@ -0,0 +1,174 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<block v-if="postercount > 1">
+			<view class="arrowleft" @tap="changeposter" data-type="-1"><text class="iconfont iconjiantou" ></text></view>
+			<view class="arrowright" @tap="changeposter" data-type="1"><text class="iconfont iconjiantou"></text></view>
+		</block>
+		<image :src="poster" class="sjew-img" @tap="previewImage" :data-url="poster" mode="widthFix"></image>
+		<view class="sjew-box">
+			<view class="sjew-tle flex-y-center">如何推荐好友拿{{t('佣金')}}</view>
+			<view class="sjew-sp1"><text>{{guize}}</text></view>
+		</view>
+		<view class="sjew-he"></view>
+		<view class="sjew-bottom" :class="menuindex>-1?'tabbarbot':'notabbarbot'">
+			<view class="sjew-bottom-content">
+				<view class="sjew-bot-a1" :style="{background:t('color2')}" @tap="shareapp" v-if="getplatform() == 'app'">分享链接</view>
+				<view class="sjew-bot-a1" :style="{background:t('color2')}" @tap="sharemp" v-else-if="getplatform() == 'mp'">分享链接</view>
+				<view class="sjew-bot-a1" :style="{background:t('color2')}" @tap="sharemp" v-else-if="getplatform() == 'h5'">分享链接</view>
+				<button class="sjew-bot-a1" :style="{background:t('color2')}" open-type="share" v-else>分享链接</button>
+				<view class="sjew-bot-a2" :style="{background:t('color1')}" @tap="previewImage" :data-url="poster">分享图片</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();

+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			poster:'',
+			guize:'',
+			posterid:'',
+			posterlist:[],
+			postercount:1,
+      shopset: []
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onShareAppMessage: function (res){
+    var that = this;
+    var imageUrl = app.globalData.initdata.logo;
+    var title = app.globalData.initdata.name;
+    return {
+      title: title,
+      path: app.globalData.initdata.indexurl + '?scene=pid_' + app.globalData.mid,
+      imageUrl: imageUrl,
+      success: function (res) {// 转发成功
+      },
+      fail: function (res) {// 转发失败
+      }
+    };
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			var posterid = that.posterid;
+			app.showLoading('海报生成中');
+			app.get('ApiAgent/poster', {posterid:posterid}, function (res) {
+				app.showLoading(false);
+				if (res.status == 0) {
+					app.alert(res.msg);
+				}
+				that.poster = res.poster;
+				that.guize = res.guize;
+				that.posterid = res.posterid;
+				that.posterlist = res.posterlist;
+				that.postercount = res.postercount;
+				that.loaded({title:app.globalData.initdata.name,pic:app.globalData.initdata.logo,link:app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ app.globalData.initdata.indexurl + '?scene=pid_' + app.globalData.mid});
+			});
+		},
+    changeposter: function (e) {
+			var type = parseInt(e.currentTarget.dataset.type)
+      var that = this;
+			var posterlist = that.posterlist;
+			var posterid = that.posterid;
+			var index = 0;
+			for(var i in posterlist){
+				if(posterlist[i].id == posterid){
+					index = i;
+				}
+			}
+			index = parseInt(index) + type;
+			if(index == posterlist.length){
+				index = 0;
+			}
+			if(index < 0){
+				index = posterlist.length - 1;
+			}
+			that.posterid = posterlist[index].id;
+			that.getdata();
+    },
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+		},
+		shareapp:function(){
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = app.globalData.initdata.name;
+						sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+app.globalData.initdata.indexurl + '?scene=pid_' + app.globalData.mid;
+						sharedata.imageUrl = app.globalData.initdata.logo;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == app.globalData.initdata.indexurl){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+  }
+};
+</script>
+<style>
+.sjew-img{ width:100%; display: block;}
+.sjew-box{ width:100%; background:#FFF; margin-bottom:120rpx;padding-bottom:10px;margin-top:20rpx}
+.sjew-tle{ width:100%;padding:0 2%; border-bottom:1px #E6E6E6 solid;  height:100rpx;line-height:100rpx; color:#111;}
+.sjew-ic1{width:46rpx;height:46rpx;display: block;margin-right:10rpx;}
+.sjew-sp1{ width:100%; padding:0 20rpx; color:#666; margin-top:20rpx; }
+.sjew-sp2{ width:78%; color:#999; margin-top:20rpx; }
+.sjew-sp3{ width:96%; margin:20rpx 2%;background:#fe924a; padding:16rpx 2%; color:#fff;  box-sizing: border-box;}
+
+.sjew-bottom{ width:94%; position:fixed; bottom:0px;height:110rpx;line-height:110rpx;border-top:1px #ececec solid;background:#fff;display:flex;padding:15rpx 3%;box-sizing:content-box}
+.sjew-bottom-content{height:80rpx;line-height:80rpx;width:100%;border-radius:50rpx;display:flex;border-radius:45rpx;overflow:hidden}
+.sjew-bot-a1{flex:1;height:80rpx;line-height:80rpx;text-align:center;color:#fff;}
+.sjew-bot-a2{flex:1;height:80rpx;line-height:80rpx;text-align:center;color:#fff;}
+.sjew-he{width: 100%;height:20rpx;}
+
+.arrowleft{position:fixed;top:calc(var(--window-top) + 140rpx);display:flex;justify-content:center;z-index:8;transform: rotateY(180deg);background:rgba(0,0,0,0.3);color:#fff;border-radius:50%;left:40rpx;width:60rpx;height:60rpx;line-height:60rpx;text-align:center;}
+.arrowright{position:fixed;top:calc(var(--window-top) + 140rpx);display:flex;justify-content:center;z-index:8;background:rgba(0,0,0,0.3);color:#fff;border-radius:50%;right:40rpx;width:60rpx;height:60rpx;line-height:60rpx;text-align:center}

+</style>
\ No newline at end of file
diff --git a/pagesA/commission/teamfenhong.vue b/pagesA/commission/teamfenhong.vue
new file mode 100644
index 0000000..abce9f6
--- /dev/null
+++ b/pagesA/commission/teamfenhong.vue
@@ -0,0 +1,170 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topfix">
+			<view class="toplabel">
+				<text class="t1">分红订单（{{count}}）</text>
+				<text class="t2">预计：+{{commissionyj}}元</text>
+			</view>
+			<dd-tab :itemdata="['待结算','已结算']" :itemst="['1','2']" :st="st" :isfixed="false" @changetab="changetab"></dd-tab>
+		</view>
+		<view style="margin-top:190rpx"></view>
+		<block v-if="datalist && datalist.length>0">
+		<view class="content">
+			<block v-if="st==1">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.ordernum}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<text class="x1">{{item.name}} ×{{item.num}}</text>
+						<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item.real_totalprice}}</text>
+						<text class="x2">{{date(item.createtime)}}</text>
+						<view class="x3"><image :src="item.headimg"></image>{{item.nickname}}</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+						<text class="dior-sp6 yfk" v-if="item.status==1 || item.status==2">已付款</text>
+						<text class="dior-sp6 dfk" v-if="item.status==0">待付款</text>
+						<text class="dior-sp6 ywc" v-if="item.status==3">已完成</text>
+						<text class="dior-sp6 ygb" v-if="item.status==4">已关闭</text>
+						<text class="dior-sp6 ygb" v-if="item.refund_money > 0">退款/售后</text>
+					</view>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==2">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1"><text>{{item.remark}} {{date(item.createtime)}}</text></view>
+				<view class="f2">
+					<view class="t1">
+						<view v-for="(item2, index) in item.oglist" class="item2">
+							<text class="x1">{{item2.name}} ×{{item2.num}}</text>
+							<text class="x2" style="font-size:28rpx" :style="{color:t('color1')}">￥{{item2.real_totalprice}}</text>
+							<text class="x2">{{date(item2.createtime)}}</text>
+							<view class="x3"><image :src="item2.headimg"></image>{{item2.nickname}}</view>
+						</view>
+					</view>
+					<view class="t2">
+						<text class="x1">+{{item.commission}}</text>
+					</view>
+				</view>
+			</view>
+			</block>
+		</view>
+		</block>
+		<view style="width:100%;height:20rpx"></view>
+	</block>
+	<nodata v-if="nodata"></nodata>
+	<nomore v-if="nomore"></nomore>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      st: '1',
+			count:0,
+      commissionyj: 0,
+      pagenum: 1,
+      datalist: [],
+      nodata: false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.pagenum = 1;
+		this.datalist = [];
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore && this.st !=1) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata();
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			app.get('ApiAgent/teamfenhong',{st:st,pagenum: pagenum},function(res){
+				that.loading = false;
+				var data = res.datalist;
+        if (pagenum == 1) {
+					if(st == 1){
+						that.commissionyj = res.commissionyj;
+						that.count = res.count;
+					}
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+			});
+		},
+    changetab: function (st) {
+      this.pagenum = 1;
+      this.st = st;
+      this.datalist = [];
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.topfix{width: 100%;position:relative;position:fixed;background: #f9f9f9;top:var(--window-top);z-index:11;}
+.toplabel{width: 100%;background: #f9f9f9;padding: 20rpx 20rpx;border-bottom: 1px #e3e3e3 solid;display:flex;}
+.toplabel .t1{color: #666;font-size:30rpx;flex:1}
+.toplabel .t2{color: #666;font-size:30rpx;text-align:right}
+

+.content{ width:100%;}
+.content .item{width:94%;margin-left:3%;border-radius:10rpx;background: #fff;margin-bottom:16rpx;}
+.content .item .f1{width:100%;padding: 16rpx 20rpx;color: #666;border-bottom: 1px #f5f5f5 solid;}
+.content .item .f2{display:flex;padding:20rpx;align-items:center}
+.content .item .f2 .t1{display:flex;flex-direction:column;flex:auto}
+.content .item .f2 .t1 .item2{display:flex;flex-direction:column;flex:auto;margin:10rpx 0;padding:10rpx 0;border-bottom:1px dotted #f5f5f5}
+.content .item .f2 .t1 .x2{color:#999;font-size:24rpx;height:40rpx;line-height:40rpx}
+.content .item .f2 .t1 .x3{display:flex;align-items:center}
+.content .item .f2 .t1 .x3 image{width:40rpx;height:40rpx;border-radius:50%;margin-right:4px}
+.content .item .f2 .t2{ width:360rpx;text-align:right;display:flex;flex-direction:column;}
+.content .item .f2 .t2 .x1{color: #000;height:44rpx;line-height: 44rpx;overflow: hidden;font-size:36rpx;}
+.content .item .f2 .t2 .x2{height:44rpx;line-height: 44rpx;overflow: hidden;}
+
+.dfk{color: #ff9900;}
+.yfk{color: red;}
+.ywc{color: #ff6600;}
+.ygb{color: #aaaaaa;}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/commission/withdraw.vue b/pagesA/commission/withdraw.vue
new file mode 100644
index 0000000..dab3a96
--- /dev/null
+++ b/pagesA/commission/withdraw.vue
@@ -0,0 +1,207 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		<view class="mymoney" :style="{background:t('color1')}">
+			<view class="f1">我的可提现{{t('佣金')}}</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.commission}}</view>
+			<view class="f3" @tap="goto" data-url="commissionlog?st=1"><text>提现记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">提现金额(元)</view></view>
+			<view class="item3"><view class="f1">￥</view><view class="f2"><input class="input" type="digit" name="money" value="" placeholder="请输入提现金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput"></input></view></view>
+			<view class="item4" v-if="sysset.comwithdrawfee>0 || sysset.comwithdrawmin>0">
+				<text v-if="sysset.comwithdrawmin>0" style="margin-right:10rpx">最低提现金额{{sysset.comwithdrawmin}}元 </text>
+				<text v-if="sysset.comwithdrawfee>0">提现手续费{{sysset.comwithdrawfee}}% </text>
+			</view>
+			<view v-if="sysset.comwithdrawbl && sysset.comwithdrawbl!=100" style="width:94%;margin:0 3%;color:#8C8C8C;font-size:28rpx;margin-bottom:30rpx">提现金额的{{100-sysset.comwithdrawbl}}%将直接转到余额用于复购 </view>
+		</view>
+		<view class="withdrawtype">
+			<view class="f1">选择提现方式：</view>
+			<view class="f2">
+				<view class="item" v-if="sysset.withdraw_weixin==1" @tap.stop="changeradio" data-paytype="微信钱包">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信钱包</view>
+					<view class="radio" :style="paytype=='微信钱包' ? 'background:'+t('color1')+';border:0' :''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</view>
+				<label class="item" v-if="sysset.withdraw_aliaccount==1" @tap.stop="changeradio" data-paytype="支付宝">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝</view>
+					<view class="radio" :style="paytype=='支付宝' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+				<label class="item" v-if="sysset.withdraw_bankcard==1" @tap.stop="changeradio" data-paytype="银行卡">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-cash.png'"/>银行卡</view>
+					<view class="radio" :style="paytype=='银行卡' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+			</view>
+		</view>
+		<button class="btn" :style="{background:t('color1')}" @tap="formSubmit">立即提现</button>
+		<view v-if="paytype=='支付宝'" style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="/pages/my/setaliaccount">设置支付宝账户<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+		<view v-if="paytype=='银行卡'" style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="/pages/my/setbankinfo">设置银行卡账户<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo: [],
+		money: 0,
+		sysset: false,
+		paytype: '微信钱包',
+		tmplids:[],
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		var that = this;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiAgent/commissionWithdraw', {}, function (res) {
+				that.loading = false;
+				uni.setNavigationBarTitle({
+					title: that.t('佣金') + '提现'
+				});
+				var sysset = res.sysset;
+				that.sysset = sysset;
+				that.tmplids = res.tmplids;
+				that.userinfo = res.userinfo;
+				var paytype = '微信钱包';
+				if (sysset.withdraw_weixin == 1) {
+					paytype = '微信钱包';
+				}
+				if (!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) {
+					paytype = '支付宝';
+				}
+				if ((!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) && (!sysset.withdraw_aliaccount || sysset.withdraw_aliaccount == 0)) {
+					paytype = '银行卡';
+				}
+				that.paytype = paytype;
+				that.loaded();
+			});
+		},
+		
+    moneyinput: function (e) {
+      var usermoney = parseFloat(this.userinfo.commission);
+      var money = parseFloat(e.detail.value);
+      if (money < 0) {
+        app.error('必须大于0');
+      } else if (money > usermoney) {
+        app.error('可提现' + this.t('佣金') + '不足');
+      }
+			this.money = money;
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function () {
+      var that = this;
+      var usermoney = parseFloat(this.userinfo.commission);
+      var withdrawmin = parseFloat(this.sysset.withdrawmin); //var formdata = e.detail.value;
+
+      var money = parseFloat(that.money);
+      var paytype = this.paytype;
+      if (isNaN(money) || money <= 0) {
+        app.error('提现金额必须大于0');
+        return;
+      }
+      if (withdrawmin > 0 && money < withdrawmin) {
+        app.error('提现金额必须大于¥' + withdrawmin);
+        return;
+      }
+
+      if (money > usermoney) {
+        app.error(that.t('佣金') + '不足');
+        return;
+      }
+
+      if (paytype == '支付宝' && !this.userinfo.aliaccount) {
+        app.alert('请先设置支付宝账号', function () {
+          app.goto('/pages/my/setaliaccount');
+        });
+        return;
+      }
+      if (paytype == '银行卡' && (!this.userinfo.bankname || !this.userinfo.bankcarduser || !this.userinfo.bankcardnum)) {
+        app.alert('请先设置完整银行卡信息', function () {
+          app.goto('/pages/my/setbankinfo');
+        });
+        return;
+      }
+			
+			app.showLoading('提交中');
+      app.post('ApiAgent/commissionwithdraw', {money: money,paytype: paytype}, function (data) {
+				app.showLoading(false);
+        if (data.status == 0) {
+          app.error(data.msg);
+          return;
+        } else {
+          app.success(data.msg);
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goto('commissionlog?st=1');
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:60rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.withdrawtype{width:94%;margin:20rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.withdrawtype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+
+
+.withdrawtype .f2{padding:0 30rpx}
+.withdrawtype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.withdrawtype .f2 .item:last-child{border-bottom:0}
+.withdrawtype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#333}
+.withdrawtype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.withdrawtype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.withdrawtype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/pagesA/jinText/index.vue b/pagesA/jinText/index.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/pagesA/jinText/index.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/pagesA/money/moneylog.vue b/pagesA/money/moneylog.vue
new file mode 100644
index 0000000..80b6c16
--- /dev/null
+++ b/pagesA/money/moneylog.vue
@@ -0,0 +1,155 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="[t('余额')+'明细','充值记录','提现记录']" :itemst="['0','1','2']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="content">
+			<block v-if="st==0">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">{{item.remark}}</text>
+						<text class="t2">{{item.createtime}}</text>
+						<text class="t3">变更后余额: {{item.after}}</text>
+				</view>
+				<view class="f2">
+						<text class="t1" v-if="item.money>0">+{{item.money}}</text>
+						<text class="t2" v-else>{{item.money}}</text>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==1">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">充值金额：{{item.money}}元</text>
+						<text class="t2">{{item.createtime}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">充值失败</text>
+						<text class="t2" v-if="item.status==1">充值成功</text>
+				</view>
+			</view>
+			</block>
+			<block v-if="st==2">
+			<view v-for="(item, index) in datalist" :key="index" class="item">
+				<view class="f1">
+						<text class="t1">提现金额：{{item.money}}元</text>
+						<text class="t2">{{item.createtime}}</text>
+				</view>
+				<view class="f3">
+						<text class="t1" v-if="item.status==0">审核中</text>
+						<text class="t1" v-if="item.status==1">已审核</text>
+						<text class="t2" v-if="item.status==2">已驳回</text>
+						<text class="t1" v-if="item.status==3">已打款</text>
+				</view>
+			</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			canwithdraw:false,
+			textset:{},
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+			nodata:false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.st = this.opt.st || 0;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata(true);
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiMy/moneylog', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.textset = app.globalData.textset;
+					uni.setNavigationBarTitle({
+						title: that.t('余额') + '明细'
+					});
+					that.canwithdraw = res.canwithdraw;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx;display:flex;flex-direction:column}
+.content{ width:94%;margin:0 3% 20rpx 3%;}
+.content .item{width:100%;background:#fff;margin:20rpx 0;padding:20rpx 20rpx;border-radius:8px;display:flex;align-items:center}
+.content .item:last-child{border:0}
+.content .item .f1{width:500rpx;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;width:200rpx;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#03bc01}
+.content .item .f2 .t2{color:#000000}
+.content .item .f3{ flex:1;width:200rpx;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/pagesA/money/recharge.vue b/pagesA/money/recharge.vue
new file mode 100644
index 0000000..ef4170d
--- /dev/null
+++ b/pagesA/money/recharge.vue
@@ -0,0 +1,170 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="mymoney" :style="{background:t('color1')}">
+			<view class="f1">我的{{t('余额')}}</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.money}}</view>
+			<!-- <view class="f3" @tap="goto" data-url="/pagesA/money/moneylog?st=1"><text>充值记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view> -->
+			<view class="f3" @tap="goto" data-url="/newOtherPages/myBalance/myBalance?type=balance"><text>充值记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">充值金额(元)</view></view>
+			<block v-if="caninput==1">
+				<view class="item3"><view class="f1">￥</view><view class="f2"><input type="digit" name="money" :value="money" placeholder="请输入充值金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput" style="font-size:60rpx"/></view></view>
+			</block>
+			<view class="giveset" v-if="giveset.length>0">
+				<view v-for="(item, index) in giveset" :key="index" class="item" :class="moneyduan==item.money?'active':''" :style="moneyduan==item.money?'background:'+t('color1'):''" @tap="selectgiveset" :data-money="item.money">
+					<text class="t1">{{caninput==1?'满':'充'}}{{item.money}}元</text>
+					<text class="t2" v-if="item.give && item.give_score">赠{{item.give}}元+{{item.give_score}}{{t('积分')}}</text>
+					<text class="t2" v-else-if="item.give && !item.give_score">赠送{{item.give}}元</text>
+					<text class="t2" v-else-if="!item.give && item.give_score">赠送{{item.give_score}}{{t('积分')}}</text>
+				</view>
+			</view>
+			<view style="margin-top:40rpx;padding:0 30rpx;line-height:42rpx;" v-if="shuoming">
+				<parse :content="shuoming" @navigate="navigate"></parse>
+			</view>
+		</view>
+		<view class="op">
+			<view class="btn" @tap="topay" :style="{background:t('color1')}">去支付</view>
+		</view>
+		
+		<view class="op" v-if="transfer">
+			<view class="btn" @tap="goto" data-url="rechargeToMember" :style="{background:t('color2')}">转账</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+	<!-- 悬浮按钮 -->
+	<drag-button></drag-button>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			textset:{},
+			canrecharge:0,
+      userinfo: {},
+			giveset:[],
+			shuoming:'',
+      money: '',
+      moneyduan: 0,
+      give_coupon_list: "",
+      give_coupon_show: false,
+      give_coupon_close_url: "",
+			caninput:1,
+			transfer:false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata:function(){
+			var that = this;
+			app.loading = true;
+			app.get('ApiMoney/recharge', {}, function (res) {
+				app.loading = false;
+				if (res.canrecharge == 0) {
+					app.goto('moneylog?st=0', 'redirect');
+					return;
+				}
+				that.isload = true;
+				that.textset = app.globalData.textset;
+				uni.setNavigationBarTitle({
+					title: that.t('余额') + '充值'
+				});
+				that.canrecharge = res.canrecharge;
+				that.giveset = res.giveset;
+				that.caninput = res.caninput;
+				that.shuoming = res.shuoming;
+				that.userinfo = res.userinfo;
+				that.transfer = res.transfer;
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var money = e.detail.value;
+      var giveset = this.giveset;
+
+      if (parseFloat(money) < 0) {
+        app.error('必须大于0');
+      } else {
+        var moneyduan = 0;
+        if (giveset.length > 0) {
+          for (var i in giveset) {
+            if (money * 1 >= giveset[i]['money'] * 1 && giveset[i]['money'] * 1 > moneyduan) {
+              moneyduan = giveset[i]['money'] * 1;
+            }
+          }
+        }
+        this.money = money;
+        this.moneyduan = moneyduan;
+      }
+    },
+    selectgiveset: function (e) {
+      var money = e.currentTarget.dataset.money;
+      this.money = money;
+      this.moneyduan = money;
+    },
+    topay: function (e) {
+      var that = this;
+      var money = that.money;
+			var paytype = e.currentTarget.dataset.paytype;
+			that.loading = true;
+      app.post('ApiMoney/recharge',{money: money},function (res) {
+				that.loading = false;
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        }
+				app.goto('/pages/pay/pay?id='+res.payorderid);
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx}
+.content2 .item2 .f1{height:120rpx;line-height:120rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;border-bottom:1px solid #F0F0F0;}
+.content2 .item3 .f1{height:120rpx;line-height:120rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 input{height:120rpx;line-height:120rpx;}
+
+.op{width:96%;margin:20rpx 2%;display:flex;align-items:center;margin-top:40rpx}
+.op .btn{flex:1;height:100rpx;line-height:100rpx;background:#07C160;width:90%;margin:0 10rpx;border-radius:10rpx;color: #fff;font-size:28rpx;font-weight:bold;display:flex;align-items:center;justify-content:center}
+.op .btn .img{width:48rpx;height:48rpx;margin-right:20rpx}
+
+.giveset{width:100%;padding:20rpx 0rpx;display:flex;flex-wrap:wrap;justify-content:center}
+.giveset .item{margin:10rpx;padding:15rpx 0;width:210rpx;height:120rpx;background:#FDF6F6;border-radius:10rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}
+.giveset .item .t1{color:#545454;font-size:32rpx;}
+.giveset .item .t2{color:#8C8C8C;font-size:20rpx;margin-top:6rpx}
+.giveset .item.active .t1{color:#fff;font-size:32rpx}
+.giveset .item.active .t2{color:#fff;font-size:20rpx}
+</style>
\ No newline at end of file
diff --git a/pagesA/money/rechargeToMember.vue b/pagesA/money/rechargeToMember.vue
new file mode 100644
index 0000000..104e449
--- /dev/null
+++ b/pagesA/money/rechargeToMember.vue
@@ -0,0 +1,177 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		
+		<view class="content2">
+			<!-- <view class="item2"><view class="f1">对方手机号</view></view>
+			<view class="item3"><view class="f2"><input class="input" type="number" name="mobile" value="" placeholder="请输入手机号" placeholder-style="color:#999;font-size:36rpx" @input="mobileinput"></input></view></view>
+			<view class="item4" style="height: 1rpx;">
+			</view> -->
+			<view class="item2"><view class="f1">对方ID</view></view>
+			<view class="item3"><view class="f2"><input class="input" type="number" name="mid" value="" placeholder="请输入对方ID" placeholder-style="color:#999;font-size:36rpx"></input></view></view>
+			<view class="item4" style="height: 1rpx;">
+			</view>
+			<view class="item2"><view class="f1">转账金额</view></view>
+			<view class="item3"><view class="f2"><input class="input" type="number" name="money" value="" placeholder="请输入转账金额" placeholder-style="color:#999;font-size:36rpx" @input="moneyinput"></input></view>
+				<!-- <view class="giveset">
+					<view v-for="(item, index) in moneyList" :key="index" class="item" :class="moneySelected==item?'active':''" :style="moneySelected==item?'background:'+t('color1'):''" @tap="selectMoney" :data-money="item">
+						<text class="t1">{{item}}元</text>
+					</view>
+				</view> -->
+			</view>
+			<view class="item4">
+				<text style="margin-right:10rpx">您的当前{{t('余额')}}：{{mymoney}}，转账后不可退回 </text>
+			</view>
+		</view>
+		<button class="btn" :style="{background:t('color1')}" form-type="submit">转账</button>
+		<view class='text-center' @tap="goto" data-url='/pages/my/usercenter' style="margin-top: 40rpx; line-height: 60rpx;"><text>返回{{t('会员')}}中心</text></view>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+      userinfo: [],
+			moneyList:[],
+      mymoney: 0,
+			moneySelected: ''
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		console.log(app.globalData.mid)
+		console.log(getApp().globalData.mid)
+
+		var that = this;
+		// app.checkLogin();
+		uni.setNavigationBarTitle({
+			title: '转账'
+		});
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			app.get('ApiMoney/rechargeToMember', {}, function (res) {
+				if(res.status == 0) {
+					app.alert(res.msg);return;
+				}
+				if(res.status == 1) {
+					that.mymoney = res.mymoney;
+					that.moneyList = res.moneyList;
+				}
+				that.loaded();
+			});
+		},
+		
+		selectMoney: function (e) {
+		  var money = e.currentTarget.dataset.money;
+		  this.moneySelected = money;
+		},
+		mobileinput: function (e) {
+		  var value = parseFloat(e.detail.value);
+		},
+		
+    moneyinput: function (e) {
+      var money = parseFloat(e.detail.value);
+      
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function (e) {
+      var that = this;
+      // var money = parseFloat(that.moneySelected);
+      var money = parseFloat(e.detail.value.money);
+			var mid = parseInt(e.detail.value.mid);
+			var mobile = e.detail.value.mobile;
+			if (typeof(mobile) != 'undefined' && !/^1[3456789]\d{9}$/.test(mobile)) {
+			  app.error("手机号码有误，请重填");
+			  return false;
+			}
+			if (typeof(mid) != 'undefined' && (mid == '' || isNaN(mid))) {
+				app.error("请输入接收人ID");
+				return false;
+			}
+			if(typeof(mid) != 'undefined' && mid == app.globalData.mid) {
+				app.error("不能转账给自己");
+				return false;
+			}
+      if (isNaN(money) || money <= 0) {
+        app.error('转账金额必须大于0');
+        return;
+      }
+			
+			if (money < 0) {
+        app.error('转账金额必须大于0');return;
+      } else if (money > that.mymoney) {
+        app.error(this.t('余额') + '不足');return;
+      }
+
+			app.confirm('确定要转账吗？', function(){
+				app.showLoading();
+				app.post('ApiMoney/rechargeToMember', {money: money,mobile: mobile,mid:mid}, function (data) {
+					app.showLoading(false);
+				  if (data.status == 0) {
+				    app.error(data.msg);
+				    return;
+				  } else {
+				    app.success(data.msg);
+				    that.subscribeMessage(function () {
+				      setTimeout(function () {
+				        app.goto('/pages/my/usercenter');
+				      }, 1000);
+				    });
+				  }
+				}, '提交中');
+			})
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:36rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:36rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.text-center {text-align: center;}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.giveset{width:100%;padding:20rpx 20rpx 20rpx 20rpx;display:flex;flex-wrap:wrap;justify-content:center}
+.giveset .item{margin:10rpx;padding:15rpx 0;width:25%;height:100rpx;background:#FDF6F6;border-radius:10rpx;display:flex;flex-direction:row;align-items:center;justify-content:center}
+.giveset .item .t1{color:#545454;font-size:32rpx;}
+.giveset .item .t2{color:#8C8C8C;font-size:20rpx;margin-top:6rpx}
+.giveset .item.active .t1{color:#fff;font-size:32rpx}
+.giveset .item.active .t2{color:#fff;font-size:20rpx}
+</style>
\ No newline at end of file
diff --git a/pagesA/money/withdraw.vue b/pagesA/money/withdraw.vue
new file mode 100644
index 0000000..5ffbd2f
--- /dev/null
+++ b/pagesA/money/withdraw.vue
@@ -0,0 +1,203 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<form @submit="formSubmit">
+		<view class="mymoney" :style="{background:t('color1')}">
+			<view class="f1">我的{{t('余额')}}</view>
+			<view class="f2"><text style="font-size:26rpx">￥</text>{{userinfo.money}}</view>
+			<view class="f3" @tap="goto" data-url="moneylog?st=2"><text>提现记录</text><text class="iconfont iconjiantou" style="font-size:20rpx"></text></view>
+		</view>
+		<view class="content2">
+			<view class="item2"><view class="f1">提现金额(元)</view></view>
+			<view class="item3"><view class="f1">￥</view><view class="f2"><input class="input" type="digit" name="money" value="" placeholder="请输入提现金额" placeholder-style="color:#999;font-size:40rpx" @input="moneyinput"/></view></view>
+			<view class="item4" v-if="sysset.withdrawfee>0 || sysset.withdrawmin>0">
+				<text v-if="sysset.withdrawmin>0" style="margin-right:10rpx">最低提现金额{{sysset.withdrawmin}}元 </text>
+				<text v-if="sysset.withdrawfee>0">提现手续费{{sysset.withdrawfee}}% </text>
+			</view>
+		</view>
+		<view class="withdrawtype">
+			<view class="f1">选择提现方式：</view>
+			<view class="f2">
+				<view class="item" v-if="sysset.withdraw_weixin==1" @tap.stop="changeradio" data-paytype="微信钱包">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-weixin.png'"/>微信钱包</view>
+					<view class="radio" :style="paytype=='微信钱包' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</view>
+				<label class="item" v-if="sysset.withdraw_aliaccount==1" @tap.stop="changeradio" data-paytype="支付宝">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-alipay.png'"/>支付宝</view>
+					<view class="radio" :style="paytype=='支付宝' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+				<label class="item" v-if="sysset.withdraw_bankcard==1" @tap.stop="changeradio" data-paytype="银行卡">
+					<view class="t1"><image class="img" :src="event_rul +'/static/img/static/img/withdraw-cash.png'"/>银行卡</view>
+					<view class="radio" :style="paytype=='银行卡' ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+				</label>
+			</view>
+		</view>
+		<button class="btn" @tap="formSubmit" :style="{background:t('color1')}">立即提现</button>
+		
+		<view v-if="paytype=='支付宝'" style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="/pages/my/setaliaccount">设置支付宝账户<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+		<view v-if="paytype=='银行卡'" style="width:100%;margin-top:40rpx;text-align:center;color:#999;display:flex;align-items:center;justify-content:center" @tap="goto" data-url="/pages/my/setbankinfo">设置银行卡账户<image :src="event_rul +'/static/img/static/img/arrowright.png'" style="width:30rpx;height:30rpx"/></view>
+	</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo: [],
+		sysset: false,
+		paytype: '微信钱包',
+		show: 0,
+		money:0,
+		tmplids:[],
+
+		event_rul: app.globalData.event_url,
+			
+    };
+  },
+
+  onShow: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiMy/withdraw', {}, function (res) {
+				that.loading = false;
+				uni.setNavigationBarTitle({
+					title: that.t('余额') + '提现'
+				});
+				that.userinfo = res.userinfo;
+				that.sysset = res.sysset;
+				that.tmplids = res.tmplids;
+				var sysset = res.sysset;
+				var paytype = '微信钱包';
+				if (sysset.withdraw_weixin == 1) {
+					paytype = '微信钱包';
+				}
+				if (!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) {
+					paytype = '支付宝';
+				}
+				if ((!sysset.withdraw_weixin || sysset.withdraw_weixin == 0) && (!sysset.withdraw_aliaccount || sysset.withdraw_aliaccount == 0)) {
+					paytype = '银行卡';
+				}
+				that.paytype = paytype;
+				that.loaded();
+			});
+		},
+    moneyinput: function (e) {
+      var usermoney = parseFloat(this.userinfo.money);
+      var money = parseFloat(e.detail.value);
+      if (money < 0) {
+        app.error('必须大于0');
+      } else if (money > usermoney) {
+        app.error('可提现' + this.t('余额') + '不足');
+      }
+			this.money = money;
+    },
+    changeradio: function (e) {
+      var that = this;
+      var paytype = e.currentTarget.dataset.paytype;
+      that.paytype = paytype;
+    },
+    formSubmit: function () {
+      var that = this;
+      var usermoney = parseFloat(this.userinfo.money);
+      var withdrawmin = parseFloat(this.sysset.withdrawmin); //var formdata = e.detail.value;
+      var money = parseFloat(that.money);
+      var paytype = this.paytype;
+      if (isNaN(money) || money <= 0) {
+        app.error('提现金额必须大于0');
+        return;
+      }
+      if (withdrawmin > 0 && money < withdrawmin) {
+        app.error('提现金额必须大于¥' + withdrawmin);
+        return;
+      }
+      if (money > usermoney) {
+        app.error(this.t('余额') + '不足');
+        return;
+      }
+      if (paytype == '支付宝' && !this.userinfo.aliaccount) {
+        app.alert('请先设置支付宝账号', function () {
+          app.goto('/pages/my/setaliaccount');
+        });
+        return;
+      }
+      if (paytype == '银行卡' && (!this.userinfo.bankname || !this.userinfo.bankcarduser || !this.userinfo.bankcardnum)) {
+        app.alert('请先设置完整银行卡信息', function () {
+          app.goto('/pages/my/setbankinfo');
+        });
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiMy/withdraw', {money: money,paytype: paytype}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          app.error(res.msg);
+          return;
+        } else {
+          app.success(res.msg);
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goto('moneylog?st=2');
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{display:flex;flex-direction:column}
+.mymoney{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.mymoney .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.mymoney .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+.mymoney .f3{height:56rpx;padding:0 10rpx 0 20rpx;border-radius: 28rpx 0px 0px 28rpx;background:rgba(255,255,255,0.2);font-size:20rpx;font-weight:bold;color:#fff;display:flex;align-items:center;position:absolute;top:94rpx;right:0}
+
+.content2{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff}
+.content2 .item1{display:flex;width:100%;border-bottom:1px solid #F0F0F0;padding:0 30rpx}
+.content2 .item1 .f1{flex:1;font-size:32rpx;color:#333333;font-weight:bold;height:120rpx;line-height:120rpx}
+.content2 .item1 .f2{color:#FC4343;font-size:44rpx;font-weight:bold;height:120rpx;line-height:120rpx}
+
+.content2 .item2{display:flex;width:100%;padding:0 30rpx;padding-top:10rpx}
+.content2 .item2 .f1{height:80rpx;line-height:80rpx;color:#999999;font-size:28rpx}
+
+.content2 .item3{display:flex;width:100%;padding:0 30rpx;padding-bottom:20rpx}
+.content2 .item3 .f1{height:100rpx;line-height:100rpx;font-size:60rpx;color:#333333;font-weight:bold;margin-right:20rpx}
+.content2 .item3 .f2{display:flex;align-items:center;font-size:60rpx;color:#333333;font-weight:bold}
+.content2 .item3 .f2 .input{font-size:60rpx;height:100rpx;line-height:100rpx;}
+.content2 .item4{display:flex;width:94%;margin:0 3%;border-top:1px solid #F0F0F0;height:100rpx;line-height:100rpx;color:#8C8C8C;font-size:28rpx}
+
+.withdrawtype{width:94%;margin:20rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;margin-top:20rpx;background:#fff}
+.withdrawtype .f1{height:100rpx;line-height:100rpx;padding:0 30rpx;color:#333333;font-weight:bold}
+
+
+.withdrawtype .f2{padding:0 30rpx}
+.withdrawtype .f2 .item{border-bottom:1px solid #f5f5f5;height:100rpx;display:flex;align-items:center}
+.withdrawtype .f2 .item:last-child{border-bottom:0}
+.withdrawtype .f2 .item .t1{flex:1;display:flex;align-items:center;color:#333}
+.withdrawtype .f2 .item .t1 .img{width:44rpx;height:44rpx;margin-right:40rpx}
+
+.withdrawtype .f2 .item .radio{flex-shrink:0;width: 36rpx;height: 36rpx;background: #FFFFFF;border: 3rpx solid #BFBFBF;border-radius: 50%;margin-right:10rpx}
+.withdrawtype .f2 .item .radio .radio-img{width:100%;height:100%}
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:30rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/pagesA/shop/buy.vue b/pagesA/shop/buy.vue
new file mode 100644
index 0000000..f41e0a3
--- /dev/null
+++ b/pagesA/shop/buy.vue
@@ -0,0 +1,1646 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<form @submit="topay">
+<!-- 				<view class="batal-new">
+					<view class="batal-new-l">
+						<view class="batal-new-l-t">
+							<text class="batal-new-l-til">懒商会员店</text>
+							<text class="iconfont icon-arrow-right"></text>
+						</view>
+						<view class="batal-new-l-ad">店铺地址：广东省深圳市龙华区</view>
+					</view>
+					<view class="batal-new-r">
+						<view class="batal-new-r-t" :class="sinceActive == 1 ? 'since-n':''" @click="sinceChange(1)">自提</view>
+						<view class="batal-new-r-t" :class="sinceActive == 2 ? 'since-t':''" @click="sinceChange(2)">配送</view>
+					</view>
+				</view> -->
+<!-- 				<view class="" v-if="sinceActive == 2">
+					<view class="distribution">
+						<text>同城配送</text>
+						<view class="distribution-time">
+							<view class="f2" @tap="chooseNewPstime" :data-bid="allbuydata[0].freightList[sinceActive].bid" >
+								{{allbuydata[0].pstimetext == ''?'请选择配送时间':allbuydata[0].pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</view>
+						</view>
+					</view> -->
+
+				<!-- </view> -->
+				<view v-if="needaddress==0" class="address-add">
+					<view class="linkitem">
+						<text class="f1">联 系 人：</text>
+						<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman"
+							placeholder-style="color:#626262;font-size:28rpx" />
+					</view>
+					<view class="linkitem">
+						<text class="f1">联系电话：</text>
+						<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel"
+							placeholder-style="color:#626262;font-size:28rpx" />
+					</view>
+				</view>
+				<view v-else class="add-dres" @tap="goto"
+					:data-url="'/pages/address/'+(address.id ? 'address' : 'addressadd')+'?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+					<text class="iconfont icon-weizhi" style="font-size: 50rpx;"></text>
+					<view class="add-dres-r" style="width: 90%;">
+						<view class="f2 flex1" v-if="address.id">
+							<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+							<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+						</view>
+						<text v-else style="color: #999;">请填写地址信息</text>
+						<text class="iconfont iconjiantou" style="color:#999;font-weight:normal; font-size: 30rpx;"></text>
+					</view>
+				</view>
+<!-- 				<view v-else class="address-add flex-y-center" @tap="goto"
+					:data-url="'/pages/address/'+(address.id ? 'address' : 'addressadd')+'?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+					<view class="f1">
+						<image class="img" :src="event_rul +'/static/img/static/img/address.png'" />
+					</view>
+					<view class="f2 flex1" v-if="address.id">
+						<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+						<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+					</view>
+					<view v-else class="f2 flex1">请选择收货地址</view>
+					<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"></image>
+				</view> -->
+				<view v-for="(buydata, index) in allbuydata" :key="index" class="buydata">
+					<view class="btitle">
+						<image class="img" :src="event_rul +'/static/img/static/img/ico-shop.png'" />{{buydata.business.name}}
+					</view>
+					<view class="bcontent">
+						<view class="product">
+							<view v-for="(item, index2) in buydata.prodata" :key="index2" class="item flex">
+								<view class="img" @tap="goto" :data-url="'/pages/shop/product?id=' + item.product.id">
+									<image v-if="item.guige.pic" :src="item.guige.pic"></image>
+									<image v-else :src="item.product.pic"></image>
+								</view>
+								<view class="info flex1">
+									<view class="f1">{{item.product.name}}</view>
+									<view class="f2">规格：{{item.guige.name}}</view>
+									<view class="f3">
+										<block v-if="order_change_price"><input type="number" :value="item.guige.sell_price" :data-price="item.guige.sell_price" :data-index="index" :data-index2="index2" class="inputPrice" @input="inputPrice"></block>
+										<block v-else><text style="font-weight:bold;">￥{{item.guige.sell_price}}</text></block>
+										<text style="padding-left:20rpx"> × {{item.num}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="freight">
+							<view class="f1">配送方式</view>
+							<view class="freight-ul">
+								<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+									<block v-for="(item, idx2) in buydata.freightList" :key="idx2">
+										<view class="freight-li"
+											:style="buydata.freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''"
+											@tap="changeFreight" :data-bid="buydata.bid" :data-index="idx2">{{item.name}}
+										</view>
+									</block>
+								</view>
+							</view>
+							<view class="freighttips"
+								v-if="buydata.freightList[buydata.freightkey].minpriceset==1 && buydata.freightList[buydata.freightkey].minprice > 0 && buydata.freightList[buydata.freightkey].minprice*1 > buydata.product_price*1">
+								满{{buydata.freightList[buydata.freightkey].minprice}}元起送，还差{{(buydata.freightList[buydata.freightkey].minprice - buydata.product_price).toFixed(2)}}元
+							</view>
+							<view class="freighttips" v-if="buydata.freightList[buydata.freightkey].isoutjuli==1">超出配送范围</view>
+						</view>
+
+						<view class="price" v-if="buydata.freightList[buydata.freightkey].pstimeset==1">
+							<view class="f1">{{buydata.freightList[buydata.freightkey].pstype==1?'取货':'配送'}}时间</view>
+							<view class="f2" @tap="choosePstime" :data-bid="buydata.bid">
+								{{buydata.pstimetext==''?'请选择时间':buydata.pstimetext}}<text class="iconfont iconjiantou"
+									style="color:#999;font-weight:normal"></text>
+							</view>
+						</view>
+						<view class="storeitem" v-if="buydata.freightList[buydata.freightkey].pstype==1">
+							<view class="panel">
+								<view class="f1">取货地点</view>
+								<view class="f2" @tap="openMendian" :data-bid="buydata.bid"
+									:data-freightkey="buydata.freightkey"
+									:data-storekey="buydata.freightList[buydata.freightkey].storekey"><text
+										class="iconfont icondingwei"></text>{{buydata.freightList[buydata.freightkey].storedata[buydata.freightList[buydata.freightkey].storekey].name}}
+								</view>
+							</view>
+							<block v-for="(item, idx) in buydata.freightList[buydata.freightkey].storedata" :key="idx">
+								<view class="radio-item" @tap.stop="choosestore" :data-bid="buydata.bid" :data-index="idx" v-if="idx<5 || storeshowall==true">
+									<view class="f1">{{item.name}} </view>
+									<text style="color:#f50;">{{item.juli}}</text>
+									<view class="radio"
+										:style="buydata.freightList[buydata.freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''">
+										<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+									</view>
+								</view>
+							</block>
+							<view v-if="storeshowall==false && (buydata.freightList[buydata.freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+						</view>
+						
+						<view class="storeitem" v-if="buydata.freightList[buydata.freightkey].pstype==5">
+							<view class="panel">
+								<view class="f1">配送门店</view>
+								<view class="f2" @tap="openMendian" :data-bid="buydata.bid"
+									:data-freightkey="buydata.freightkey"
+									:data-storekey="buydata.freightList[buydata.freightkey].storekey"><text
+										class="iconfont icondingwei"></text>{{buydata.freightList[buydata.freightkey].storedata[buydata.freightList[buydata.freightkey].storekey].name}}
+								</view>
+							</view>
+							<block v-for="(item, idx) in buydata.freightList[buydata.freightkey].storedata" :key="idx">
+								<view class="radio-item" @tap.stop="choosestore" :data-bid="buydata.bid" :data-index="idx" v-if="idx<5 || storeshowall==true">
+									<view class="f1">{{item.name}} </view>
+									<text style="color:#f50;">{{item.juli}}</text>
+									<view class="radio"
+										:style="buydata.freightList[buydata.freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''">
+										<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+									</view>
+								</view>
+							</block>
+							<view v-if="storeshowall==false && (buydata.freightList[buydata.freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+						</view>
+
+						<view class="price" v-if="buydata.freightList[buydata.freightkey].pstype==11">
+							<view class="f1">选择物流</view>
+							<view class="f2" @tap="showType11List" :data-bid="buydata.bid">
+								<text>{{buydata.type11key?buydata.freightList[buydata.freightkey].type11pricedata[buydata.type11key-1].name:'请选择'}}</text><text
+									class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</view>
+						</view>
+
+						<view class="price">
+							<text class="f1">商品金额</text>
+							<text class="f2">¥{{buydata.product_price}}</text>
+						</view>
+						<view class="price" v-if="buydata.leveldk_money>0">
+							<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+							<text class="f2">-¥{{buydata.leveldk_money}}</text>
+						</view>
+						<view class="price" v-if="buydata.manjian_money>0">
+							<text class="f1">满减活动</text>
+							<text class="f2">-¥{{buydata.manjian_money}}</text>
+						</view>
+						<view class="price">
+							<text class="f1">{{buydata.freightList[buydata.freightkey].freight_price_txt || '运费'}}<text v-if="buydata.freightList[buydata.freightkey].pstype!=1 && buydata.freightList[buydata.freightkey].freeset==1" style="color:#aaa;font-size:24rpx;">（满{{buydata.freightList[buydata.freightkey].free_price}}元包邮）</text></text>
+							<text class="f2">+¥{{buydata.freightList[buydata.freightkey].freight_price}}</text>
+						</view>
+						<view class="price">
+							<view class="f1">{{t('优惠券')}}</view>
+							<view v-if="buydata.couponCount > 0" class="f2" @tap="showCouponList" :data-bid="buydata.bid">
+								<text
+									style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx"
+									:style="{background:t('color1')}">{{buydata.couponrid!=0?buydata.couponList[buydata.couponkey].couponname:buydata.couponCount+'张可用'}}</text><text
+									class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</view>
+							<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+						</view>
+						<view class="price" v-if="buydata.cuxiaoCount > 0">
+							<view class="f1">促销活动</view>
+							<view class="f2" @tap="showCuxiaoList" :data-bid="buydata.bid">
+								<block v-if="buydata.cuxiaonameArr && buydata.cuxiaonameArr.length > 0">
+									<view :style="{background:t('color1')}" class="redBg" v-for="(item,index) in buydata.cuxiaonameArr">{{item}}</view>
+								</block>
+								<block v-else>
+									<text :style="{background:t('color1')}" class="redBg">{{buydata.cuxiaoname?buydata.cuxiaoname:buydata.cuxiaoCount+'个可用'}}</text>
+								</block>
+							</view>
+							<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+						</view>
+						<view class="price" v-if="buydata.business.invoice > 0">
+							<view class="f1">发票</view>
+							<view class="f2" @tap="showInvoice" :data-url="'/pages/shop/invoice?bid=' + buydata.bid + '&prodata=' + opt.prodata" :data-bid="buydata.bid" :data-index="index">
+								<text
+									style="font-size:24rpx" v-if="buydata.tempInvoice && buydata.tempInvoice.invoice_name">
+									<text v-if="buydata.tempInvoice && buydata.tempInvoice.name_type == 1">个人 - </text>
+									<text v-if="buydata.tempInvoice && buydata.tempInvoice.name_type == 2">公司 - </text>
+									{{buydata.tempInvoice.invoice_name}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</view>
+						</view>
+
+						<view style="display:none">{{test}}</view>
+						<view class="form-item" v-for="(item,idx) in buydata.freightList[buydata.freightkey].formdata" :key="item.id">
+							<view class="label">{{item.val1}}<text v-if="item.val3==1" style="color:red"> *</text></view>
+							<block v-if="item.key=='input'">
+								<input type="text" :name="'form'+buydata.bid+'_'+idx" class="input" :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+							</block>
+							<block v-if="item.key=='textarea'">
+								<textarea :name="'form'+buydata.bid+'_'+idx" class='textarea' :placeholder="item.val2" placeholder-style="font-size:28rpx"/>
+							</block>
+							<block v-if="item.key=='radio'">
+								<radio-group class="radio-group" :name="'form'+buydata.bid+'_'+idx">
+									<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+										<radio class="radio" :value="item1"/>{{item1}}
+									</label>
+								</radio-group>
+							</block>
+							<block v-if="item.key=='checkbox'">
+								<checkbox-group :name="'form'+buydata.bid+'_'+idx" class="checkbox-group">
+									<label v-for="(item1,idx1) in item.val2" :key="item1.id" class="flex-y-center">
+										<checkbox class="checkbox" :value="item1"/>{{item1}}
+									</label>
+								</checkbox-group>
+							</block>
+							<block v-if="item.key=='selector'">
+								<picker class="picker" mode="selector" :name="'form'+buydata.bid+'_'+idx" value="" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx] || buydata.editorFormdata[idx]===0"> {{item.val2[buydata.editorFormdata[idx]]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='time'">
+								<picker class="picker" mode="time" :name="'form'+buydata.bid+'_'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx]">{{buydata.editorFormdata[idx]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='date'">
+								<picker class="picker" mode="date" :name="'form'+buydata.bid+'_'+idx" value="" :start="item.val2[0]" :end="item.val2[1]" :range="item.val2" @change="editorBindPickerChange" :data-bid="buydata.bid" :data-idx="idx">
+									<view v-if="buydata.editorFormdata[idx]">{{buydata.editorFormdata[idx]}}</view>
+									<view v-else>请选择</view>
+								</picker>
+								<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+							</block>
+							<block v-if="item.key=='upload'">
+								<input type="text" style="display:none" :name="'form'+buydata.bid+'_'+idx" :value="buydata.editorFormdata[idx]"/>
+								<view class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+									<view class="form-imgbox" v-if="buydata.editorFormdata[idx]">
+										<view class="form-imgbox-img"><image class="image" :src="buydata.editorFormdata[idx]" @click="previewImage" :data-url="buydata.editorFormdata[idx]" mode="widthFix"/></view>
+									</view>
+									<view class="form-uploadbtn" :style="{background:'url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 50rpx',backgroundSize:'80rpx 80rpx',backgroundColor:'#F3F3F3'}" @click="editorChooseImage" :data-bid="buydata.bid" :data-idx="idx"></view>
+								</view>
+							</block>
+						</view>
+					</view>
+				</view>
+				<view class="scoredk" v-if="buy_selectmember">
+					<view class="price">
+						<view class="f1">选择会员</view>
+						<view class="f2" @tap="showMemberList">
+							<text>{{checkMem.id?checkMem.nickname:'请选择'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+						</view>
+					</view>
+				</view>
+				<view class="scoredk"
+					v-if="userinfo.score2money>0 && (userinfo.scoremaxtype==0 || (userinfo.scoremaxtype==1 && userinfo.scoredkmaxmoney>0))">
+					<checkbox-group @change="scoredk" class="flex" style="width:100%">
+						<view class="f1">
+							<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text
+									style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+							<view style="font-size:22rpx;color:#999"
+								v-if="userinfo.scoremaxtype==0 && userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">
+								最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+							<view style="font-size:22rpx;color:#999" v-else-if="userinfo.scoremaxtype==1">
+								最多可抵扣{{userinfo.scoredkmaxmoney}}元</view>
+						</view>
+						<view class="f2">使用{{t('积分')}}抵扣
+							<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+						</view>
+					</checkbox-group>
+				</view>
+				<view style="width: 100%; height:110rpx;"></view>
+				<view class="footer flex notabbarbot">
+					<view class="text1 flex1">总计：
+						<text style="font-weight:bold;font-size:36rpx">￥{{alltotalprice}}</text>
+					</view>
+					<button class="op" form-type="submit" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" :disabled="submitDisabled">
+						提交订单</button>
+				</view>
+			</form>
+
+			<view v-if="invoiceShow" class="popup__container">
+				<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+				<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">请填写开票信息</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+							@tap.stop="handleClickMask" />
+					</view>
+					<view class="popup__content invoiceBox">
+						<form @submit="invoiceFormSubmit" @reset="formReset" report-submit="true">
+							<view class="orderinfo">
+								<view class="item">
+									<text class="t1">发票类型</text>
+									<view class="t2">
+											<radio-group class="radio-group" @change="changeOrderType" name="invoice_type">
+											<label class="radio" v-if="inArray(1,invoice_type)">
+												<radio value="1" :checked="invoice_type_select == 1 ? true : false"></radio>普通发票
+											</label>
+											<label class="radio" v-if="inArray(2,invoice_type)">
+												<radio value="2" :checked="invoice_type_select == 2 ? true : false"></radio>增值税专用发票
+											</label>
+											</radio-group>
+									 </view>
+								</view>
+								<view class="item">
+									<text class="t1">抬头类型</text>
+									<view class="t2">
+										<block v-if="inputDisabled">
+											<text v-if="invoice && invoice.name_type == 1">个人</text>
+											<text v-if="invoice && invoice.name_type == 2">公司</text>
+										</block>
+										<block v-else>
+											<radio-group class="radio-group" @change="changeNameType" name="name_type">
+											<label class="radio">
+												<radio value="1" :checked="name_type_select == 1 ? true : false" :disabled="name_type_personal_disabled ? true : false"></radio>个人
+											</label>
+											<label class="radio">
+												<radio value="2" :checked="name_type_select == 2 ? true : false"></radio>公司
+											</label>
+											</radio-group>
+										</block>
+									</view>
+								</view>
+								<view class="item">
+									<text class="t1">抬头名称</text>
+									<input class="t2" type="text" placeholder="抬头名称" placeholder-style="font-size:28rpx;color:#BBBBBB" name="invoice_name" :disabled="inputDisabled" :value="invoice ? invoice.invoice_name : ''" ></input>
+								</view>
+								<view class="item" v-if="name_type_select == 2">
+									<text class="t1">公司税号</text>
+									<input class="t2" type="text" placeholder="公司税号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="tax_no" :disabled="inputDisabled" :value="invoice ? invoice.tax_no : ''"></input>
+								</view>
+								<view class="item" v-if="invoice_type_select == 2">
+									<text class="t1">注册地址</text>
+									<input class="t2" type="text" placeholder="注册地址" placeholder-style="font-size:28rpx;color:#BBBBBB" name="address" :disabled="inputDisabled" :value="invoice ? invoice.address : ''"></input>
+								</view>
+								<view class="item" v-if="invoice_type_select == 2">
+									<text class="t1">注册电话</text>
+									<input class="t2" type="text" placeholder="注册电话" placeholder-style="font-size:28rpx;color:#BBBBBB" name="tel" :disabled="inputDisabled" :value="invoice ? invoice.tel : ''"></input>
+								</view>
+								<view class="item" v-if="invoice_type_select == 2">
+									<text class="t1">开户银行</text>
+									<input class="t2" type="text" placeholder="开户银行" placeholder-style="font-size:28rpx;color:#BBBBBB" name="bank_name" :disabled="inputDisabled" :value="invoice ? invoice.bank_name : ''"></input>
+								</view>
+								<view class="item" v-if="invoice_type_select == 2">
+									<text class="t1">银行账号</text>
+									<input class="t2" type="text" placeholder="银行账号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="bank_account" :disabled="inputDisabled" :value="invoice ? invoice.bank_account : ''"></input>
+								</view>
+								<view class="item">
+									<text class="t1">手机号</text>
+									<input class="t2" type="text" placeholder="接收电子发票手机号" placeholder-style="font-size:28rpx;color:#BBBBBB" name="mobile" :disabled="inputDisabled" :value="invoice ? invoice.mobile : ''"></input>
+								</view>
+								<view class="item">
+									<text class="t1">邮箱</text>
+									<input class="t2" type="text" placeholder="接收电子发票邮箱" placeholder-style="font-size:28rpx;color:#BBBBBB" name="email" :disabled="inputDisabled" :value="invoice ? invoice.email : ''"></input>
+								</view>
+							</view>
+							<button class="btn" form-type="submit" :style="{background:t('color1')}">确定</button>
+							<view style="padding-top:30rpx"></view>
+						</form>
+					</view>
+				</view>
+			</view>
+			
+			<view v-if="couponvisible" class="popup__container">
+				<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+				<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+							@tap.stop="handleClickMask" />
+					</view>
+					<view class="popup__content">
+						<couponlist :couponlist="allbuydata[bid].couponList" :choosecoupon="true"
+							:selectedrid="allbuydata[bid].couponrid" :bid="bid" @chooseCoupon="chooseCoupon">
+						</couponlist>
+					</view>
+				</view>
+			</view>
+			<view v-if="pstimeDialogShow" class="popup__container">
+				<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+				<view class="popup__modal">
+					<view class="popup__title">
+						<text
+							class="popup__title-text">请选择{{allbuydata[nowbid].freightList[allbuydata[nowbid].freightkey].pstype==1?'取货':'配送'}}时间</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+							@tap.stop="hidePstimeDialog" />
+					</view>
+					<view class="popup__content">
+						<view class="pstime-item"
+							v-for="(item, index) in allbuydata[nowbid].freightList[allbuydata[nowbid].freightkey].pstimeArr"
+							:key="index" @tap="pstimeRadioChange" :data-index="index">
+							<view class="flex1">{{item.title}}</view>
+							<view class="radio"
+								:style="allbuydata[nowbid].freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''">
+								<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view v-if="cuxiaovisible" class="popup__container">
+				<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+				<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">优惠促销</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+							@tap.stop="handleClickMask" />
+					</view>
+					<view class="popup__content">
+						<view class="cuxiao-desc">
+							<block v-if="multi_promotion">
+								<view class="cuxiao-item" @tap="changecxMulti" data-id="0">
+									<view class="type-name"><text style="color:#333">不使用促销</text></view>
+									<view class="radio" :style="cxid === 0 ? 'background:'+t('color1')+';border:0' : ''">
+										<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+									</view>
+								</view>
+								<view v-for="(item, index) in allbuydata[bid].cuxiaolist" :key="index" class="cuxiao-item"
+									@tap="changecxMulti" :data-id="item.id" :data-index="index">
+									<view class="type-name">
+										<text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text>
+										<text style="color:#333;padding-left:20rpx">{{item.name}}</text>
+									</view>
+									<view class="radio" :style="cxids.indexOf(item.id) !== -1 ? 'background:'+t('color1')+';border:0' : ''">
+										<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+									</view>
+								</view>
+							</block>
+							<block v-else>
+								<view class="cuxiao-item" @tap="changecx" data-id="0">
+									<view class="type-name"><text style="color:#333">不使用促销</text></view>
+									<view class="radio" :style="cxid == 0 ? 'background:'+t('color1')+';border:0' : ''">
+										<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+									</view>
+								</view>
+								<view v-for="(item, index) in allbuydata[bid].cuxiaolist" :key="index" class="cuxiao-item"
+									@tap="changecx" :data-id="item.id" :data-index="index">
+									<view class="type-name">
+										<text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text>
+										<text style="color:#333;padding-left:20rpx">{{item.name}}</text>
+									</view>
+									<view class="radio" :style="cxid==item.id ? 'background:'+t('color1')+';border:0' : ''">
+										<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+									</view>
+								</view>
+							</block>
+						</view>
+						<view id="cxproinfo" v-if="cuxiaoinfo.product" style="padding:0 40rpx">
+							<view class="product">
+								<view class="item flex" style="background:#f5f5f5">
+									<view class="img" @tap="goto"
+										:data-url="'/pages/shop/product?id=' + cuxiaoinfo.product.id">
+										<image :src="cuxiaoinfo.product.pic"></image>
+									</view>
+									<view class="info flex1">
+										<view class="f1">{{cuxiaoinfo.product.name}}</view>
+										<view class="f2">规格：{{cuxiaoinfo.guige.name}}</view>
+										<view class="f3">
+											<text style="font-weight:bold;">￥{{cuxiaoinfo.guige.sell_price}}</text>
+											<text style="padding-left:20rpx"> × 1</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view style="width:100%; height:120rpx;"></view>
+						<view style="width:100%;position:absolute;bottom:0;padding:20rpx 5%;background:#fff">
+							<view
+								style="width:100%;height:80rpx;line-height:80rpx;border-radius:40rpx;text-align:center;color:#fff;"
+								:style="{background:t('color1')}" @tap="chooseCuxiao">确 定</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="type11visible" class="popup__container">
+				<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+				<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">选择物流</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+							@tap.stop="handleClickMask" />
+					</view>
+					<view class="popup__content">
+						<view class="cuxiao-desc">
+							<view
+								v-for="(item, index) in allbuydata[bid].freightList[allbuydata[bid].freightkey].type11pricedata"
+								:key="index" @tap="changetype11" :data-index="index" style="padding:0 30rpx 20rpx 40rpx"
+								v-if="address.id && address.province==item.province && address.city==item.city && address.district==item.area">
+								<view class="cuxiao-item" style="padding:0">
+									<view class="type-name"><text
+											style="color:#333;font-weight:bold;">{{item.name}}</text></view>
+									<view class="radio"
+										:style="type11key==index ? 'background:'+t('color1')+';border:0' : ''">
+										<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+									</view>
+								</view>
+								<view style="margin-left:20rpx">发货: {{item.send_address}} - {{item.send_tel}}</view>
+								<view style="margin-left:20rpx">收货: {{item.receive_address}} - {{item.receive_tel}}
+								</view>
+							</view>
+						</view>
+						<view style="width:100%; height:120rpx;"></view>
+						<view style="width:100%;position:absolute;bottom:0;padding:20rpx 5%;background:#fff">
+							<view
+								style="width:100%;height:80rpx;line-height:80rpx;border-radius:40rpx;text-align:center;color:#fff;"
+								:style="{background:t('color1')}" @tap="chooseType11">确 定</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view v-if="membervisible" class="popup__container">
+				<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+				<view class="popup__modal" style="height: 1100rpx;">
+					<view class="popup__title">
+						<text class="popup__title-text">请选择指定会员</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx;"
+							@tap.stop="handleClickMask" />
+					</view>
+					<view class="popup__content">
+						<view class="member_search">
+							<view style="width:130rpx;color:#333;flex-shrink:0">选择地区</view>
+							<uni-data-picker :localdata="items" :border="false" :placeholder="regiondata || '请选择省市区'" @change="regionchange2" class="flex1" style="overflow:hidden"></uni-data-picker>
+							<view class="searchMemberButton" @click="memberSearch" style="flex-shrink:0">检索用户</view>
+						</view>
+						<view class="memberlist">
+							<view v-for="(item2,i) in memberList" class="memberitem" @tap="checkMember" :data-info="item2">
+								<image :src="item2.headimg" @tap.stop="showmemberinfo" :data-mid="item2.id"/>
+								<view class="flex-col">
+									<view class="t1" @tap.stop="showmemberinfo" :data-mid="item2.id">{{item2.nickname}}</view>
+									<view>{{item2.province}} {{item2.city}} {{item2.area}}</view>
+								</view>
+								<view class="flex1"></view>
+								<view class="radio" :style="checkMem.id==item2.id ? 'background:'+t('color1')+';border:0' : ''">
+									<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<view v-if="memberinfovisible" class="popup__container">
+				<view class="popup__overlay" @tap.stop="memberinfoClickMask"></view>
+				<view class="popup__modal" style="height: 1100rpx;">
+					<view class="popup__title">
+						<text class="popup__title-text">查看资料</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx;"
+							@tap.stop="memberinfoClickMask" />
+					</view>
+					<view class="popup__content">
+						<view class="orderinfo">
+							<view class="item" v-for="item in selectmemberinfo">
+								<text class="t1">{{item[0]}}</text>
+								<view class="t2" v-if="item[2]=='upload'"><image :src="item[1]" style="width:400rpx;height:auto" mode="widthFix" @tap="previewImage" :data-url="item[1]"/></view>
+								<text class="t2" v-else>{{item[1]}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+  <!-- 悬浮按钮 -->
+  <drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	export default {
+		data() {
+			return {
+				opt: {},
+				loading: false,
+				isload: false,
+				menuindex: -1,
+
+				pre_url:app.globalData.pre_url,
+				test:'test',
+				havetongcheng: 0,
+				address: [],
+				memberList: [],
+				checkMem:{},
+				usescore: 0,
+				scoredk_money: 0,
+				totalprice: '0.00',
+				couponvisible: false,
+				cuxiaovisible: false,
+				membervisible: false,
+				memberinfovisible:false,
+				selectmemberinfo:{},
+				bid: 0,
+				nowbid: 0,
+				needaddress: 1,
+				linkman: '',
+				tel: '',
+				userinfo: {},
+				pstimeDialogShow: false,
+				pstimeIndex: -1,
+				manjian_money: 0,
+				cxid: 0,
+				cxids: [],
+				latitude: "",
+				longitude: "",
+				allbuydata: {},
+				allbuydatawww: {},
+				alltotalprice: "",
+				cuxiaoinfo: false,
+				cuxiaoList: {},
+				type11visible: false,
+				type11key: -1,
+				regiondata: '',
+				items: [],
+				editorFormdata:[],
+				buy_selectmember:false,
+				multi_promotion:0,
+				storeshowall:false,
+				order_change_price:false,
+				invoiceShow:false,
+				invoice:{},
+				invoice_type:[],
+				invoice_type_select:1,
+				name_type_select:1,
+				name_type_personal_disabled:false,
+				inputDisabled:false,
+				submitDisabled:false,
+				pstype3needAddress:false,
+				// sinceActive:1
+				
+				event_rul: app.globalData.event_url,
+			};
+		},
+
+		onLoad: function(opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		methods: {
+			// sinceChange(num) {
+			// 	this.sinceActive = num
+			// 	this.changeNewFreight(this.sinceActive)
+
+			// },
+			// chooseNewPstime: function(e) {
+			// 	var that = this;
+			// 	var allbuydata = that.allbuydata;
+			// 	var bid = e.currentTarget.dataset.bid;
+			// 	var freightkey = allbuydata[0].freightkey;
+			// 	var freightList = allbuydata[0].freightList;
+			// 	var freight = freightList[freightkey];
+			// 	var pstimeArr = freightList[freightkey].pstimeArr;
+			// 	var itemlist = [];
+			// 	for (var i = 0; i < pstimeArr.length; i++) {
+			// 		itemlist.push(pstimeArr[i].title);
+			// 	}
+			// 	if (itemlist.length == 0) {
+			// 		app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+			// 		return;
+			// 	}
+			// 	that.nowbid = 0;
+			// 	that.pstimeDialogShow = true;
+			// 	that.pstimeIndex = -1;
+			// },
+			// changeNewFreight() {
+			// 	let that = this;
+			// 	let allbuydata = that.allbuydata;
+			// 	let index = this.sinceActive;
+			// 	let freightList = allbuydata[0].freightList;
+			// 	if(freightList[index].pstype==1 && freightList[index].storedata.length < 1) {
+			// 		app.error('无可自提门店');return;
+			// 	}
+			// 	if(freightList[index].pstype==5 && freightList[index].storedata.length < 1) {
+			// 		app.error('无可配送门店');return;
+			// 	}
+			// 	allbuydata[0].freightkey = index;
+			// 	that.allbuydata = allbuydata;
+			// 	that.calculatePrice();
+			// 	that.allbuydata[0].editorFormdata = [];
+			// },
+			getdata: function() {
+				var that = this;
+				that.loading = true;
+				app.get('ApiShop/buy', {
+					prodata: that.opt.prodata
+				}, function(res) {
+					that.loading = false;
+					if (res.status == 0) {
+						if (res.msg) {
+							app.alert(res.msg, function() {
+								if (res.url) {
+									app.goto(res.url);
+								} else {
+									app.goback();
+								}
+							});
+						} else if (res.url) {
+							app.goto(res.url);
+						} else {
+							app.alert('您没有权限购买该商品');
+						}
+						return;
+					}
+					that.havetongcheng = res.havetongcheng;
+					that.address = res.address;
+					that.linkman = res.linkman;
+					that.tel = res.tel;
+					that.userinfo = res.userinfo;
+					that.buy_selectmember = res.buy_selectmember;
+					that.order_change_price = res.order_change_price;
+					that.pstype3needAddress = res.pstype3needAddress;
+					if(that.buy_selectmember){
+						uni.request({
+							url: app.globalData.pre_url+'/static/area2.json',
+							data: {},
+							method: 'GET',
+							header: { 'content-type': 'application/json' },
+							success: function(res2) {
+								that.items = res2.data
+							}
+						})
+					}
+					that.allbuydata = res.allbuydata;
+					that.allbuydatawww = JSON.parse(JSON.stringify(res.allbuydata));
+					console.log(that.allbuydata);
+					that.needLocation = res.needLocation;
+					that.scorebdkyf = res.scorebdkyf;
+					that.multi_promotion = res.multi_promotion;
+					that.calculatePrice();
+					that.loaded();
+					
+					// var allbuydata = that.allbuydata;
+					// for (var i in allbuydata) {
+					// 	allbuydata[i].tempInvoice = uni.getStorageSync('temp_invoice_' + allbuydata[i].bid);
+					// }
+					// that.allbuydata = allbuydata;
+					
+
+					if (res.needLocation == 1) {
+						app.getLocation(function(res) {
+							var latitude = res.latitude;
+							var longitude = res.longitude;
+							that.latitude = latitude;
+							that.longitude = longitude;
+							var allbuydata = that.allbuydata;
+							for (var i in allbuydata) {
+								var freightList = allbuydata[i].freightList;
+								for (var j in freightList) {
+									if (freightList[j].pstype == 1 || freightList[j].pstype == 5) {
+										var storedata = freightList[j].storedata;
+										if (storedata) {
+											for (var x in storedata) {
+												if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+													var juli = that.getDistance(latitude, longitude,storedata[x].latitude, storedata[x].longitude);
+													storedata[x].juli = juli;
+												}
+											}
+											storedata.sort(function(a, b) {
+												return a["juli"] - b["juli"];
+											});
+											for (var x in storedata) {
+												if (storedata[x].juli) {
+													storedata[x].juli = storedata[x].juli + '千米';
+												}
+											}
+											console.log(storedata);
+											allbuydata[i].freightList[j].storedata = storedata;
+										}
+									}
+								}
+							}
+							that.allbuydata = allbuydata;
+						});
+					}
+				});
+			},
+			//积分抵扣
+			scoredk: function(e) {
+				var usescore = e.detail.value[0];
+				if (!usescore) usescore = 0;
+				this.usescore = usescore;
+				this.calculatePrice();
+			},
+			inputLinkman: function(e) {
+				this.linkman = e.detail.value;
+			},
+			inputTel: function(e) {
+				this.tel = e.detail.value;
+			},
+			inputfield: function(e) {
+				var bid = e.currentTarget.dataset.bid;
+				var field = e.currentTarget.dataset.field;
+				allbuydata2[bid][field] = e.detail.value;
+				this.allbuydata2 = allbuydata2;
+			},
+			//选择收货地址
+			chooseAddress: function() {
+				app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+			},
+			inputPrice: function(e) {
+				var that = this;
+				var index = e.currentTarget.dataset.index;
+				var index2 = e.currentTarget.dataset.index2;
+				var allbuydata = that.allbuydata;
+				var allbuydatawww = that.allbuydatawww;
+				var oldprice = allbuydatawww[index]['prodata'][index2].guige.sell_price;
+				if(e.detail.value == '' || parseFloat(e.detail.value) < parseFloat(oldprice)) {
+					that.submitDisabled = true;
+					app.error('不能小于原价:'+oldprice);
+					return;
+				}
+				that.submitDisabled = false;
+				allbuydata[index]['prodata'][index2].guige.sell_price = e.detail.value;
+				allbuydata[index]['product_price'] = (e.detail.value * allbuydata[index]['prodata'][index2].num).toFixed(2);
+				// allbuydata[index].prodatastr = allbuydata[index].prodatastr
+				that.allbuydata = allbuydata;
+				console.log(allbuydata[index]);
+				
+				that.calculatePrice();
+			},
+			//计算价格
+			calculatePrice: function() {
+				var that = this;
+				var address = that.address;
+				var allbuydata = that.allbuydata;
+				var alltotalprice = 0;
+				var allfreight_price = 0;
+				var needaddress = 0;
+				// console.log(allbuydata)
+
+				for (var k in allbuydata) {
+					var product_price = parseFloat(allbuydata[k].product_price);
+					var leveldk_money = parseFloat(allbuydata[k].leveldk_money); //会员折扣
+					var manjian_money = parseFloat(allbuydata[k].manjian_money); //满减活动
+					var coupon_money = parseFloat(allbuydata[k].coupon_money); //-优惠券抵扣 
+					var cuxiao_money = parseFloat(allbuydata[k].cuxiao_money); //+促销活动 
+					//算运费
+					var freightdata = allbuydata[k].freightList[allbuydata[k].freightkey];
+					var freight_price = freightdata['freight_price'];
+					if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+						needaddress = 1;
+					}
+					if(that.pstype3needAddress && (freightdata.pstype == 3 || freightdata.pstype == 4 || freightdata.pstype == 5)) {
+						needaddress = 1;
+					}
+					if (allbuydata[k].coupontype == 4) {
+						freight_price = 0;
+						coupon_money = 0;
+					}
+					var totalprice = product_price - leveldk_money - manjian_money - coupon_money + cuxiao_money;
+					if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+					totalprice = totalprice + freight_price;
+					allbuydata[k].freight_price = freight_price.toFixed(2);
+					allbuydata[k].totalprice = totalprice.toFixed(2);
+					alltotalprice += totalprice;
+					allfreight_price += freight_price;
+				}
+				that.needaddress = needaddress;
+
+				if (that.usescore) {
+					var scoredk_money = parseFloat(that.userinfo.scoredk_money); //-积分抵扣
+				} else {
+					var scoredk_money = 0;
+				}
+
+				var oldalltotalprice = alltotalprice;
+				alltotalprice = alltotalprice - scoredk_money;
+				if (alltotalprice < 0) alltotalprice = 0;
+
+				if (that.scorebdkyf == '1' && scoredk_money > 0 && alltotalprice < allfreight_price) {
+					//积分不抵扣运费
+					alltotalprice = allfreight_price;
+					scoredk_money = oldalltotalprice - allfreight_price;
+				}
+				var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+				var scoremaxtype = parseInt(that.userinfo.scoremaxtype);
+				var scoredkmaxmoney = parseFloat(that.userinfo.scoredkmaxmoney);
+
+				if (scoremaxtype == 0 && scoredk_money > 0 && scoredkmaxpercent > 0 && scoredkmaxpercent < 100 &&
+					scoredk_money > oldalltotalprice * scoredkmaxpercent * 0.01) {
+					scoredk_money = oldalltotalprice * scoredkmaxpercent * 0.01;
+					alltotalprice = oldalltotalprice - scoredk_money;
+				} else if (scoremaxtype == 1 && scoredk_money > scoredkmaxmoney) {
+					scoredk_money = scoredkmaxmoney;
+					alltotalprice = oldalltotalprice - scoredk_money;
+				}
+
+				if (alltotalprice < 0) alltotalprice = 0;
+				alltotalprice = alltotalprice.toFixed(2);
+				that.alltotalprice = alltotalprice;
+				that.allbuydata = allbuydata;
+			},
+			changeFreight: function(e) {
+				var that = this;
+				var allbuydata = that.allbuydata;
+				var bid = e.currentTarget.dataset.bid;
+				var index = e.currentTarget.dataset.index;
+				var freightList = allbuydata[bid].freightList;
+				if(freightList[index].pstype==1 && freightList[index].storedata.length < 1) {
+					app.error('无可自提门店');return;
+				}
+				if(freightList[index].pstype==5 && freightList[index].storedata.length < 1) {
+					app.error('无可配送门店');return;
+				}
+				allbuydata[bid].freightkey = index;
+				that.allbuydata = allbuydata;
+				that.calculatePrice();
+				that.allbuydata[bid].editorFormdata = [];
+			},
+			chooseFreight: function(e) {
+				var that = this;
+				var allbuydata = that.allbuydata;
+				var bid = e.currentTarget.dataset.bid;
+				// console.log(bid);
+				// console.log(allbuydata);
+				var freightList = allbuydata[bid].freightList;
+				var itemlist = [];
+
+				for (var i = 0; i < freightList.length; i++) {
+					itemlist.push(freightList[i].name);
+				}
+
+				uni.showActionSheet({
+					itemList: itemlist,
+					success: function(res) {
+						if (res.tapIndex >= 0) {
+							allbuydata[bid].freightkey = res.tapIndex;
+							that.allbuydata = allbuydata;
+							that.calculatePrice();
+						}
+					}
+				});
+			},
+			choosePstime: function(e) {
+				var that = this;
+				var allbuydata = that.allbuydata;
+				var bid = e.currentTarget.dataset.bid;
+				var freightkey = allbuydata[bid].freightkey;
+				var freightList = allbuydata[bid].freightList;
+				var freight = freightList[freightkey];
+				var pstimeArr = freightList[freightkey].pstimeArr;
+				var itemlist = [];
+				for (var i = 0; i < pstimeArr.length; i++) {
+					itemlist.push(pstimeArr[i].title);
+				}
+				if (itemlist.length == 0) {
+					app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+					return;
+				}
+				that.nowbid = bid;
+				that.pstimeDialogShow = true;
+				that.pstimeIndex = -1;
+			},
+			pstimeRadioChange: function(e) {
+				var that = this;
+				var allbuydata = that.allbuydata;
+				var pstimeIndex = e.currentTarget.dataset.index;
+				// console.log(pstimeIndex)
+				var nowbid = that.nowbid;
+				var freightkey = allbuydata[nowbid].freightkey;
+				var freightList = allbuydata[nowbid].freightList;
+				var freight = freightList[freightkey];
+				var pstimeArr = freightList[freightkey].pstimeArr;
+				var choosepstime = pstimeArr[pstimeIndex];
+				allbuydata[nowbid].pstimetext = choosepstime.title;
+				allbuydata[nowbid].freight_time = choosepstime.value;
+				that.allbuydata = allbuydata
+				that.pstimeDialogShow = false;
+			},
+			hidePstimeDialog: function() {
+				this.pstimeDialogShow = false;
+			},
+			chooseCoupon: function(e) {
+				var allbuydata = this.allbuydata;
+				var bid = e.bid;
+				var couponrid = e.rid;
+				var couponkey = e.key;
+				if (couponrid == allbuydata[bid].couponrid) {
+					allbuydata[bid].couponkey = 0;
+					allbuydata[bid].couponrid = 0;
+					allbuydata[bid].coupontype = 1;
+					allbuydata[bid].coupon_money = 0;
+					this.allbuydata = allbuydata;
+					this.couponvisible = false;
+				} else {
+					var couponList = allbuydata[bid].couponList;
+					var coupon_money = couponList[couponkey]['money'];
+					var coupontype = couponList[couponkey]['type'];
+					allbuydata[bid].couponkey = couponkey;
+					allbuydata[bid].couponrid = couponrid;
+					allbuydata[bid].coupontype = coupontype;
+					allbuydata[bid].coupon_money = coupon_money;
+					this.allbuydata = allbuydata;
+					this.couponvisible = false;
+				}
+				this.calculatePrice();
+			},
+			choosestore: function(e) {
+				var bid = e.currentTarget.dataset.bid;
+				var storekey = e.currentTarget.dataset.index;
+				var allbuydata = this.allbuydata;
+				var buydata = allbuydata[bid];
+				var freightkey = buydata.freightkey
+				allbuydata[bid].freightList[freightkey].storekey = storekey
+				this.allbuydata = allbuydata;
+			},
+			//提交并支付
+			topay: function(e) {
+				var that = this;
+				var needaddress = that.needaddress;
+				var addressid = this.address.id;
+				var checkmemid = this.checkMem.id;
+				var linkman = this.linkman;
+				var tel = this.tel;
+				var usescore = this.usescore;
+				var frompage = that.opt.frompage ? that.opt.frompage : '';
+				var allbuydata = that.allbuydata;
+				
+				if (needaddress == 0) addressid = 0;
+
+				if (needaddress == 1 && addressid == undefined) {
+					app.error('请选择收货地址');
+					return;
+				}
+				var buydata = [];
+				for (var i in allbuydata) {
+					var freightkey = allbuydata[i].freightkey;
+					if (allbuydata[i].freightList[freightkey].pstimeset == 1 && allbuydata[i].freight_time == '') {
+						app.error('请选择' + (allbuydata[i].freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间');
+						return;
+					}
+					if (allbuydata[i].freightList[freightkey].pstype == 1 || allbuydata[i].freightList[freightkey].pstype == 5) {
+						var storekey = allbuydata[i].freightList[freightkey].storekey;
+						var storeid = allbuydata[i].freightList[freightkey].storedata[storekey].id;
+					} else {
+						var storeid = 0;
+					}
+					if (allbuydata[i].freightList[freightkey].pstype == 11) {
+						var type11key = allbuydata[i].type11key;
+						if (type11key == 0 || !type11key) {
+							app.error('请选择物流');
+							return;
+						}
+						type11key = type11key - 1;
+					} else {
+						var type11key = 0
+					}
+
+					var formdata_fields = allbuydata[i].freightList[freightkey].formdata;
+					var formdata = e.detail.value;
+					var newformdata = {};
+					for (var j = 0; j < formdata_fields.length;j++){
+						var thisfield = 'form'+allbuydata[i].bid + '_' + j;
+						if (formdata_fields[j].val3 == 1 && (formdata[thisfield] === '' || formdata[thisfield] === undefined || formdata[thisfield].length==0)){
+								app.alert(formdata_fields[j].val1+' 必填');return;
+						}
+						if (formdata_fields[j].key == 'selector') {
+								formdata[thisfield] = formdata_fields[j].val2[formdata[thisfield]]
+						}
+						newformdata['form'+j] = formdata[thisfield];
+					}
+					
+					var buydatatemp = {
+						bid: allbuydata[i].bid,
+						prodata: allbuydata[i].prodatastr,
+						cuxiaoid: allbuydata[i].cuxiaoid,
+						couponrid: allbuydata[i].couponrid,
+						freight_id: allbuydata[i].freightList[freightkey].id,
+						freight_time: allbuydata[i].freight_time,
+						storeid: storeid,
+						formdata:newformdata,
+						type11key: type11key,
+					};
+					
+					if(that.order_change_price) {
+						buydatatemp.prodataList = allbuydata[i].prodata;
+					}
+					if(allbuydata[i].business.invoice) {
+						buydatatemp.invoice = allbuydata[i].tempInvoice;
+					}
+					buydata.push(buydatatemp);
+				}
+				// console.log(buydata);return;
+				app.showLoading('提交中');
+				app.post('ApiShop/createOrder', {
+					frompage: frompage,
+					buydata: buydata,
+					addressid: addressid,
+					linkman: linkman,
+					tel: tel,
+					checkmemid:checkmemid,
+					usescore: usescore
+				}, function(res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+						//that.showsuccess(res.data.msg);
+						app.error(res.msg);
+						return;
+					}
+					//app.error('订单编号：' +res.payorderid);
+					if(res.payorderid)
+					app.goto('/pages/pay/pay?id=' + res.payorderid);
+				});
+			},
+			showCouponList: function(e) {
+				this.couponvisible = true;
+				this.bid = e.currentTarget.dataset.bid;
+			},
+			showInvoice: function(e) {
+				this.invoiceShow = true;
+				this.bid = e.currentTarget.dataset.bid;
+				let index = e.currentTarget.dataset.index;
+				this.invoice_type = this.allbuydata[index].business.invoice_type;
+				this.invoice = this.allbuydata[index].tempInvoice;
+			},
+			changeOrderType: function(e) {
+				var that = this;
+				var value = e.detail.value;
+				if(value == 2) {
+					that.name_type_select = 2;
+					that.name_type_personal_disabled = true;
+				} else {
+					that.name_type_personal_disabled = false;
+				}
+				that.invoice_type_select = value;
+			},
+			changeNameType: function(e) {
+				var that = this;
+				var value = e.detail.value;
+				that.name_type_select = value;
+			},
+			invoiceFormSubmit: function (e) {
+			  var that = this;
+				var formdata = e.detail.value;
+				if(formdata.invoice_name == '') {
+					app.error('请填写抬头名称');
+					return;
+				}
+				if((formdata.name_type == 2 || formdata.invoice_type == 2) && formdata.tax_no == '') {
+					///^[A-Z0-9]{15}$|^[A-Z0-9]{17}$|^[A-Z0-9]{18}$|^[A-Z0-9]{20}$/
+					app.error('请填写公司税号');
+					return;
+				}
+				if(formdata.invoice_type == 2) {
+					if(formdata.address == '') {
+						app.error('请填写注册地址');
+						return;
+					}
+					if(formdata.tel == '') {
+						app.error('请填写注册电话');
+						return;
+					}
+					if(formdata.bank_name == '') {
+						app.error('请填写开户银行');
+						return;
+					}
+					if(formdata.bank_account == '') {
+						app.error('请填写银行账号');
+						return;
+					}
+				}
+				if (formdata.mobile != '') {
+					if(!/^1[3456789]\d{9}$/.test(formdata.mobile)){
+						app.error("手机号码有误，请重填");
+						return;
+					}
+				}
+				if (formdata.email != '') {
+					if(!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(formdata.email)){
+						app.error("邮箱有误，请重填");
+						return;
+					}
+				}
+				if(formdata.mobile == '' && formdata.email == '') {
+					app.error("手机号和邮箱请填写其中一个");
+					return;
+				}
+				// console.log(formdata);
+				var allbuydata = that.allbuydata;
+				for (var i in allbuydata) {
+					if(allbuydata[i].bid == that.bid)
+						allbuydata[i].tempInvoice = formdata;
+				}
+				that.allbuydata = allbuydata;
+				this.invoiceShow = false;
+					// that.loading = true;
+					// uni.setStorageSync('temp_invoice_' + that.opt.bid, formdata);
+			},
+			handleClickMask: function() {
+				this.couponvisible = false;
+				this.cuxiaovisible = false;
+				this.type11visible = false;
+				this.membervisible = false;
+				this.invoiceShow = false;
+			},
+			showCuxiaoList: function(e) {
+				this.cuxiaovisible = true;
+				this.bid = e.currentTarget.dataset.bid;
+			},
+			changecx: function(e) {
+				var that = this;
+				var cxid = e.currentTarget.dataset.id;
+				var cxindex = e.currentTarget.dataset.index;
+				console.log(cxid);
+				that.cxid = cxid;
+				if (cxid == 0) {
+					that.cuxiaoinfo = false;
+					return;
+				}
+				var cuxiaoinfo = that.allbuydata[that.bid].cuxiaolist[cxindex];
+				console.log(cuxiaoinfo.cuxiaomoney)
+				app.post("ApiShop/getcuxiaoinfo", {
+					id: cxid
+				}, function(res) {
+					if (cuxiaoinfo.type == 4 || cuxiaoinfo.type == 5) {
+						res.cuxiaomoney = cuxiaoinfo.cuxiaomoney
+					}
+					that.cuxiaoinfo = res;
+				});
+			},
+			changecxMulti: function(e) {
+				var that = this;
+				var cxid = e.currentTarget.dataset.id;
+				var cxindex = e.currentTarget.dataset.index;
+				that.cuxiaoList.length = 0;
+				console.log('cxid:'+cxid);
+				if (cxid == 0) {
+					that.cuxiaoinfo = false;
+					that.cxids.length = 0;
+					that.cxid = 0;
+					return;
+				}
+				var index = that.cxids.indexOf(cxid);
+				if(index === -1){
+					that.cxids.push(cxid);
+				} else {
+					that.cxids.splice(index);
+				}
+				if(that.cxids.length == 0) {
+					that.cxid = 0;
+					that.cuxiaoinfo = false;
+					return;
+				}
+				that.cxid = '';
+				var cuxiaoinfo = that.allbuydata[that.bid].cuxiaolist[cxindex];
+				console.log(cuxiaoinfo.cuxiaomoney)
+				app.showLoading();
+				app.post("ApiShop/getcuxiaoinfo", {
+					id: that.cxids
+				}, function(res) {
+					// if (cuxiaoinfo.type == 4 || cuxiaoinfo.type == 5) {
+					// 	res.cuxiaomoney = cuxiaoinfo.cuxiaomoney
+					// }
+					app.showLoading(false);
+					that.cuxiaoList = res;
+				});
+			},
+			chooseCuxiao: function() {
+				var that = this;
+				var allbuydata = that.allbuydata;
+				var bid = that.bid;
+				var cxid = that.cxid;
+				var cxids = that.cxids;
+				console.log(cxid == 0)
+				if (cxid == 0 || cxid == '') {
+					allbuydata[bid].cuxiaoid = '';
+					allbuydata[bid].cuxiao_money = 0;
+					allbuydata[bid].cuxiaoname = '不使用促销';
+					allbuydata[bid].cuxiaonameArr = [];
+				} else {
+					allbuydata[bid].cuxiaoid = [];
+					allbuydata[bid].cuxiao_money = 0;
+					allbuydata[bid].cuxiaotype = [];
+					allbuydata[bid].cuxiaonameArr = [];
+					console.log(that.cuxiaoList.info)
+					if(that.cuxiaoList.info && that.cuxiaoList.info.length > 0) {
+						for (var i in that.cuxiaoList.info) {
+							var cxtype = that.cuxiaoList.info[i].type;
+							console.log(cxtype);
+							if (cxtype == 1 || cxtype == 6) {
+								//满额立减 满件立减
+								allbuydata[bid].cuxiao_money += that.cuxiaoList.info[i]['money'] * -1;
+							} else if (cxtype == 2) {
+								//满额赠送
+								allbuydata[bid].cuxiao_money += 0;
+							} else if (cxtype == 3) {
+								//加价换购  27.8+15.964+41.4
+								allbuydata[bid].cuxiao_money += that.cuxiaoList.info[i]['money'];
+							} else if (cxtype == 4 || cxtype == 5) {
+								//满额打折 满件打折
+								var cuxiaoMoney = 0;
+								for ( var y in that.allbuydata[bid].cuxiaolist) {
+									if(that.cuxiaoList.info[i].id == that.allbuydata[bid].cuxiaolist[y].id) {
+										cuxiaoMoney = that.allbuydata[bid].cuxiaolist[y].cuxiaomoney;
+									}
+								}
+								console.log('cuxiaoMoney');
+								console.log(cuxiaoMoney);
+								allbuydata[bid].cuxiao_money += cuxiaoMoney * -1
+							}
+							allbuydata[bid].cuxiaoid.push(that.cuxiaoList.info[i].id);
+							allbuydata[bid].cuxiaotype.push(cxtype);
+							allbuydata[bid].cuxiaonameArr.push(that.cuxiaoList.info[i]['name']);
+						}
+						console.log('allbuydata[bid]');
+						console.log(allbuydata[bid]);
+					} else {
+						var cxtype = that.cuxiaoinfo.info.type;
+						console.log(cxtype);
+						if (cxtype == 1 || cxtype == 6) {
+							//满额立减 满件立减
+							allbuydata[bid].cuxiao_money = that.cuxiaoinfo.info['money'] * -1;
+						} else if (cxtype == 2) {
+							//满额赠送
+							allbuydata[bid].cuxiao_money = 0;
+						} else if (cxtype == 3) {
+							//加价换购  27.8+15.964+41.4
+							allbuydata[bid].cuxiao_money = that.cuxiaoinfo.info['money'];
+						} else if (cxtype == 4 || cxtype == 5) {
+							//var product_price = parseFloat(allbuydata[bid].product_price);
+							//var leveldk_money = parseFloat(allbuydata[bid].leveldk_money); //会员折扣
+							//var manjian_money = parseFloat(allbuydata[bid].manjian_money); //满减活动
+							//满额打折 满件打折
+							//allbuydata[bid].cuxiao_money = (1 - that.cuxiaoinfo.info['zhekou'] * 0.1) * (product_price - leveldk_money - manjian_money) * -1;
+							allbuydata[bid].cuxiao_money = that.cuxiaoinfo.cuxiaomoney * -1
+						}
+						allbuydata[bid].cuxiaoid = cxid;
+						allbuydata[bid].cuxiaotype = cxtype;
+						allbuydata[bid].cuxiaoname = that.cuxiaoinfo.info['name'];
+					}
+				}
+				this.allbuydata = allbuydata;
+				this.cuxiaovisible = false;
+				this.calculatePrice();
+			},
+			showType11List: function(e) {
+				this.type11visible = true;
+				this.bid = e.currentTarget.dataset.bid;
+			},
+			changetype11: function(e) {
+				var that = this;
+				var allbuydata = that.allbuydata;
+				var bid = that.bid;
+				that.type11key = e.currentTarget.dataset.index;
+				// console.log(that.type11key)
+			},
+			chooseType11: function(e) {
+				var that = this;
+				var allbuydata = that.allbuydata;
+				var bid = that.bid;
+				var type11key = that.type11key;
+				if (type11key == -1) {
+					app.error('请选择物流');
+					return;
+				}
+				allbuydata[bid].type11key = type11key + 1;
+				// console.log(allbuydata[bid].type11key)
+				var freightkey = allbuydata[bid].freightkey;
+				var freightList = allbuydata[bid].freightList;
+				var freight_price = parseFloat(freightList[freightkey].type11pricedata[type11key].price);
+				var product_price = parseFloat(allbuydata[bid].product_price);
+				// console.log(freightList[freightkey].freeset);
+				// console.log(parseFloat(freightList[freightkey].free_price));
+				// console.log(product_price);
+				if (freightList[freightkey].freeset == 1 && parseFloat(freightList[freightkey].free_price) <=
+					product_price) {
+					freight_price = 0;
+				}
+				allbuydata[bid].freightList[freightkey].freight_price = freight_price;
+
+				this.allbuydata = allbuydata;
+				this.type11visible = false;
+				this.calculatePrice();
+			},
+			openMendian: function(e) {
+				var allbuydata = this.allbuydata
+				var bid = e.currentTarget.dataset.bid;
+				var freightkey = e.currentTarget.dataset.freightkey;
+				var storekey = e.currentTarget.dataset.storekey;
+				var frightinfo = allbuydata[bid].freightList[freightkey]
+				var storeinfo = frightinfo.storedata[storekey];
+				// console.log(storeinfo)
+				app.goto('mendian?id=' + storeinfo.id);
+			},
+			openLocation: function(e) {
+				var allbuydata = this.allbuydata
+				var bid = e.currentTarget.dataset.bid;
+				var freightkey = e.currentTarget.dataset.freightkey;
+				var storekey = e.currentTarget.dataset.storekey;
+				var frightinfo = allbuydata[bid].freightList[freightkey]
+				var storeinfo = frightinfo.storedata[storekey];
+				// console.log(storeinfo)
+				var latitude = parseFloat(storeinfo.latitude);
+				var longitude = parseFloat(storeinfo.longitude);
+				var address = storeinfo.name;
+				uni.openLocation({
+					latitude: latitude,
+					longitude: longitude,
+					name: address,
+					scale: 13
+				})
+			},
+			editorChooseImage: function (e) {
+				var that = this;
+				var bid = e.currentTarget.dataset.bid;
+				var idx = e.currentTarget.dataset.idx;
+				var editorFormdata = that.allbuydata[bid].editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				app.chooseImage(function(data){
+					editorFormdata[idx] = data[0];
+					// console.log(editorFormdata)
+					that.allbuydata[bid].editorFormdata = editorFormdata
+					that.test = Math.random();
+				})
+			},
+			editorBindPickerChange:function(e){
+				var that = this;
+				var bid = e.currentTarget.dataset.bid;
+				var idx = e.currentTarget.dataset.idx;
+				var val = e.detail.value;
+				var editorFormdata = that.allbuydata[bid].editorFormdata;
+				if(!editorFormdata) editorFormdata = [];
+				editorFormdata[idx] = val;
+				// console.log(editorFormdata)
+				that.allbuydata[bid].editorFormdata = editorFormdata;
+				that.test = Math.random();
+			},
+
+			showMemberList: function(e) {
+				this.membervisible = true;
+			},
+			regionchange2: function(e) {
+				const value = e.detail.value
+				// console.log(value[0].text + ',' + value[1].text + ',' + value[2].text);
+				this.regiondata = value[0].text + ',' + value[1].text + ',' + value[2].text
+			},
+			memberSearch: function() {
+				var that = this;
+				// console.log(that.regiondata)
+				app.post('ApiShop/memberSearch', {
+					diqu: that.regiondata
+				}, function(res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					var data = res.memberList;
+					that.memberList = data;
+				});
+			},
+			checkMember: function(e) {
+				var that = this;
+				that.checkMem = e.currentTarget.dataset.info;
+				this.membervisible = false;
+			},
+			showmemberinfo:function(e){
+				var that = this;
+				var mid = e.currentTarget.dataset.mid;
+				app.showLoading('提交中');
+				app.post('ApiShop/getmemberuplvinfo',{mid:mid}, function(res) {
+					app.showLoading(false);
+					if (res.status == 0) {
+						app.error(res.msg);
+						return;
+					}
+					that.selectmemberinfo = res.info;
+					that.memberinfovisible = true;
+				});
+			},
+			memberinfoClickMask:function(){
+				this.memberinfovisible = false;
+			},
+			doStoreShowAll:function(){
+				this.storeshowall = true;
+			}
+		}
+	}
+</script>
+
+<style>
+	.redBg{color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx; width: auto; display: inline-block; margin-top: 4rpx;}
+.address-add {width: 94%;margin: 20rpx 3%;background: #fff;border-radius: 20rpx;padding: 20rpx 3%;min-height: 140rpx;}
+.address-add .f1 {margin-right: 20rpx}
+.address-add .f1 .img {width: 66rpx;height: 66rpx;}
+.address-add .f2 {color: #666;}
+.address-add .f3 {width: 26rpx;height: 26rpx;}
+.linkitem {width: 100%;padding: 1px 0;background: #fff;display: flex;align-items: center}.cf3 {width: 200rpx;height: 26rpx;display: block;
+    text-align: right;}
+.linkitem .f1 {width: 160rpx;color: #111111}
+.linkitem .input {height: 50rpx;padding-left: 10rpx;color: #222222;font-weight: bold;font-size: 28rpx;flex: 1}
+.buydata {width: 94%;margin: 0 3%;background: #fff;margin-bottom: 20rpx;border-radius: 20rpx;}
+.btitle {width: 100%;padding: 20rpx 20rpx;display: flex;align-items: center;color: #111111;font-weight: bold;font-size: 30rpx}
+.btitle .img {width: 34rpx;height: 34rpx;margin-right: 10rpx}
+.bcontent {width: 100%;padding: 0 20rpx}
+.product {width: 100%;border-bottom: 1px solid #f4f4f4}
+.product .item {width: 100%;padding: 20rpx 0;background: #fff;border-bottom: 1px #ededed dashed;}
+.product .item:last-child {border: none}
+.product .info {padding-left: 20rpx;}
+.product .info .f1 {color: #222222;font-weight: bold;font-size: 26rpx;line-height: 36rpx;margin-bottom: 10rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+.product .info .f2 {color: #999999;font-size: 24rpx}
+.product .info .f3 {color: #FF4C4C;font-size: 28rpx;display: flex;align-items: center;margin-top: 10rpx}
+.product image {width: 140rpx;height: 140rpx}
+.freight {width: 100%;padding: 20rpx 0;background: #fff;display: flex;flex-direction: column;}
+.freight .f1 {color: #333;margin-bottom: 10rpx}
+.freight .f2 {color: #111111;text-align: right;flex: 1}
+.freight .f3 {width: 24rpx;height: 28rpx;}
+.freighttips {color: red;font-size: 24rpx;}
+.freight-ul {width: 100%;display: flex;}
+.freight-li {flex-shrink: 0;display: flex;background: #F5F6F8;border-radius: 24rpx;color: #6C737F;font-size: 24rpx;text-align: center;height: 48rpx;line-height: 48rpx;padding: 0 28rpx;margin: 12rpx 10rpx 12rpx 0}
+.inputPrice {border: 1px solid #ddd; width: 200rpx; height: 40rpx; border-radius: 10rpx; padding: 0 4rpx;}
+
+.price {width: 100%;padding: 20rpx 0;background: #fff;display: flex;align-items: center}
+.price .f1 {color: #333}
+.price .f2 {color: #111;font-weight: bold;text-align: right;flex: 1}
+.price .f3 {width: 24rpx;height: 24rpx;}
+.scoredk {width: 94%;margin: 0 3%;margin-bottom: 20rpx;border-radius: 20rpx;padding: 24rpx 20rpx;background: #fff;display: flex;align-items: center}
+.scoredk .f1 {color: #333333}
+.scoredk .f2 {color: #999999;text-align: right;flex: 1}
+.remark {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center}
+.remark .f1 {color: #333;width: 200rpx}
+.remark input {border: 0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right}
+.footer {width: 96%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding: 0 2%;display: flex;align-items: center;z-index: 8;box-sizing:content-box}
+.footer .text1 {height: 110rpx;line-height: 110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1 text {color: #e94745;font-size: 32rpx;}
+.footer .op {width: 200rpx;height: 80rpx;line-height: 80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius: 44rpx}
+.footer .op[disabled] { background: #aaa !important; color: #666;}
+.storeitem {width: 100%;padding: 20rpx 0;display: flex;flex-direction: column;color: #333}
+.storeitem .panel {width: 100%;height: 60rpx;line-height: 60rpx;font-size: 28rpx;color: #333;margin-bottom: 10rpx;display: flex}
+.storeitem .panel .f1 {color: #333}
+.storeitem .panel .f2 {color: #111;font-weight: bold;text-align: right;flex: 1}
+.storeitem .radio-item {display: flex;width: 100%;color: #000;align-items: center;background: #fff;border-bottom: 0 solid #eee;padding: 8rpx 20rpx;}
+.storeitem .radio-item:last-child {border: 0}
+.storeitem .radio-item .f1 {color: #666;flex: 1}
+.storeitem .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left: 30rpx}
+.storeitem .radio .radio-img {width: 100%;height: 100%}
+.pstime-item {display: flex;border-bottom: 1px solid #f5f5f5;padding: 20rpx 30rpx;}
+.pstime-item .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.pstime-item .radio .radio-img {width: 100%;height: 100%}
+.cuxiao-desc {width: 100%}
+.cuxiao-item {display: flex;padding: 0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name {font-size: 28rpx;color: #49aa34;margin-bottom: 10rpx;flex: 1}
+.cuxiao-item .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.cuxiao-item .radio .radio-img {width: 100%;height: 100%}
+
+.form-item {width: 100%;padding: 16rpx 0;background: #fff;display: flex;align-items: center;justify-content:space-between}
+.form-item .label {color: #333;width: 200rpx;flex-shrink:0}
+.form-item .radio{transform:scale(.7);}
+.form-item .checkbox{transform:scale(.7);}
+.form-item .input {border:0px solid #eee;height: 70rpx;padding-left: 10rpx;text-align: right;flex:1}
+.form-item .textarea{height:140rpx;line-height:40rpx;overflow: hidden;flex:1;border:1px solid #eee;border-radius:2px;padding:8rpx}
+.form-item .radio-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .radio{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .radio2{display:flex;align-items:center;}
+.form-item .radio .myradio{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:50%}
+.form-item .checkbox-group{display:flex;flex-wrap:wrap;justify-content:flex-end}
+.form-item .checkbox{height: 70rpx;line-height: 70rpx;display:flex;align-items:center}
+.form-item .checkbox2{display:flex;align-items:center;height: 40rpx;line-height: 40rpx;}
+.form-item .checkbox .mycheckbox{margin-right:10rpx;display:inline-block;border:1px solid #aaa;background:#fff;height:32rpx;width:32rpx;border-radius:2px}
+.form-item .picker{height: 70rpx;line-height:70rpx;flex:1;text-align:right}
+
+.form-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.form-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.form-imgbox-close .image{width:100%;height:100%}
+.form-imgbox-img{display: block;width:180rpx;height:180rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.form-imgbox-img>.image{max-width:100%;}
+.form-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.form-uploadbtn{position:relative;height:180rpx;width:180rpx}
+
+.member_search{width:100%;padding:0 40rpx;display:flex;align-items:center}
+.searchMemberButton{height:60rpx;background-color: #007AFF;border-radius: 10rpx;width: 160rpx;line-height: 60rpx;color: #fff;text-align: center;font-size: 28rpx;display: block;}
+.memberlist{width:100%;padding:0 40rpx;height: auto;margin:20rpx auto;}
+.memberitem{display:flex;align-items:center;border-bottom:1px solid #f5f5f5;padding:20rpx 0}
+.memberitem image{display: block;height:100rpx;width:100rpx;margin-right:20rpx;}
+.memberitem .t1{color:#333;font-weight:bold}
+.memberitem .radio {flex-shrink: 0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right: 30rpx}
+.memberitem .radio .radio-img {width: 100%;height: 100%}
+
+.checkMem{ display: inline-block; }
+.checkMem p{ height: 30px; width: 100%; display: inline-block; }
+.placeholder{  font-size: 26rpx;line-height: 80rpx;}
+.selected-item span{ font-size: 26rpx !important;}
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;overflow:hidden}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.storeviewmore{width:100%;text-align:center;color:#889;height:40rpx;line-height:40rpx;margin-top:10rpx}
+
+.btn{ height:80rpx;line-height: 80rpx;width:90%;margin:0 auto;border-radius:40rpx;margin-top:40rpx;color: #fff;font-size: 28rpx;font-weight:bold}
+.invoiceBox .radio radio{transform: scale(0.8);}
+.invoiceBox .radio:nth-child(2) { margin-left: 30rpx;}
+
+/* 修改的样式 */
+.batal-new {min-height: 140rpx;padding: 20rpx; margin: 20rpx;background-color: #fff;border-radius: 20rpx;display: flex;justify-content: space-between;align-items: center;}
+.batal-new-l {width: 65%;display: flex;flex-direction: column;}
+.batal-new-l-t {display: flex;}
+.batal-new-l-til {font-weight: bold;}
+.batal-new-l-ad {padding-top: 10rpx;}
+.batal-new-r {border: 2rpx solid #EFBD6F; border-radius: 300rpx;display: flex; color: #EFBD6F;}
+.batal-new-r-t {padding: 10rpx 20rpx;}
+.since-n,.since-t {background-color: #EFBD6F; color: #fff;}
+.since-t {border-radius: 0 300rpx 300rpx 0;}
+.since-n {border-radius: 300rpx 0 0 300rpx;}
+
+.distribution {min-height: 140rpx;padding: 20rpx; margin: 20rpx;background-color: #fff;border-radius: 20rpx;display: flex;align-items: center;justify-content: space-between;}
+.distribution-time {display: flex;align-items: center;}
+.add-dres {min-height: 140rpx;padding: 20rpx; margin: 20rpx;background-color: #fff;border-radius: 20rpx;display: flex;align-items: center;justify-content: space-between;}
+.add-dres-r {display: flex;align-items: center;justify-content: flex-end;}
+</style>
diff --git a/pagesA/shop/classify.vue b/pagesA/shop/classify.vue
new file mode 100644
index 0000000..f706c30
--- /dev/null
+++ b/pagesA/shop/classify.vue
@@ -0,0 +1,47 @@
+<template>
+  <view>
+    <haiNaBaiXianClassify v-if="sign == 'haiNaBaiXian'"></haiNaBaiXianClassify>
+    <hongFuQiTianClassify v-else-if="sign == 'hongFuQiTian'"></hongFuQiTianClassify>
+    <chengXinRuYiClassify v-else-if="sign == 'chengXinRuYi'"></chengXinRuYiClassify>
+    <baiLiTiaoTiClassify v-else-if="sign == 'baiLiTiaoYi'"></baiLiTiaoTiClassify>
+    <Classify v-else-if="sign == 'default'"></Classify>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+import { mapState, mapActions } from "vuex";
+import Classify from "../themes/default/classify.vue";
+import haiNaBaiXianClassify from "../themes/haiNaBaiXian/classify.vue";
+import hongFuQiTianClassify from "../themes/hongFuQiTian/classify.vue";
+import chengXinRuYiClassify from "../themes/chengXinRuYi/classify.vue";
+import baiLiTiaoTiClassify from "../themes/baiLiTiaoTi/classify.vue";
+export default {
+  components: {
+    Classify,
+    haiNaBaiXianClassify,
+    hongFuQiTianClassify,
+    chengXinRuYiClassify,
+    baiLiTiaoTiClassify
+  },
+  computed: {
+    ...mapState([
+      'opt','sign'
+    ]),
+  },
+  onLoad: function (opt) { 
+    let vopt = app.getopts(opt);
+    // vopt = app.getopts(opt);
+    console.log("打印vopt",vopt)
+    vopt.bid = vopt.bid ? vopt.bid : 0;
+    vopt.cid = vopt.cid2;
+    console.log("打印vopt==========",vopt)
+    this.acOpt(vopt);
+  },
+  methods: {
+    ...mapActions([
+      'acOpt'
+    ]),
+  },
+};
+</script>
\ No newline at end of file
diff --git a/pagesA/shop/classify2.vue b/pagesA/shop/classify2.vue
new file mode 100644
index 0000000..4f9dd7f
--- /dev/null
+++ b/pagesA/shop/classify2.vue
@@ -0,0 +1,304 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view @tap.stop="goto" :data-url="'/pages/shop/search?bid='+bid" class="search-container">
+			<view class="search-box">
+				<image class="img" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+				<view class="search-text">搜索感兴趣的商品</view>
+			</view>
+		</view>
+		<view class="order-tab">
+			<view class="order-tab2">
+				<block v-for="(item, index) in clist" :key="index">
+					<view :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id">{{item.name}}<view class="after" :style="{background:t('color1')}"></view></view>
+				</block>
+			</view>
+		</view>
+		<view class="content-container">
+			<view class="nav_left">
+				<view :class="'nav_left_items ' + (curIndex == -1 ? 'active' : '')" @tap="switchRightTab" data-index="-1" :data-id="clist[curTopIndex].id"><view class="before" :style="{background:t('color1')}"></view>全部</view>
+				<block v-for="(item, index2) in clist[curTopIndex].child" :key="index2">
+					<view :class="'nav_left_items ' + (curIndex == index2 ? 'active' : '')" @tap="switchRightTab" :data-index="index2" :data-id="item.id"><view class="before" :style="{background:t('color1')}"></view>{{item.name}}</view>
+				</block>
+			</view>
+			<view class="nav_right">
+				<view class="nav_right-content">
+					<view class="nav-pai">
+						<view class="nav-paili" :style="{color:(!field||field=='sort')?t('color1'):'#323232'}" @tap="changeOrder" data-field="sort" data-order="desc">综合</view> 
+						<view class="nav-paili" :style="field=='sales'?'color:'+t('color1'):''" @tap="changeOrder" data-field="sales" data-order="desc">销量</view> 
+						<view class="nav-paili" @tap="changeOrder" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+							<text :style="field=='sell_price'?'color:'+t('color1'):''">价格</text>
+							<text class="iconfont iconshangla" :style="field=='sell_price'&&order=='asc'?'color:'+t('color1'):''"></text>
+							<text class="iconfont icon-xia" :style="field=='sell_price'&&order=='desc'?'color:'+t('color1'):''"></text>
+						</view>  
+					</view>
+					<view class="classify-ul" v-if="curTopIndex>-1 && curIndex>-1 && clist[curTopIndex].child[curIndex].child.length>0">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <view class="classify-li" :style="curIndex2==-1?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeCTab" :data-id="clist[curTopIndex].child[curIndex].id" data-index="-1">全部</view>
+						 <block v-for="(item, idx2) in clist[curTopIndex].child[curIndex].child" :key="idx2">
+						 <view class="classify-li" :style="curIndex2==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeCTab" :data-id="item.id" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<scroll-view class="classify-box" scroll-y="true" @scrolltolower="scrolltolower">
+						<view class="product-itemlist">
+							<view class="item" v-for="(item,index) in datalist" :key="item.id" @click="goto" :data-url="'/pages/shop/product?id='+item.id">
+								<view class="product-pic">
+									<image class="image" :src="item.pic" mode="widthFix"/>
+								</view>
+								<view class="product-info">
+									<view class="p1"><text>{{item.name}}</text></view>
+									<view class="p2">
+										<text class="t1" :style="{color:t('color1')}"><text style="font-size:20rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+										<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+									</view>
+									<view class="p3">
+										<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+									</view>
+									<view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" @click.stop="buydialogChange" :data-proid="item.id"><text class="iconfont icon_gouwuche"></text></view>
+								</view>
+							</view>
+						</view>
+						<nomore text="没有更多商品了" v-if="nomore"></nomore>
+						<nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" :menuindex="menuindex"></buydialog>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		bottom: 0,
+		pagenum: 1,
+		order: '',
+		field: '',
+		clist: [],
+		curTopIndex: 0,
+		curIndex: -1,
+		curIndex2: -1,
+		datalist: [],
+		nopro: 0,
+		curCid: 0,
+		proid:0,
+		buydialogShow: false,
+		prodata: [],
+		userinfo: [],
+		nomore: false,
+		nodata: false,
+		bid:'',
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid ? this.opt.bid  : '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var nowcid = that.opt.cid;
+			if (!nowcid) nowcid = '';
+			that.loading = true;
+			app.get('ApiShop/classify2', {cid: nowcid,bid:that.bid}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				that.clist = data;
+				that.curCid = data[0]['id'];
+				if (nowcid) {
+					for (var i = 0; i < data.length; i++) {
+						if (data[i]['id'] == nowcid) {
+							that.curTopIndex = i;
+							that.curCid = nowcid;
+							break;
+						}
+						var downcdata = data[i]['child'];
+						var isget = 0;
+						for (var j = 0; j < downcdata; j++) {
+							if (downcdata[j]['id'] == nowcid) {
+								that.curIndex = i;
+								that.curIndex2 = j;
+								that.curCid = nowcid;
+								isget = 1;
+								break;
+							}
+						}
+						if (isget) break;
+					}
+				}
+				that.loaded();
+				that.getdatalist();
+			});
+		},
+    getdatalist: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var cid = that.curCid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			var order = that.order;
+			var field = that.field; 
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+			var wherefield = {};
+			wherefield.pagenum = pagenum;
+			wherefield.field = field;
+			wherefield.order = order;
+			wherefield.bid = bid;
+			if(bid > 0){
+				wherefield.cid2 = cid;
+			}else{
+				wherefield.cid = cid;
+			}
+			app.post('ApiShop/getprolist',wherefield, function (res) { 
+				that.loading = false;
+				uni.stopPullDownRefresh();
+				var data = res.data;
+				if (data.length == 0) {
+					if(pagenum == 1){
+						that.nodata = true;
+					}else{
+						that.nomore = true;
+					}
+				}
+				var datalist = that.datalist;
+				var newdata = datalist.concat(data);
+				that.datalist = newdata;
+			});
+		},
+		scrolltolower: function () {
+			if (!this.nomore) {
+				this.pagenum = this.pagenum + 1;    
+				this.getdatalist(true);
+			}
+		},
+		//改变子分类
+		changeCTab: function (e) {
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			var index = parseInt(e.currentTarget.dataset.index);
+			this.curIndex2 = index;
+			this.nodata = false;
+			this.curCid = id;
+			this.pagenum = 1;
+			this.datalist = [];
+			this.nomore = false;
+			this.getdatalist();
+		},
+		//改变排序规则
+		changeOrder: function (e) {
+			var t = e.currentTarget.dataset;
+			this.field = t.field; 
+			this.order = t.order;
+			this.pagenum = 1;
+			this.datalist = []; 
+			this.nomore = false;	
+			this.getdatalist();
+		},
+		//事件处理函数
+		switchRightTab: function (e) {
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			var index = parseInt(e.currentTarget.dataset.index);
+			this.curIndex = index;
+			this.curIndex2 = -1;
+			this.nodata = false;
+			this.curCid = id;
+			this.getdatalist();
+		},
+    switchTopTab: function (e) {
+      var that = this;
+      var id = e.currentTarget.dataset.id;
+      var index = parseInt(e.currentTarget.dataset.index);
+      this.curTopIndex = index;
+      this.curIndex = -1;
+      this.curIndex2 = -1;
+      this.prolist = [];
+      this.nopro = 0;
+      this.curCid = id;
+      this.getdatalist();
+    },
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+  }
+};
+</script>
+<style>
+page {height:100%;}
+.container{width: 100%;height:100%;max-width:640px;background-color: #fff;color: #939393;display: flex;flex-direction:column}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+
+.order-tab{display:flex;width:100%;overflow-x:scroll;border-bottom: 1px #f5f5f5 solid;background: #fff;padding:0 10rpx}
+.order-tab2{display:flex;width:auto;min-width:100%}
+.order-tab2 .item{width:auto;padding:0 20rpx;font-size:28rpx;font-weight:bold;text-align: center; color:#999999; height:80rpx; line-height:80rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.order-tab2 .on{color:#222222;}
+.order-tab2 .after{display:none;position:absolute;left:50%;margin-left:-20rpx;bottom:10rpx;height:6rpx;border-radius:1.5px;width:40rpx}
+.order-tab2 .on .after{display:block}
+
+.content-container{flex:1;height:100%;display:flex;overflow: hidden;}
+
+.nav_left{width: 25%;height:100%;background: #ffffff;overflow-y:scroll;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:26rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-12rpx;left:10rpx;height:24rpx;border-radius:4rpx;width:8rpx}
+.nav_left .nav_left_items.active .before{display:block}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #f6f6f6;box-sizing: border-box;padding:20rpx 20rpx 0 20rpx}
+.nav_right-content{background: #ffffff;padding:0 20rpx;height:100%}
+.nav-pai{ width: 100%;display:flex;align-items:center;justify-content:center;}
+.nav-paili{flex:1; text-align:center;color:#323232; font-size:28rpx;font-weight:bold;position: relative;height:80rpx;line-height:80rpx;}
+.nav-paili .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.nav-paili .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+
+.classify-ul{width:100%;height:100rpx;padding:0 10rpx;}
+.classify-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:22rpx;color:#6C737F;font-size:20rpx;text-align: center;height:44rpx; line-height:44rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+.classify-box{padding: 0 0 20rpx 0;width: 100%;height:calc(100% - 60rpx);overflow-y: scroll; border-top:1px solid #F5F6F8;}
+.classify-box .nav_right_items{ width:100%;border-bottom:1px #f4f4f4 solid;  padding:16rpx 0;  box-sizing:border-box;  position:relative; }
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:14rpx 0;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:60rpx}
+.product-itemlist .product-info .p2{margin-top:10rpx;height:36rpx;line-height:36rpx;overflow:hidden;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+::-webkit-scrollbar{width: 0;height: 0;color: transparent;}
+</style>
\ No newline at end of file
diff --git a/pagesA/shop/index.vue b/pagesA/shop/index.vue
new file mode 100644
index 0000000..ed42dbc
--- /dev/null
+++ b/pagesA/shop/index.vue
@@ -0,0 +1,141 @@
+<template>
+  <view>
+    <haiNaBaiXianIndexPage
+      v-if="Vsign == 'haiNaBaiXian' && isShow"
+    ></haiNaBaiXianIndexPage>
+    <hongFuQiTianIndexPage
+      v-else-if="Vsign == 'hongFuQiTian' && isShow"
+    ></hongFuQiTianIndexPage>
+    <chengXinRuYiIndexPage
+      v-else-if="Vsign == 'chengXinRuYi' && isShow"
+    ></chengXinRuYiIndexPage>
+    <baiLiTiaoTiIndexPage
+      v-else-if="Vsign == 'baiLiTiaoYi' && isShow"
+    ></baiLiTiaoTiIndexPage>
+    <indexPage v-else-if="Vsign == 'default' && isShow"></indexPage>
+  </view>
+</template>
+<script>
+var app = getApp();
+import { mapState, mapActions } from "vuex";
+import indexPage from "../themes/default/index.vue";
+import haiNaBaiXianIndexPage from "../themes/haiNaBaiXian/index.vue";
+import hongFuQiTianIndexPage from "../themes/hongFuQiTian/index.vue";
+import chengXinRuYiIndexPage from "../themes/chengXinRuYi/index.vue";
+import baiLiTiaoTiIndexPage from "../themes/baiLiTiaoTi/index.vue";
+
+export default {
+  components: {
+    indexPage,
+    haiNaBaiXianIndexPage,
+    baiLiTiaoTiIndexPage,
+    chengXinRuYiIndexPage,
+    hongFuQiTianIndexPage,
+  },
+  data() {
+    return {
+      opt: {},
+      isShow: false,
+    };
+  },
+  computed: {
+    ...mapState({
+      vOpt: (state) => {
+        return state.opt;
+      },
+      Vsign: (state) => {
+        return state.sign;
+      },
+      VnavHeightTop: (state) => {
+        return state.navHeightTop;
+      },
+      VNavFixed: (state) => {
+        return state.navFixed;
+      },
+    }),
+  },
+  onLoad(opt) {
+    const that = this;
+    if (opt) {
+      that.opt = app.getopts(opt);
+      that.opt.bid = that.opt.id ? that.opt.id : 1;
+      console.log("打印onLoad的参数opt", that.opt);
+      // 获取本地bid，sign
+      uni.getStorage({
+        key: "shop_data",
+        success: function (res) {
+          // 本地数据获取成功
+          // 如果传入的bid等于本地获取到的bid，就直接使用本地数据；
+          if (that.opt.bid == res.data.bid) {
+            that.$set(that.opt, "bid", parseInt(res.data.bid));
+            that.acOpt(that.opt);
+            that.acSign(res.data.sign);
+            that.isShow = true;
+          } else {
+            // 否则重新发送请求获取数据
+            that.getData(that.opt);
+          }
+        },
+        fail: function () {
+          // 本地数据获取失败,重新发送请求获取数据
+          that.getData(that.opt);
+        },
+      });
+    }
+    this.acNavFixed(false);
+  },
+  methods: {
+    ...mapActions([
+      "acOpt",
+      "acSign",
+      "acPagecontent",
+      "acNavFixed",
+    ]),
+    getData(opt) {
+      const that = this;
+      that.acOpt(opt);
+      that.acNavFixed(false);
+      let shopData = {};
+      app.get("/ApiBusiness/themeSgin", { bid: opt.bid }, function (res) {
+        const { data } = res;
+        if (data) {
+          shopData = data;
+
+          // 主题改变时,把存储在state的pagecontentList清空
+          const pagecontent = [];
+          that.acPagecontent(pagecontent);
+
+          app.post("/ApiBusiness/follow", { bid: opt.bid }, function (res) {
+            that.$set(shopData, "attention", res.data.followCount);
+            that.$set(shopData, "isFollow", res.data.isFollow);
+            // 公共头部信息
+            uni.setStorage({
+              key: "header_data",
+              data: shopData,
+            });
+            const sign = data.sign;
+            uni.setStorage({
+              key: "shop_data",
+              data: {
+                bid: opt.bid,
+                sign: sign,
+              },
+            });
+            that.acSign(sign);
+            that.isShow = true;
+          });
+        }
+      });
+    },
+  },
+  onPageScroll(e) {
+    // e.scrollTop 获取页面的滚动高度
+    // console.log("打印滚动高度",e.scrollTop,this.VnavHeightTop)
+    if (e.scrollTop >= this.VnavHeightTop) {
+      this.acNavFixed(true);
+    } else {
+      this.acNavFixed(false);
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/pagesA/shop/search.vue b/pagesA/shop/search.vue
new file mode 100644
index 0000000..4792210
--- /dev/null
+++ b/pagesA/shop/search.vue
@@ -0,0 +1,43 @@
+<template>
+  <view>
+    <haiNaBaiXianSearch v-if="sign == 'haiNaBaiXian'"></haiNaBaiXianSearch>
+    <hongFuQiTianSearch v-else-if="sign == 'hongFuQiTian'"></hongFuQiTianSearch>
+    <chengXinRuYiSearch v-else-if="sign == 'chengXinRuYi'"></chengXinRuYiSearch>
+    <baiLiTiaoTiSearch v-else-if="sign == 'baiLiTiaoYi'"></baiLiTiaoTiSearch>
+    <Search v-else-if="sign == 'default'"></Search>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+import { mapState, mapActions } from "vuex";
+import Search from "../themes/default/themes-search.vue";
+import hongFuQiTianSearch from "../themes/hongFuQiTian/themes-search.vue";
+import baiLiTiaoTiSearch from "../themes/baiLiTiaoTi/themes-search.vue";
+import chengXinRuYiSearch from "../themes/chengXinRuYi/themes-search.vue";
+import haiNaBaiXianSearch from "../themes/haiNaBaiXian/themes-search.vue";
+export default {
+  components: {
+    Search,
+    chengXinRuYiSearch,
+    haiNaBaiXianSearch,
+    hongFuQiTianSearch,
+    baiLiTiaoTiSearch
+  },
+  computed: {
+    ...mapState([
+      'opt','sign'
+    ])
+  },
+  onLoad: function (opt) { 
+    let vopt = app.getopts(opt);
+    console.log("打印vopt",vopt)
+    this.acOpt(vopt);
+  },
+  methods: {
+    ...mapActions([
+      'acOpt'
+    ]),
+  },
+};
+</script>
\ No newline at end of file
diff --git a/pagesA/shop/shop-detail.vue b/pagesA/shop/shop-detail.vue
new file mode 100644
index 0000000..8ca439f
--- /dev/null
+++ b/pagesA/shop/shop-detail.vue
@@ -0,0 +1,31 @@
+<template>
+  <view>
+    <haiNaBaiXianShopDetail v-if="sign == 'haiNaBaiXian'"></haiNaBaiXianShopDetail>
+    <hongFuQiTianShopDetail v-else-if="sign == 'hongFuQiTian'"></hongFuQiTianShopDetail>
+    <chengXinRuYiShopDetail v-else-if="sign == 'chengXinRuYi'"></chengXinRuYiShopDetail>
+    <baiLiTiaoTiShopDetail v-else-if="sign == 'baiLiTiaoYi'"></baiLiTiaoTiShopDetail>
+    <shop-detail v-else-if="sign == 'default'"></shop-detail>
+  </view>
+</template>
+<script>
+import { mapState } from "vuex";
+import shopDetail from "../themes/default/shop-detail.vue";
+import haiNaBaiXianShopDetail from "../themes/haiNaBaiXian/shop-detail.vue";
+import hongFuQiTianShopDetail from "../themes/hongFuQiTian/shop-detail.vue";
+import chengXinRuYiShopDetail from "../themes/chengXinRuYi/shop-detail.vue";
+import baiLiTiaoTiShopDetail from "../themes/baiLiTiaoTi/shop-detail.vue";
+export default {
+  components: {
+    shopDetail,
+    haiNaBaiXianShopDetail,
+    hongFuQiTianShopDetail,
+    chengXinRuYiShopDetail,
+    baiLiTiaoTiShopDetail
+  },
+  computed: {
+    ...mapState([
+      'sign'
+    ])
+  },
+};
+</script>
\ No newline at end of file
diff --git a/pagesA/shop/sizeShop.vue b/pagesA/shop/sizeShop.vue
new file mode 100644
index 0000000..42e6b19
--- /dev/null
+++ b/pagesA/shop/sizeShop.vue
@@ -0,0 +1,668 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<view class="search-container flex">
+				<view class="address flex al-item-center j-bewteen" @click="sizeAddress">
+					<view class="left">
+						<text class="iconfont icon-didian"></text>
+						{{addressName||'选择地址'}}
+					</view>
+					<text class="iconfont icon-shang"></text>
+				</view>
+				<view class="topsearch flex-y-center">
+					<view class="f1 flex-y-center">
+						<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+						<input :value="keyword" placeholder="搜索你感兴趣的商家"
+							placeholder-style="font-size:28rpx;color:#999" confirm-type="search"
+							@confirm="search" />
+					</view>
+				</view>
+			</view>
+			<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+				<view class="filter-scroll-view">
+					<scroll-view class="filter-scroll-view-box" scroll-y="true">
+						<view class="search-filter">
+							<view class="filter-title">筛选</view>
+							<view class="filter-content-title">商家分类</view>
+							<view class="search-filter-content">
+								<view class="filter-item"
+									:style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''"
+									@tap.stop="cateClick" :data-cid="oldcid">全部</view>
+								<block v-for="(item, index) in clist" :key="index">
+									<view class="filter-item"
+										:style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''"
+										@tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+								</block>
+							</view>
+							<view class="search-filter-btn">
+								<view class="btn" @tap="filterReset">重置</view>
+								<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</uni-drawer>
+
+			<view class="ind_business">
+				<view class="ind_buslist" id="datalist">
+					<block v-for="(item, index) in datalist" :key="index">
+						
+							<view class="ind_busitem">
+								<view class="ind_busitem-hd" @tap="goClass(item)">{{item.name}}</view>
+								<view class="ind_busitem-con flex al-item-center j-between">
+									<view class="busitem-info flex1" @tap="goClass(item)">
+										<view class="busitem-info__item flex al-item-center">
+										  <text class="iconfont icon-icon-phone"></text>
+										  <view class="busitem-info__item-txt">联系电话: {{item.tel ||'无'}}</view>
+										</view>
+										<view class="busitem-info__item flex al-item-center">
+											<text class="iconfont icon-icon-clock"></text>
+											<view class="busitem-info__item-txt">经营时间: {{item.date ||'无'}}</view>
+										</view>
+										<view class="busitem-info__item flex al-item-center">
+											<text class="iconfont icon-icon-location"></text>
+											<view class="busitem-info__item-txt">{{item.address ||'无'}}</view>
+										</view>
+									</view>
+									<view class="ind_busitem-ft">
+										<view class="ind_busitem-tips" @tap="toStore(item.id)">进店逛逛</view>
+										<view class="ind_busitem-distance">距您{{item.juli}}</view>
+									</view>
+								</view>
+						</view>
+					
+					</block>
+					<nomore v-if="nomore"></nomore>
+					<nodata v-if="nodata"></nodata>
+				</view>
+			</view>
+
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+		<popmsg ref="popmsg"></popmsg>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+
+	export default {
+		data() {
+			return {
+				opt: {},
+				addressName: '',
+				loading: false,
+				isload: false,
+				menuindex: -1,
+
+				pre_url: app.globalData.pre_url,
+				field: 'juli',
+				order: 'asc',
+				oldcid: "",
+				catchecid: "",
+				longitude: '',
+				latitude: '',
+				clist: [],
+				datalist: [],
+				pagenum: 1,
+				keyword: '',
+				cid: '',
+				nomore: false,
+				nodata: false,
+				types: "",
+				typesc: '',
+				showfilter: "",
+				
+				event_rul: app.globalData.event_url,
+			};
+		},
+
+		onLoad: function(opt) {
+			this.typesc = opt.tpyes || ''
+			this.opt = app.getopts(opt);
+			this.oldcid = this.opt.cid;
+			this.catchecid = this.opt.cid;
+			this.cid = this.opt.cid;
+			this.getdata();
+		},
+		onPullDownRefresh: function() {
+			this.getdata();
+		},
+		onReachBottom: function() {
+			if (!this.nodata && !this.nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getDataList(true);
+			}
+		},
+		methods: {
+			//  进入店铺主页
+			toStore(id) {
+				uni.navigateTo({
+					url:'/pagesA/shop/index?id='+id
+				})
+			},
+			sizeAddress() {
+				uni.chooseLocation({
+					success: res => {
+						// this.address = res.address;
+						this.addressName = res.name;
+						this.latitude = res.latitude;
+						this.longitude = res.longitude;
+						this.getDataList()
+					}
+				});
+			},
+			goClass(item) {
+				item.resetTime = Number(new Date())
+				uni.setStorageSync('class_store_info', JSON.stringify(item))
+				uni.reLaunch({
+					url: '/pages/shop/classify'
+				})
+			},
+			getdata: function() {
+				var that = this;
+				that.loading = true;
+				that.loaded();
+				// #ifdef H5
+				that.getDataList();
+				// #endif
+				app.getLocation(function(res) {
+						that.addressName = res.name;
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						that.longitude = longitude;
+						that.latitude = latitude;
+						that.getDataList();
+					},
+					function() {
+						that.getDataList();
+					});
+			},
+			getDataList: function(loadmore) {
+				if (!loadmore) {
+					this.pagenum = 1;
+					this.datalist = [];
+				}
+				var that = this;
+				var pagenum = that.pagenum;
+				var latitude = that.latitude;
+				var longitude = that.longitude;
+				var keyword = that.keyword;
+				that.loading = true;
+				that.nodata = false;
+				that.nomore = false;
+				app.post('ApiBusiness/blist', {
+					pagenum: pagenum,
+					cid: that.cid,
+					field: that.field,
+					order: that.order,
+					longitude: longitude,
+					latitude: latitude,
+					keyword: keyword
+				}, function(res) {
+					that.loading = false;
+					uni.stopPullDownRefresh();
+					var data = res.data;
+					if (pagenum == 1) {
+						that.datalist = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+					} else {
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var datalist = that.datalist;
+							var newdata = datalist.concat(data);
+							that.datalist = newdata;
+						}
+					}
+				});
+			},
+			// 打开窗口
+			showDrawer(e) {
+				console.log(e)
+				this.$refs[e].open()
+			},
+			// 关闭窗口
+			closeDrawer(e) {
+				this.$refs[e].close()
+			},
+			// 抽屉状态发生变化触发
+			change(e, type) {
+				console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+				this[type] = e
+			},
+			cateClick: function(e) {
+				var that = this;
+				var cid = e.currentTarget.dataset.cid;
+				that.catchecid = cid
+			},
+			filterConfirm() {
+				this.cid = this.catchecid;
+				this.gid = this.catchegid;
+				this.getDataList();
+				this.$refs['showRight'].close()
+			},
+			filterReset() {
+				this.catchecid = this.oldcid;
+				this.catchegid = '';
+			},
+			filterClick: function() {
+				this.showfilter = !this.showfilter
+			},
+			changetab: function(e) {
+				var that = this;
+				var cid = e.currentTarget.dataset.cid;
+				that.cid = cid
+				that.pagenum = 1;
+				that.datalist = [];
+				that.getDataList();
+			},
+			search: function(e) {
+				var that = this;
+				var keyword = e.detail.value;
+				that.keyword = keyword;
+				that.pagenum = 1;
+				that.datalist = [];
+				that.getDataList();
+			},
+			sortClick: function(e) {
+				var that = this;
+				var t = e.currentTarget.dataset;
+				that.field = t.field;
+				that.order = t.order;
+				that.getDataList();
+			},
+			filterClick: function(e) {
+				var that = this;
+				var types = e.currentTarget.dataset.types;
+				that.types = types;
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	.ind_busitem{
+		background-color: #fff;
+		padding: 28rpx 20rpx 24rpx;
+		margin-bottom: 20rpx;
+		border-radius: 20rpx;
+		&-hd {
+			padding-bottom: 4rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 40rpx;
+		}
+		&-distance{
+			font-size: 22rpx;
+			color: #999999;
+			line-height: 32rpx;
+			margin-top: 8rpx;
+		}
+		&-con {
+			padding-top: 24rpx;
+			.iconfont {
+				font-size: 30rpx;
+				color: #0a5d3b;
+				margin-right: 4rpx;
+			}
+			.busitem-info {
+				font-size: 24rpx;
+				width: calc(100% - 238rpx);
+				padding-right: 24rpx;
+				border-right: 1rpx solid #F4F4F4;
+				&__item {
+					&:not(:last-child) {
+						margin-bottom: 20rpx;
+					}
+					&-txt {
+						color: #666666;
+						line-height: 34rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+				}
+			}
+		}
+		&-ft {
+			flex-shrink: 0;
+			width: 206rpx;
+		}
+		&-tips,&-distance {
+			text-align: center;
+		}
+		&-tips {
+			font-size: 28rpx;
+			color: #0A5D3B;
+			line-height: 40rpx;
+		}
+		&-distance {
+			font-size: 22rpx;
+			color: #999999;
+			line-height: 32rpx;
+		}
+	}
+	.address {
+		color: #333;
+		display: flex;
+		align-items: center;
+		background: #F7F7F7;
+		height: 72rpx;
+		border-radius: 36rpx;
+		padding: 0 20rpx;
+		flex-shrink: 0;
+		width: 274rpx;
+
+		.left {
+			flex: 1;
+			font-weight: 28rpx;
+			max-width: 100%;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+		.iconfont {
+			color: #333333;
+			font-weight: 600;
+		}
+		.icon-didian {
+			font-size: 32rpx;
+			margin-right: 20rpx;
+		}
+		.icon-shang {
+			font-size: 22rpx;
+			transform: rotate(180deg);
+			margin-left: 20rpx;
+		}
+	}
+
+	.search-container {
+		position: fixed;
+		width: 100%;
+		background: #fff;
+		z-index: 9;
+		top: var(--window-top);
+		padding: 24rpx 24rpx 20rpx;
+	}
+
+	.topsearch {
+		flex: 1;
+		padding-left: 16rpx;
+	}
+
+	.topsearch .f1 {
+		flex: 1;
+		height: 72rpx;
+		border-radius: 36rpx;
+		background: #F7F7F7;
+	}
+
+	.topsearch .f1 .img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-left: 10px
+	}
+
+	.topsearch .f1 input {
+		height: 100%;
+		flex: 1;
+		padding: 0 16rpx;
+		font-size: 28rpx;
+		color: #333;
+	}
+
+	.topsearch .search-btn {
+		display: flex;
+		align-items: center;
+		color: #5a5a5a;
+		font-size: 30rpx;
+		width: 60rpx;
+		text-align: center;
+		margin-left: 20rpx
+	}
+
+	.search-navbar {
+		display: flex;
+		text-align: center;
+		align-items: center;
+		padding: 5rpx 0
+	}
+
+	.search-navbar-item {
+		flex: 1;
+		height: 70rpx;
+		line-height: 70rpx;
+		position: relative;
+		font-size: 28rpx;
+		font-weight: bold;
+		color: #323232
+	}
+
+	.search-navbar-item .iconshangla {
+		position: absolute;
+		top: -4rpx;
+		padding: 0 6rpx;
+		font-size: 20rpx;
+		color: #7D7D7D
+	}
+
+	.search-navbar-item .icondaoxu {
+		position: absolute;
+		top: 8rpx;
+		padding: 0 6rpx;
+		font-size: 20rpx;
+		color: #7D7D7D
+	}
+
+	.search-navbar-item .iconshaixuan {
+		margin-left: 10rpx;
+		font-size: 22rpx;
+		color: #7d7d7d
+	}
+
+	.filter-scroll-view {
+		margin-top: var(--window-top)
+	}
+
+	.search-filter {
+		display: flex;
+		flex-direction: column;
+		text-align: left;
+		width: 100%;
+		flex-wrap: wrap;
+		padding: 0;
+	}
+
+	.filter-content-title {
+		color: #999;
+		font-size: 28rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		padding: 0 30rpx;
+		margin-top: 30rpx;
+		margin-bottom: 10rpx
+	}
+
+	.filter-title {
+		color: #BBBBBB;
+		font-size: 32rpx;
+		background: #F8F8F8;
+		padding: 60rpx 0 30rpx 20rpx;
+	}
+
+	.search-filter-content {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 10rpx 20rpx;
+	}
+
+	.search-filter-content .filter-item {
+		background: #F4F4F4;
+		border-radius: 28rpx;
+		color: #2B2B2B;
+		font-weight: bold;
+		margin: 10rpx 10rpx;
+		min-width: 140rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		text-align: center;
+		font-size: 24rpx;
+		padding: 0 30rpx
+	}
+
+	.search-filter-content .close {
+		text-align: right;
+		font-size: 24rpx;
+		color: #ff4544;
+		width: 100%;
+		padding-right: 20rpx
+	}
+
+	.search-filter button .icon {
+		margin-top: 6rpx;
+		height: 54rpx;
+	}
+
+	.search-filter-btn {
+		display: flex;
+		padding: 30rpx 30rpx;
+		justify-content: space-between
+	}
+
+	.search-filter-btn .btn {
+		width: 240rpx;
+		height: 66rpx;
+		line-height: 66rpx;
+		background: #fff;
+		border: 1px solid #e5e5e5;
+		border-radius: 33rpx;
+		color: #2B2B2B;
+		font-weight: bold;
+		font-size: 24rpx;
+		text-align: center
+	}
+
+	.search-filter-btn .btn2 {
+		width: 240rpx;
+		height: 66rpx;
+		line-height: 66rpx;
+		border-radius: 33rpx;
+		color: #fff;
+		font-weight: bold;
+		font-size: 24rpx;
+		text-align: center
+	}
+
+	.ind_business {
+		width: 100%;
+		font-size: 26rpx;
+		padding: 136rpx 24rpx 0;
+	}
+
+	.ind_business .ind_busbox {
+		background: #fff;
+		padding: 20rpx;
+		overflow: hidden;
+		margin-bottom: 20rpx;
+		border-radius: 8rpx;
+		position: relative
+	}
+
+	.ind_business .ind_buspic {
+		width: 120rpx;
+		height: 120rpx;
+		margin-right: 28rpx;
+	}
+
+	.ind_business .ind_buspic image {
+		width: 100%;
+		height: 100%;
+		border-radius: 8rpx;
+		object-fit: cover;
+	}
+
+	.ind_business .bus_title {
+		font-size: 28rpx;
+		color: #222;
+		font-weight: bold;
+		line-height: 40rpx
+	}
+
+	.ind_business .bus_score {
+		font-size: 24rpx;
+		color: #FC5648;
+		display: flex;
+		align-items: center
+	}
+
+	.ind_business .bus_score .img {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 10rpx
+	}
+
+	.ind_business .bus_score .txt {
+		margin-left: 20rpx
+	}
+
+	.ind_business .indsale_box {
+		display: flex
+	}
+
+	.ind_business .bus_sales {
+		font-size: 24rpx;
+		color: #999;
+		position: absolute;
+		top: 20rpx;
+		right: 28rpx
+	}
+
+	.ind_business .bus_address {
+		color: #999;
+		font-size: 24rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		overflow: hidden;
+		margin-top: 6rpx
+	}
+
+	.ind_business .bus_address .x2 {
+		padding-left: 20rpx
+	}
+
+	.ind_business .prolist {
+		white-space: nowrap;
+		margin-top: 16rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.ind_business .prolist .product {
+		width: 108rpx;
+		height: 160rpx;
+		overflow: hidden;
+		display: inline-flex;
+		flex-direction: column;
+		align-items: center;
+		margin-right: 24rpx
+	}
+
+	.ind_business .prolist .product .f1 {
+		width: 108rpx;
+		height: 108rpx;
+		border-radius: 8rpx;
+		background: #f6f6f6
+	}
+
+	.ind_business .prolist .product .f2 {
+		font-size: 22rpx;
+		color: #FC5648;
+		font-weight: bold;
+		margin-top: 4rpx
+	}
+</style>
diff --git a/pagesA/themes/baiLiTiaoTi/activity.vue b/pagesA/themes/baiLiTiaoTi/activity.vue
new file mode 100644
index 0000000..26efd74
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/activity.vue
@@ -0,0 +1,352 @@
+<template>
+  <view class="themes-activity position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view class="content" >
+		<view class="title-box flex j-center" >
+			<view class="flex">
+				<image class="t-bg-l" :src="event_rul + '/static/images/bl/bl-ttr.png'" mode="widthFix"></image>
+				<text class="t-bg-c font-w"  mode="widthFix">团购活动</text>
+				<image class="t-bg-r" :src="event_rul + '/static/images/bl/bl-ttl.png'" mode="widthFix"></image>
+			</view>
+		</view>
+      
+      <view class="nav-list flex j-between al-item-center">
+      
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="!field || field == 'sort' ? 'color:' + '#ED5925' : ''"
+        data-field="sort"
+        data-order="desc"
+        >推荐</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="field == 'sales' ? 'color:' + '#ED5925' : ''"
+        data-field="sales"
+        data-order="desc"
+        >销量</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        data-field="sell_price"
+        :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+        <text :style="field == 'sell_price' ? 'color:' + '#ED5925' : ''"
+          >价格</text
+        >
+        <text
+          style="font-size: 26rpx"
+          class="iconfont icon-danbianjiantou1"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'asc' ? '#ED5925' : '#999',
+          }"
+        ></text>
+        <text
+          style="font-size: 26rpx; margin-left: -10rpx"
+          class="iconfont icon-danbianjiantou"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'desc' ? '#ED5925' : '#999',
+          }"
+        ></text>
+        </view>
+        <view @tap="open" >筛选 <text class="iconfont icon-shaixuan" style="font-size: 26rpx; margin-left: 4rpx;color: #999;"></text></view>
+      </view>
+    </view>
+    <scroll-view
+      class="scroll-list lise-t"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopTuangou && shopTuangou.length > 0"
+    >
+      <themes-tuangou-item v-if="isActivity" :data="shopTuangou" :timestamp="timestamp" :menuindex="menuindex"></themes-tuangou-item>
+<!--      <themes-shop
+        :mgtop="0"
+        :mgright="30"
+        :mgleft="30"
+        :mgbottom="2"
+        v-else
+        :shopProduct="shopTuangou"
+      ></themes-shop> -->
+		<view class="flex flex-colum" v-else>
+			<image class="n-thing" :src="event_rul + '/static/images/n-thing.png'" mode="widthFix"></image>
+			<view class="text-center color-gray">暂无活动～</view>
+		</view>
+    </scroll-view>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')"></view>
+		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer,}" :style="{ width: drawerWidth + 'vw' }">
+			<view class="bolting-box">
+			<view class="name">筛选</view>
+			<view class="title">商品分类</view>
+			<view class="content flex flex-w">
+			<view class="content-itm">
+			  <view class="text" :style="{color: boltingListIndex === 0 ? '#CE0000' : '',backgroundColor: boltingListIndex === 0 ? '#FFDCD9' : '#F7F7F7 ',}" @tap="bolting(0)">
+				  全部
+			  </view>
+			  <block v-for="(item, idx) in boltingList" :key="idx">
+				<view class="text" v-show="boltingList.length != 0" :style="{color: boltingListIndex === idx + 1 ? '#CE0000' : '', backgroundColor: boltingListIndex === idx + 1 ? '#FFDCD9' : '#F7F7F7 ', }" @tap="bolting(idx + 1)">
+					{{ item.name }}
+				</view>
+			  </block>
+			</view>
+	      </view>
+	      <view class="bolting-box-b flex j-between">
+	        <view class="res btn" @tap="boltingAll()">重置</view>
+	        <view class="comf btn " :style="{ 'background-color': '#8DB400' }" @tap="filterConfirm(cpid)" >确定</view>
+		  </view>
+	    </view>
+	  </view>
+	</view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/activity.js';
+import themesHead from "./components/themes-head.vue";
+import themesShop from "./components/themes-shop.vue";
+import themesTuangouItem from "./components/themes-tuangou-item.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesShop,
+    themesTuangouItem
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-activity {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #F4F4F4 ;
+  overflow: hidden;
+  border-radius: 20rpx 20rpx 0 0;
+  
+  left: 0;
+  right: 0;
+}
+.content {
+	
+}
+.title-box {
+	height: 76rpx;
+	align-items: flex-end;
+	background: linear-gradient(180deg, #DFDDAD 0%, rgba(255,255,255,0) 100%);
+	.t-bg-l{
+		width: 60rpx;
+		margin: 10rpx 4rpx 0 0;
+	}
+	.t-bg-c {
+		font-style: italic;
+		font-size: 36rpx;
+		color: #8DB400;
+		letter-spacing: 2px;
+	}
+	.t-bg-r {
+		width: 60rpx;
+		margin: 10rpx 0 0 10rpx;
+	}
+}
+.nav-list {
+  flex-shrink: 0;
+  height: 80rpx;
+  padding: 34rpx 30rpx 34rpx;
+  .actived {
+    color: #CE0000;
+  }
+  .selec {
+    // font-size: 32rpx;
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  height: calc(100% - 156rpx);
+  overflow-y: scroll;
+  // padding: 14rpx 0 20rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+.n-thing {
+	width: 282rpx;
+	margin: 100rpx auto 0;
+}
+.lise-t {
+  // height: calc(100% - 140rpx);
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+
+.select-box {
+  width: 100%;
+  height: calc(100% - 80rpx);
+  position: absolute;
+  left: 0;
+  top: 80rpx;
+  .select-mxk {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 66;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+
+  .select-box-content {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 68;
+
+    .content-item {
+      border-top: 2rpx solid #f2f2f4;
+    }
+  }
+}
+// 筛选
+.uni-drawer {
+  height: 100%;
+  width: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  // top: 0;
+  // left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+  z-index: 999;
+}
+
+.uni-drawer__content {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  top: 0;
+  width: 220px;
+  bottom: 0;
+  background-color: #ffffff;
+  transition: transform 0.3s ease;
+}
+
+.uni-drawer--left {
+  right: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(-220px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(100%);
+  /* #endif */
+}
+
+.uni-drawer--right {
+  right: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(220px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(-100%);
+  /* #endif */
+}
+
+.uni-drawer__content--visible {
+  transform: translateX(0px);
+}
+
+.uni-drawer__mask {
+  width: 100%;
+  height: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 0;
+  position: absolute;
+  // top: 0;
+  // left: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  transition: opacity 0.3s;
+}
+
+.uni-drawer__mask--visible {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 1;
+}
+
+.bolting-box {
+  padding: 30rpx;
+
+  .name {
+	// padding: 30rpx 28rpx 6rpx;
+    font-size: 32rpx;
+  }
+  .title {
+   padding: 28rpx 0;
+   font-size: 24rpx;
+   color: #999;
+  }
+  .content {
+    width: 100%;
+	min-height: 186rpx;
+	// padding: 0 28rpx;
+	
+	.content-itm {
+		
+	}
+    .text {
+	  width: 150rpx;
+	  height: 60rpx;
+	  line-height: 60rpx;
+	  text-align: center;
+      margin-right: 20rpx;
+      margin-bottom: 30rpx;
+	  font-size: 24rpx;
+      // padding: 8rpx 16rpx;
+      border-radius: 4rpx;
+      // background-color: #FFDCD9;
+    }
+  }
+  .bolting-box-b {
+    width: 100%;
+	// height: 96rpx;
+    padding-top: 60rpx;
+    border-top: 2rpx solid #ECECEC;
+    .btn {
+      width: 214rpx;
+      height: 60rpx;
+      line-height: 60rpx;
+      text-align: center;
+      border-radius: 12rpx;
+    }
+    .res {
+		// width: 200rpx;
+        border: 2rpx solid #ECECEC;
+    }
+    .comf {
+		color: #fff;
+		
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/choiceness.vue b/pagesA/themes/baiLiTiaoTi/choiceness.vue
new file mode 100644
index 0000000..60e3f2d
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/choiceness.vue
@@ -0,0 +1,95 @@
+<template>
+  <view class="themes-choiceness">
+<!--    <themes-vip
+      v-if="shopNotice.length != 0"
+      :shopNotice="shopNotice"
+      :noticeIcon="shopData.noticeIcon"
+    ></themes-vip> -->
+
+    <!-- 优惠 -->
+    <themes-coupon-one
+      v-if="shopCoupon.length != 0"
+      :shopCoupon="shopCoupon"
+    ></themes-coupon-one>
+    <!-- 视频 -->
+    <themes-live
+      v-if="shopVideo.length != 0"
+      :shopVideo="shopVideo"
+	  :shopNotice="shopNotice"
+    ></themes-live>
+    <!-- 菜单 -->
+    <themes-hot
+      v-if="shopMenu.length != 0"
+      :shopMenu="shopMenu"
+      :isShowDots="isShowDots"
+    ></themes-hot>
+	<!-- 团购 -->
+	<themes-tuangou
+	  v-if="shopTuangou.length != 0"
+	  :shopTuangou="shopTuangou"
+	  :top="true"
+	></themes-tuangou>
+    <!-- 笔记 -->
+    <themes-note
+      v-if="shopNote.length != 0"
+      :shopNote="shopNote"
+    ></themes-note>
+    <!-- banner -->
+<!--    <themes-banner
+      v-if="shopBanner.length != 0"
+      :shopBanner="shopBanner"
+    ></themes-banner> -->
+    <!-- 精选商品 -->
+	<themes-recommend
+	  v-if="shopProduct.length != 0"
+	  :shopProduct="shopProduct"
+	></themes-recommend>
+	
+	<!-- 推荐商品 -->
+    <themes-shop
+      v-if="shopSelPro.length != 0"
+      :shopProduct="shopSelPro"
+      :isShowTitle="true"
+    ></themes-shop>
+    
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/choiceness.js";
+import themesHead from "./components/themes-head.vue";
+import themesVip from "./components/themes-vip.vue";
+import themesCouponOne from "./components/themes-coupon-one.vue";
+import themesCimg from "./components/themes-c-img.vue";
+import themesHot from "./components/themes-hot.vue";
+import themesTuangou from "./components/themes-tuangou.vue";
+import themesRecommend from "./components/themes-recommend.vue";
+import themesShop from "./components/themes-shop.vue";
+import themesNote from "./components/themes-note.vue";
+import themesBanner from "./components/themes-banner.vue";
+import themesLive from "./components/themes-live.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesVip,
+    themesCouponOne,
+    themesCimg,
+    themesHot,
+    themesTuangou,
+    themesRecommend,
+    themesShop,
+    themesNote,
+    themesLive,
+    themesBanner,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-choiceness {
+    margin-top: -30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/classify.vue b/pagesA/themes/baiLiTiaoTi/classify.vue
new file mode 100644
index 0000000..587f8d8
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/classify.vue
@@ -0,0 +1,173 @@
+<template>
+  <view class="themes-classify">
+    <image class="themes-classify__img" :src="shopData.bgimg" mode="widthFix"></image>
+    <block v-if="flag">
+      <themes-head
+        :navHeight="navHeight"
+        :shopData="shopData"
+        :isShowNav="false"
+        :navIndex="1"
+      ></themes-head>
+      <view class="themes-content">
+        <view class="themes-content__left">
+          <view
+            class="classify-item"
+            :class="{ actived: currentIndex === '' }"
+            @tap="selectAll()"
+            >全部</view
+          >
+          <view
+            class="classify-item"
+            v-for="(item, index) in shopCategory"
+            :key="index"
+            :class="{ actived: currentIndex === index }"
+            @tap="categoryHandle(item.id, index)"
+          >
+            {{ item.name }}
+          </view>
+        </view>
+        <view class="themes-content__right">
+          <view class="classify-tabs">
+            <view
+              class="classify-tabs__item"
+              :class="{ actived: isSelectAll }"
+              @tap="selectCategoryAll()"
+              >全部</view
+            >
+            <view
+              class="classify-tabs__item"
+              v-for="(item, index) in shopCategorychild"
+              :key="index"
+              :class="{ actived: curidx === index && !isSelectAll }"
+              @tap="categoryChildHandle(item.id, index)"
+              >{{ item.name }}</view
+            >
+          </view>
+          <scroll-view
+            class="themes-content__scroll"
+            :scroll-y="true"
+            @scrolltolower="getmorecomment"
+          >
+            <classifyShop :shopProduct="shopProduct"></classifyShop>
+            <loading v-if="loading"></loading>
+            <nomore v-if="nomore"></nomore>
+            <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+          </scroll-view>
+        </view>
+      </view>
+    </block>
+    <loading v-else></loading>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/classify.js';
+import themesHead from "./components/themes-head.vue";
+import classifyShop from "./components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    classifyShop,
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.themes-classify {
+  height: 100vh;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  z-index: 1;
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    // height: 1020rpx;
+  }
+}
+.themes-content {
+  position: relative;
+  z-index: 2;
+  box-sizing: border-box;
+  overflow: hidden;
+  margin-top: 28rpx;
+  background: #fff;
+  position: relative;
+  border-radius: 12rpx 12rpx 0 0;
+  display: flex;
+  flex: 1;
+  &__left {
+    width: 180rpx;
+    flex-shrink: 0;
+    background: #f8f9fa;
+    overflow-y: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  &__right {
+    flex: 1;
+    box-sizing: border-box;
+    padding: 28rpx 28rpx 0;
+    position: relative;
+    /deep/ .nodata {
+      margin-left: -30rpx;
+    }
+  }
+  &__scroll {
+    height: calc(100% - 86rpx);
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  .classify-item {
+    height: 110rpx;
+    line-height: 110rpx;
+    text-align: center;
+    font-size: 28rpx;
+    color: #666666;
+    &.actived {
+      color: #CE0000;
+      background: #fff;
+      font-weight: 500;
+    }
+  }
+  .classify-tabs {
+    display: flex;
+    margin-bottom: 30rpx;
+    overflow-x: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &__item {
+      flex-shrink: 0;
+      min-width: 80rpx;
+      box-sizing: border-box;
+      margin-right: 20rpx;
+      padding: 0 18rpx;
+      font-size: 22rpx;
+      line-height: 42rpx;
+      border-radius: 42rpx;
+      color: #666666;
+      background: #f7f7f7;
+      &.actived {
+        background: linear-gradient(150deg, #FFF4F4 0%, #FFE0E1 100%);
+        color: #CE0000;
+      }
+    }
+  }
+  /deep/ .nomore {
+    margin-left: 32rpx;
+  }
+  /deep/ .nodata {
+    width: calc(100vw - 180rpx);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/classify-shop.vue b/pagesA/themes/baiLiTiaoTi/components/classify-shop.vue
new file mode 100644
index 0000000..bfae971
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/classify-shop.vue
@@ -0,0 +1,221 @@
+<template>
+  <view
+    class="classify-shops"
+  >
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-item flex"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-item__hd flex j-center al-item-center">
+              <image
+                class="shops-item__img"
+                :src="item.pic"
+                mode="aspectFill"
+              ></image>
+            </view>
+            <view class="shops-item__bd">
+              <view class="shops-item__title text-overflow-line">{{ item.name }}</view>
+              <view class="shops-item__sale">已售{{ item.sales }}</view>
+              <view class="shops-item__bottom flex al-item-center j-between">
+                <view class="shops-item__price flex">¥<text class="shops-item__num">{{ item.sell_price }}</text></view>
+                <view class="shops-item__icon"
+                    @click.stop="buydialogChange"
+                    :data-proid="item.proid"></view>
+              </view>
+            </view>
+          </view>
+        </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array, 
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.classify-shops {
+    padding-bottom: 20rpx;
+    box-sizing: border-box;
+    .shops-item {
+      padding: 20rpx 0 14rpx;
+      &:not(:last-child) {
+        border-bottom: 1rpx solid #ECECEC;
+      }
+      &__hd {
+        width: 192rpx;
+        height: 192rpx;
+        flex-shrink: 0;
+      }
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+      &__bd {
+        flex: 1;
+        margin-left: 12rpx;
+      }
+      &__title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: 36rpx;
+        margin-bottom: 36rpx;
+        min-height: 72rpx;
+      }
+      &__sale {
+        font-size: 18rpx;
+        color: #999999;
+        line-height: 22rpx;
+        margin-bottom: 4rpx;
+      }
+      &__price {
+        color: #CE0000;
+        font-weight: 500;
+        font-size: 24rpx;
+        line-height: 34rpx;
+        align-items: baseline;
+      }
+      &__num {
+        margin-left: 4rpx;
+        font-size: 36rpx;
+        line-height: 50rpx;
+      }
+      &__icon {
+					width: 44rpx;
+					height: 44rpx;
+          margin-top: -4rpx;
+					background: linear-gradient(180deg, #AECB00 0%, #8DB400 100%);
+					border-radius: 20rpx;
+					position: relative;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 8rpx;
+						right: 8rpx;
+						height: 4rpx;
+						top: 50%;
+						transform: translateY(-50%);
+						background: #FFF;
+					}
+					&::after {
+						content: "";
+						position: absolute;
+						top: 8rpx;
+						bottom: 8rpx;
+						width: 4rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						background: #FFF;
+					}
+				}
+    }
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    border: none;
+    // width: 100%;
+    height: auto;
+    display: flex;
+    padding-bottom: 25rpx;
+    &:not(:last-child) {
+      position: relative;
+      &::after {
+        content: "";
+        position: absolute;
+        bottom: 5rpx;
+        left: 0;
+        right: 0;
+        border-bottom: 1rpx solid rgba(0,0,0,0.1);
+        transform: scaleY(0.5);
+      }
+    }
+    &__hd {
+      width: 200rpx;
+      height: 200rpx;
+      border-radius: 12rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+    .shops-img {
+      width: 100%;
+      height: 100%;
+    }
+    .item-info {
+      flex: 1;
+      padding: 0 20rpx;
+    }
+    .shops-c-t {
+      padding-top: 15rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      min-height: 75rpx;
+    }
+    .shops-s-t {
+      padding-top: 10rpx;
+      font-size: 24rpx;
+      color: #999;
+    }
+    .shops-b-t {
+      padding-top: 10rpx;
+
+      .b-t1 {
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 30rpx;
+      }
+      .b-t3 {
+        color: #999;
+      }
+      .car {
+        width: 44rpx;
+        height: 44rpx;
+
+        .icon_gouwuche {
+          color: #fff;
+          font-size: 32rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-banner.vue b/pagesA/themes/baiLiTiaoTi/components/themes-banner.vue
new file mode 100644
index 0000000..7f5fdee
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-banner.vue
@@ -0,0 +1,74 @@
+<template>
+  <view class="themes-banner">
+    <swiper
+      class="swiper-container"
+      :indicator-dots="true"
+      :autoplay="true"
+      circular="true"
+      :interval="5000"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopBanner"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <image class="swiper-item__img" :src="item.imgurl"></image>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopBanner: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-banner {
+  .swiper-container {
+    width: 100%;
+    height: 800rpx;
+    margin-top: 28rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+    .wx-swiper-dot {
+      width: 12rpx;
+      height: 8rpx;
+      border-radius: 20rpx;
+    }
+    .wx-swiper-dot::before {
+      content: "";
+      flex-grow: 1;
+      background: #efbd6f;
+    }
+    .wx-swiper-dot-active::before {
+      width: 50rpx;
+      background: #efbd6f;
+    }
+    .swiper-item {
+      width: 100%;
+      height: 100%;
+      border-radius: 10rpx;
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-c-img.vue b/pagesA/themes/baiLiTiaoTi/components/themes-c-img.vue
new file mode 100644
index 0000000..1c986be
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-c-img.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="themes-c-img" :class="[top? 'top' : 'top-z',navHeight > 60 ? 'top-m': '']">
+		<image class="kn-img" src="https://img0.baidu.com/it/u=617696644,3314521124&fm=253&fmt=auto&app=138&f=JPEG?w=625&h=500" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			top: {
+				type: Boolean,
+				default: false
+			},
+			navHeight: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+	
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-c-img {
+		display: flex;
+		.kn-img {
+			width: 100%;
+			border-radius: 12rpx
+			// vertical-align: middle;
+		}
+	}
+	.top {margin-top: -190rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -160rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-chunk-title.vue b/pagesA/themes/baiLiTiaoTi/components/themes-chunk-title.vue
new file mode 100644
index 0000000..0ca9d13
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-chunk-title.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="shops-til flex al-item-center">
+		<image class="shops-til__icon" :src="iconSrc"></image>
+		<view class="shops-til__title">{{ title }}</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			title: {
+				type: String,
+				default: ''
+			},
+			iconSrc: {
+				type: String,
+				default: ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shops-til {
+		padding: 24rpx 0;
+		&__icon {
+			width: 50rpx;
+			height: 50rpx;
+			flex-shrink: 0;
+			margin-right: 12rpx;
+		}
+		&__title {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 44rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-coupon-one.vue b/pagesA/themes/baiLiTiaoTi/components/themes-coupon-one.vue
new file mode 100644
index 0000000..9f91b7d
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-coupon-one.vue
@@ -0,0 +1,225 @@
+<template>
+	<view class="themes-coupon">
+		<!-- <themes-chunk-title title="优惠立减" :iconSrc="event_rul + '/static/theme/conpon-icon.svg'"></themes-chunk-title> -->
+		<scroll-view class="scroll-list" :scroll-x="true">
+			<block v-for="(item, idx) in shopCoupon1" :key="idx">
+				<!-- isUse 是按钮为'去使用'的优惠券 -->
+				<view class="scroll-list__item" v-if="!item.isOver" :class="{ 'isUse': item.isUse }" @tap.stop="getcoupon" :data-idx="idx" :data-id="item.couponid" :data-price="item.price" :data-score="item.score">
+					<image class="scroll-list__item-bg" :src="item.isUse ? event_rul + '/static/images/bl/bl-cunp1.png' : event_rul + '/static/images/bl/bl-cunp2.png'"></image>
+					<view class="conpon-price">
+						<view class="conpon-price-c flex j-center">
+							<text class="price-f">¥</text>
+							<text class="price-num font-w">{{ item.money }}</text>
+						</view>
+						<view class="conpon-price-h">满{{ item.minprice }}元使用</view>
+					</view>
+					<view class="conpon-btn  flex al-item-center flex-colum">
+						<text class="">{{ '优惠券' }}</text>
+						<text class="border-rius-r text-center" :class="item.isUse? 'use-b': 'get-b'">{{item.isUse ? '去使用' : '点击领取' }}</text>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopCoupon: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data() {
+			return {
+				shopCoupon1: this.shopCoupon,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		watch: {
+			shopCoupon (newV, oldV) {
+				this.shopCoupon1 = newV;
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+		methods: {
+			// 点击领取
+			getcoupon: function (e) {
+				
+				var that = this;
+				var idx = e.currentTarget.dataset.idx;
+				var id = e.currentTarget.dataset.id;
+				var score = parseInt(e.currentTarget.dataset.score);
+				var price = e.currentTarget.dataset.price;
+				
+				if (price > 0) {
+					app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+						console.log(res)
+						if(res.status == 0) {
+								app.error(res.msg);
+						} else {
+							app.goto('/pages/pay/pay?id=' + res.payorderid);
+						}
+					})
+					return;
+				}
+				if (score > 0) {
+					app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+						app.showLoading('兑换中');
+						app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+							app.showLoading(false);
+							if (data.status == 0) {
+								app.error(data.msg);
+							} else {
+								app.success(data.msg);
+							}
+						});
+					});
+				}
+				that.shopCoupon.map((item,index) => {
+					if(index === idx) {
+						if(item.isUse) {
+							uni.navigateTo({
+								url:'/pages/shop/prolist?cpid='+ id
+							})
+						} else if(item.isOver) {
+							return;
+						} else {
+							app.showLoading('领取中');
+							app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+								app.showLoading(false);
+								if (data.status == 0) {
+									app.error(data.msg);
+								} else {
+									app.success(data.msg);
+									that.$set(item,"msg","去使用");
+									that.$set(item,'isUse',true);
+									that.$set(item,'isOver',false);
+								}
+							});
+						}
+					}
+				})				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-coupon {
+		margin-top: 30rpx;
+		// background: #FFF;
+		border-radius: 20rpx;
+		// padding: 0 0 24rpx 22rpx;
+		.scroll-list {
+			width: 104%;
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			.scroll-list__item {
+				display: inline-flex;
+				// flex-direction: column;
+				padding-bottom: 5px;
+				align-items: flex-end;
+				margin-right: 28rpx;
+				position: relative;
+				width: 232rpx;
+				height: 104rpx;
+				// padding: 14rpx;
+				z-index: 1;
+				&:last-child {
+					margin-right: 22rpx;
+				}
+				&.isUse {
+					// .conpon-price {
+					// 	color: #CE0000;
+					// }
+					// .conpon-btn {
+					// 	color: #CE0000;
+					// }
+				}
+				&-bg {
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 100%;
+					height: 100%;
+					z-index: -1;
+				}
+				.conpon-price {
+					width: 60%;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					color: #CE0000;
+					.conpon-price-c {
+						// align-items: flex-start;
+						align-items: baseline;
+						.price-f {
+							padding: 10rpx 2rpx 0 0;
+							font-size: 24rpx;
+							// line-height: 34rpx;
+						}
+						.price-num {
+							font-size: 44rpx;
+							// line-height: 100rpx;
+							letter-spacing: 2rpx;
+						}
+					}
+					.conpon-price-h {
+						margin-top: -6rpx;
+						font-size: 20rpx;
+						font-weight: 500;
+						line-height: 28rpx;
+					}
+				}
+				.conpon-btn {
+					width: 40%;
+					
+					justify-content: center;
+					// margin-top: 35rpx;
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #CE0000;
+					// line-height: 34rpx;
+					
+					.use-b {			
+						width: 76rpx;
+						height: 26rpx;
+						margin-top: 12rpx;
+						font-size: 16rpx;
+						line-height: 26rpx;
+						border: 2rpx solid #CE0000;
+					}
+					
+					.get-b {
+						width: 76rpx;
+						height: 26rpx;
+						margin-top: 12rpx;
+						font-size: 16rpx;
+						line-height: 26rpx;
+						background-color: #CE0000;
+						color: #fff;
+					}
+				}
+			}
+		}
+	}
+	
+	.top {margin-top: -70rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -40rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-head.vue b/pagesA/themes/baiLiTiaoTi/components/themes-head.vue
new file mode 100644
index 0000000..4802302
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-head.vue
@@ -0,0 +1,430 @@
+<template>
+  <view
+    class="themes-head position-r"
+    :style="{ 'padding-top': navHeight + 'px' }"
+  >
+    <view
+      class="head-bx-h"
+      :style="'height:'+ navHeight+'px;background:'+(shopInfo.bgimg ?'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top 0 left 0':'')"
+    >
+      <view class="head-bx-ct position-a flex al-item-center">
+        <text class="iconfont icon-icon_arrow_left" @tap="goBack"></text>
+        <text
+          class="iconfont icon-shouye"
+          @tap="goto"
+          data-url="/pages/index/index"
+          data-opentype="reLaunch"
+        ></text>
+        <view class="search flex al-item-center j-between border-rius-r">
+          <text class="iconfont icon-search"></text>
+          <input
+            placeholder="请输入搜索内容..."
+            type="text"
+            v-model="searchVlaue"
+            @confirm="search"
+          />
+        </view>
+      </view>
+    </view>
+
+    <view class="head-bx-cont">
+      <view class="head-store flex al-item-center j-between">
+        <view class="store-l flex al-item-center">
+          <image class="store-logo" :src="shopInfo.logo"></image>
+          <view class="store-l-c flex1">
+            <view
+              class="store-l-tlt flex al-item-center"
+              @click="goto"
+              :data-url="
+                '/pagesA/shop/shop-detail?bid=' +
+                shopInfo.id +
+                '&pagestext=' +
+                shopInfo.name
+              "
+            >
+              <text class="head-store__name">{{ shopInfo.name || "" }}</text>
+              <text class="iconfont icon-arrow-right"></text>
+            </view>
+            <!-- <view class="store-l-tx text-center" :style="{'background-color': '#FF8017'}">自营</view> -->
+          </view>
+        </view>
+        <view class="store-r flex flex-colum al-item-center">
+          <view
+            @tap="followFn"
+            class="store-r-tlt text-center"
+            :class="shopInfo.isFollow ? 'followed' : 'isFollow'"
+          >
+            <image
+              class="follow-icon"
+              v-if="!shopInfo.isFollow"
+              :src="event_rul + '/static/theme/follow-icon.svg'"
+            ></image>
+            <text>{{ shopInfo.isFollow ? "已关注" : "关注" }}</text>
+          </view>
+          <!-- <view class="store-r-tlt text-center" :style="{'border-color': '#FF8017', 'color': '#FF8017','border':' 1px solid'}">已关注</view> -->
+          <view class="store-r-tx">{{ shopInfo.attention || 0 }}人关注</view>
+        </view>
+      </view>
+      <view
+        v-if="isShowNav"
+        class="head-nav-list flex j-between"
+        :class="{ 'isFixed': navFixed }"
+        :style="'top:'+ (navHeight - 1) + 'px;background:'+(navFixed ? (shopInfo.bgimg ? 'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top -60px left 0':''):'')"
+      >
+        <block v-for="(item, idx) in navBar" :key="idx">
+          <view class="nav-list-itm" @tap="selectNav(idx)">
+            <view class="itm-tx color-white">{{ item }}</view>
+            <view
+              v-show="navIndex == idx"
+              class="itm-select border-rius-r"
+            ></view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState, mapActions } from "vuex";
+var app = getApp();
+export default {
+  props: {
+    navHeight: {
+      type: Number,
+      default: 0,
+    },
+    navList: {
+      typa: Array,
+      default: function() {
+        return [];
+      },
+    },
+    shopData: {
+      typa: Object,
+      default: {},
+    },
+    navIndex: {
+      type: Number,
+      default: 0,
+    },
+    isShowNav: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      bxContHeight: 0,
+      timeout: null,
+      timeouttwo: null,
+      searchVlaue: "",
+      shopInfo: this.shopData,
+      event_rul: app.globalData.event_url,
+      navBar: [],
+    };
+  },
+  computed: {
+    ...mapState(["opt","navFixed","heardHeight"]),
+  },
+  watch: {
+    // 监听shopData变化
+    shopData(newV, oldV) {
+      this.shopInfo = newV;
+    },
+    navList: {
+      handler: function(newV, oldV) {
+        this.navBar = newV;
+      },
+      deep: true,
+    }
+  },
+  mounted() {
+    const vr = uni.getSystemInfoSync();
+    this.styleHeight();
+    this.getData();
+  },
+  beforeDestroy() {
+    clearTimeout(this.timeout);
+	clearTimeout(this.timeouttwo);
+  },
+  methods: {
+    ...mapActions(["acNavHeightTop","acHeardHeight"]),
+    getData() {
+      if (this.navList.length == 0) {
+        this.navBar = ["精选", "商品", "活动", "新品"];
+      } else {
+        this.navBar = this.navList;
+      }
+      const query = uni.createSelectorQuery().in(this);
+      this.timeouttwo = setTimeout(() => {
+        let listTop = 0;
+        query.select(".head-nav-list").boundingClientRect((data) => {
+          listTop = data ? Number(data.top) : 0;
+        }).exec();
+        query.select(".head-bx-cont").boundingClientRect((data) => {
+          const heightTop = listTop - (data ? Number(data.top) : 0);
+          this.acNavHeightTop(heightTop);
+        }).exec();
+      }, 200)
+    },
+    // 关注店铺
+    followFn() {
+      var that = this;
+      console.log("打印店铺信息+++++", this.shopData, this.shopData);
+      // 暂时写死 follow_id：27，正确为 follow_id：that.shopData.id
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.shopData.id || "", type: "store" },
+        function (res) {
+          console.log("点击关注和取消关注addFollow===========", res);
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo();
+        }
+      );
+    },
+
+    getInfo() {
+      var that = this;
+      // 暂时写死 id：27，正确为 id：that.shopData.id
+      app.post(
+        "/ApiBusiness/follow",
+        { bid: that.shopData.id || "" },
+        function (res) {
+          that.$set(that.shopData, "attention", res.data.followCount);
+          that.$set(that.shopData, "isFollow", res.data.isFollow);
+
+          console.log("-----", that.shopData);
+          // 公共头部信息
+          uni.setStorage({
+            key: "header_data",
+            data: that.shopData,
+          });
+        }
+      );
+    },
+
+    styleHeight() {
+      let query = uni.createSelectorQuery().in(this);
+      query.select(".head-bx-cont").boundingClientRect();
+      query.select(".themes-head").boundingClientRect();
+		this.timeout = setTimeout(() => {
+			query.exec((res) => {
+			  if (res[0] != null && res[1] != null) {
+			    this.bxContHeight = res[0].height;
+          if(!this.navFixed) {
+            this.acHeardHeight(res[1].height)
+          }
+			  }
+			});
+		}, 200)
+    },
+    // 返回
+    goBack() {
+      uni.navigateBack();
+    },
+    // 搜索
+    search() {
+      uni.navigateTo({
+        url:
+          "/pagesA/shop/search?keyword=" +
+          this.searchVlaue +
+          "&id=" +
+          this.shopData.id,
+      });
+      return;
+    },
+    selectNav(idx) {
+        this.$emit("navselect", idx, this.bxContHeight, this.heardHeight);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-head {
+  width: 100%;
+  flex-shrink: 0;
+  z-index: 3;
+  
+  .bg-fh {
+	  width: 100%;
+	  top: 0;
+	  left: 0;
+	  z-index: 33;
+  }
+  .head-bx-h {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 99;
+    background-size: 100% 1020rpx;
+    background-position: top 0 left 0;
+    .head-bx-ct {
+      height: 32px;
+      left: 0;
+      bottom: 4px;
+
+      .icon-icon_arrow_left {
+        padding-left: 30rpx;
+        color: #fff;
+        font-size: 50rpx;
+      }
+      .icon-shouye {
+        font-size: 45rpx;
+        color: #fff;
+        padding: 10rpx 20rpx;
+      }
+      .search {
+        margin-left: 20rpx;
+        width: 60%;
+        height: 100%;
+        padding: 0 20rpx;
+        background-color: #fff;
+
+        .icon-search {
+          font-size: 50rpx;
+          color: #ababab;
+        }
+        input {
+          padding-left: 20rpx;
+        }
+      }
+    }
+  }
+
+  .head-bx-cont {
+    padding-top: 30rpx;
+
+    .head-store {
+      color: #fff;
+      padding: 0 28rpx;
+      &__name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        /* autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        text-align: justify;
+      }
+      .store-l {
+        width: 80%;
+        .store-logo {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 12rpx;
+        }
+
+        .store-l-c {
+          padding-left: 20rpx;
+          .store-l-tlt {
+            font-size: 32rpx;
+            white-space: pre-wrap;
+            word-break: break-all;
+            padding-right: 45rpx;
+            display: flex;
+            align-items: center;
+
+            .icon-arrow-right {
+              font-size: 40rpx;
+              padding: 6rpx 0 0 0;
+            }
+          }
+          .store-l-tx {
+            min-width: 60rpx;
+            // min-height: 30rpx;
+            padding: 4rpx 10rpx;
+            margin-top: 8rpx;
+            line-height: 30rpx;
+            display: inline-block;
+            font-size: 24rpx;
+            border-radius: 4rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
+
+      .store-r {
+        .store-r-tlt {
+          width: 120rpx;
+          height: 48rpx;
+          line-height: 48rpx;
+          border-radius: 24rpx;
+          font-size: 24rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          &.isFollow {
+              background-image: linear-gradient(
+                152deg,
+                rgba(255, 116, 25, 1) 0,
+                rgba(237, 12, 12, 1) 100%
+              );
+            color: #fff;
+            .follow-icon {
+              width: 28rpx;
+              height: 24rpx;
+              margin-right: 6rpx;
+            }
+          }
+          &.followed {
+            color: #fff;
+            position: relative;
+            &::before {
+              content: "";
+              position: absolute;
+              left: 0;
+              top: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #fff;
+              box-sizing: border-box;
+              transform: scale(0.5, 0.5);
+              border-radius: 48rpx;
+              transform-origin: 0 0;
+            }
+          }
+        }
+
+        .store-r-tx {
+          padding-top: 6rpx;
+          font-size: 22rpx;
+        }
+      }
+    }
+
+    .head-nav-list {
+      padding: 0 28rpx;
+      font-size: 28rpx;
+      align-items: flex-start;
+      background-size: 100% 1020rpx;
+      &.isFixed {
+        position: fixed;
+        left: 0;
+        right: 0;
+		z-index: 36;
+      }
+      .nav-list-itm {
+        padding: 28rpx 32rpx 0;
+        .itm-tx {
+          z-index: 6;
+        }
+        .itm-select {
+          width: 100%;
+          height: 6rpx;
+          margin-top: 6rpx;
+          z-index: 2;
+          background: #fff;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-hot.vue b/pagesA/themes/baiLiTiaoTi/components/themes-hot.vue
new file mode 100644
index 0000000..db0ecf0
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-hot.vue
@@ -0,0 +1,183 @@
+<template>
+  <view class="themes-hot-sale">
+    <scroll-view class="scroll-list" :scroll-x="true" @scroll="scrollHandle($event)">
+      <view class="scroll-list-row" v-for="(items, idx) in shopMenu" :key="idx">
+        <view
+          class="scroll-list-item"
+          v-for="(item, index) in items"
+          :key="index"
+          @tap.stop="goShopCgry(item.hrefurl, item.id)"
+        >
+          <view class="list-item flex flex-w">
+            <view class="list-item-c flex flex-colum al-item-center">
+              <view class="list-item-cnt position-r">
+                <image
+                  class="item-c-img border-rius-r"
+                  :src="item.imgurl"
+                  mode=""
+                ></image>
+                <!-- <text
+                  class="item-c-hot hot-s1 position-a"
+                  :style="{ 'border-color': '#FE7D11', color: '#FE7D11' }"
+                  v-if="index == 0"
+                  >HOT</text
+                > -->
+              </view>
+              <text class="list-item-tl fs12">{{ item.text }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view v-if="isShowDots" class="list-dots">
+      <view class="list-dots__item" :style="'left:' + dotLeft + 'px'"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  props: {
+    shopMenu: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    isShowDots: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      width: 0,  // scroll-list节点宽度
+      dotLeft: 0,  // 圆点滚动的距离
+    }
+  },
+  computed: {
+    ...mapState(["opt"]),
+  },
+  mounted() {
+    const query = uni.createSelectorQuery().in(this);
+    query.select('.scroll-list').boundingClientRect(data => {
+      this.width = data.width;
+      console.log("得到布局位置信息" + this.width);
+    }).exec();
+  },
+  methods: {
+    scrollHandle(e){
+      let scrollLeft = e.detail.scrollLeft;
+      let scrollWidth  = e.detail.scrollWidth;
+      let ratio = scrollLeft / (scrollWidth - this.width);
+      this.dotLeft = 18 * ratio;
+    },
+    goShopCgry(url, id) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-hot-sale {
+  background: #FFF;
+  padding: 16rpx 16rpx;
+  box-shadow: 0rpx 4px 8rpx 0rpx rgba(0,0,0,0.0300);
+  border-radius: 20rpx;
+  margin-top: 28rpx;
+  .swiper-container {
+    height: 450rpx;
+    &.swiper-single {
+      height: 210rpx;
+    }
+  }
+
+  .scroll-list {
+    width: 100%;
+    position: relative;
+    width: calc(100% + 16rpx);
+    right: -16rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &-row:not(:last-child) {
+      margin-bottom: 18rpx;
+    }
+    .scroll-list-item {
+      background: none;
+      display: inline-block;
+      margin-left: 35rpx;
+
+      .list-item-c {
+        width: 106rpx;
+
+        .list-item-cnt {
+          .item-c-img {
+            width: 90rpx;
+            height: 90rpx;
+            vertical-align: middle;
+          }
+
+          .item-c-hot {
+            padding: 2rpx 10rpx;
+            font-size: 20rpx;
+            border: 2rpx solid;
+            border-radius: 50rpx 60rpx 60rpx 0px;
+            background-color: #fff;
+            top: 6rpx;
+            right: -12rpx;
+          }
+
+          .hot-s1 {
+            background-color: #fff;
+          }
+        }
+        .list-item-tl {
+          max-width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          padding-top: 10rpx;
+        }
+      }
+    }
+    .scroll-list-item:first-child {
+      margin-left: 0;
+    }
+  }
+  .list-dots {
+    margin-top: 18rpx;
+    position: relative;
+    width: 72rpx;
+    height: 6rpx;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #EAEAEA;
+    border-radius: 6rpx;
+    &__item {
+      position: absolute;
+      top: 0;
+      width: 50%;
+      height: 100%;
+      background: #EA4E34;
+    }
+  }
+}
+
+.top {
+  margin-top: -60rpx;
+}
+.top-z {
+  margin-top: 0rpx;
+}
+.top-m {
+  margin-top: -50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-live.vue b/pagesA/themes/baiLiTiaoTi/components/themes-live.vue
new file mode 100644
index 0000000..d20dd1b
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-live.vue
@@ -0,0 +1,297 @@
+<template>
+  <view class="themes-live position-r">
+    <view
+      v-for="(item, index) in shopVideo"
+      :key="index"
+      @click="goto"
+      :data-url="'/activity/shortvideo/detail?id=' + item.videoId"
+    >
+		<image class="bofang" :src="event_rul + '/static/images/bl/bofang-ic.png'" mode="widthFix"></image>
+      
+      <image
+        class="themes-live-bg"
+        :src="item.coverimg"
+        mode="aspectFill"
+      ></image>
+	  <view class="notice position-a">
+	  	<swiper
+	  	  class="swiper-box"
+	  	  vertical="true"
+	  	  autoplay="true"
+	  	  circular="true"
+	  	  :indicator-dots="false"
+	  	  :auto-play="true"
+	  	>
+	  	  <swiper-item
+	  	    class="swiper-item"
+	  	    v-for="(item2, idx) in shopNotice"
+	  	    :key="idx"
+	  	    @click="goto"
+	  	    :data-url="item2.hrefurl"
+	  	  >
+	  	    <view class="new-cnt">
+	  	      <image class="notice-icon" :src="noticeIcon ? noticeIcon:event_rul + '/static/images/bl/bl-laba.png'"></image>
+	  	      <view class="notice-txt">{{item2.title}}</view>
+	  	    </view>
+	  	  </swiper-item>
+	  	</swiper>
+	  </view>
+      <view class="live-an-t flex al-item-center j-between position-a">
+		<view class="live-an-t-l-r">
+			{{formatSeconds(Number(item.video_duration)) || "00:00"		  }}	    
+		</view>
+        <view class="live-an-t-l flex j-between">
+          <text class="heng1"></text>
+          <text class="heng2"></text>
+          <text class="heng3"></text>
+        </view>
+      </view>
+      <view class="live-s-t position-a flex al-item-center" v-if="item.hasOwnProperty('goods')">
+        <image
+          class="s-t-img"
+          :src="item.goods.propic"
+          mode="aspectFill"
+        ></image>
+        <view class="tx-bx flex1 overflow-hd flex flex-colum j-between">
+          <text class="tx-tl text-overflow-tx">{{ item.goods.proname }}</text>
+         <view class="tx1 flex al-item-center j-between">
+			<view class="flex" style="align-items: baseline;">
+				<text>¥</text>
+				<text class="tx2 font-w">
+				  {{item.goods.prosell_price}}
+				</text>
+			</view>
+			<view class="r-btn border-rius-r text-center">
+				<text class="iconfont icon-arrow-right"></text>
+			</view>
+		  </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+	var app = getApp();
+export default {
+  props: {
+    shopVideo: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+	shopNotice: {
+	  type: Array,
+    default: function() {
+      return [];
+    },
+	},
+	noticeIcon: {
+	  type: String,
+	  default: '',
+	},
+  },
+  data() {
+    return {
+		event_rul: app.globalData.event_url,
+	};
+  },
+  mounted() {},
+  methods: {
+    formatSeconds(time){
+				let newTime,hour,minite,seconds;
+				if(time >= 3600){
+				hour = parseInt(time/3600) < 10 ? '0' + parseInt(time/3600) : parseInt(time/3600);
+				minite = parseInt(time%3600/60) < 10 ? '0' + parseInt(time%3600/60):parseInt(time%3600/60);
+				seconds = time%3600%60 < 10 ? '0' + Math.round(time%3600%60) : Math.round(time%3600%60);
+				newTime = hour + ':' + minite + ':' + seconds;
+				}else if(time >= 60 && time < 3600){
+				minite = parseInt(time/60) < 10 ? '0' + parseInt(time/60) : parseInt(time/60);
+				seconds = time%60 < 10 ? '0' + Math.round(time%60) : Math.round(time%60);
+				newTime = minite + ':' + seconds;  
+				}else if(time < 60 ){
+				seconds = time < 10 ? '0' + Math.round(time) : Math.round(time);
+				newTime = '00:'+ seconds;
+				}
+				return newTime;
+			},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-live {
+  margin-top: 30rpx;
+  .bofang {
+    position: absolute;
+    width: 66rpx;
+	height: 66rpx;
+    left: 50%;
+    top: 50%;
+    transform: translateX(-50%) translateY(-70%);
+  }
+
+  .themes-live-bg {
+    width: 100%;
+    height: 400rpx;
+    border-radius: 12rpx;
+    vertical-align: middle;
+  }
+  .notice {
+	  min-width: 250rpx;
+	  height: 48rpx;
+	  padding: 4rpx 2;
+	  left: 16rpx;
+	  top: 20rpx;
+	  background-color: rgba(0, 0, 0, 0.4);
+	  border-radius: 200rpx;
+	  .swiper-box,.swiper-item {
+	    // width: 100%;
+	    height: 100%;
+	  }
+     .swiper-box {
+		 .swiper-item {
+			 
+		 }
+		 .new-cnt {
+		   height: 100%;
+		   display: flex;
+		   align-items: center;
+		   margin: 0 4rpx;
+		   .notice-icon {
+		     width: 40rpx;
+		     height: 40rpx;
+		     flex-shrink: 0;
+		     margin-right: 12rpx;
+		   }
+		   .notice-txt {
+		     flex: 1;
+		     color: #fff;
+			 font-size: 24rpx;
+		     overflow: hidden;
+		     white-space: nowrap;
+		     text-overflow: ellipsis;
+		   }
+		 }
+	 }
+  }
+  .live-an-t {
+    // width: 102rpx;
+    padding: 4rpx 12rpx;
+    background-color: #93B800;
+    border-radius: 8rpx;
+    color: #fff;
+    left: 16rpx;
+    top: 90rpx;
+    z-index: 3;
+
+    .live-an-t-l {
+      width: 20rpx;
+      height: 18rpx;
+      margin-left: 4rpx;
+      align-items: flex-end;
+
+      .heng1,
+      .heng2,
+      .heng3 {
+        width: 4rpx;
+        border-radius: 6rpx;
+        background-color: #fff;
+      }
+      .heng1 {
+        height: 18rpx;
+        animation: hengos 0.8s linear infinite;
+      }
+      .heng2 {
+        height: 6rpx;
+        animation: hengts 0.8s linear infinite;
+      }
+      .heng3 {
+        height: 18rpx;
+        animation: henghs 0.8s linear 0.2s infinite;
+      }
+    }
+    .live-an-t-l-r {
+      font-size: 20rpx;
+    }
+  }
+
+  .live-s-t {
+    width: 360rpx;
+    height: 140rpx;
+    padding: 6rpx 16rpx;
+    border-radius: 12rpx;
+    background-color: #fff;
+    left: 16rpx;
+    bottom: 12rpx;
+    z-index: 3;
+
+    .s-t-img {
+      width: 86rpx;
+      height: 86rpx;
+      border-radius: 12rpx;
+    }
+
+    .tx-bx {
+      min-height: 108rpx;
+      padding-left: 16rpx;
+      .tx-tl {
+        font-size: 24rpx;
+      }
+      .tx1 {
+        padding-top: 6rpx;
+        font-size: 20rpx;
+      }
+      .tx2 {
+        font-size: 28rpx;
+      }
+	  
+	  .r-btn {
+		  width: 30rpx;
+		  height: 30rpx;
+		  line-height: 30rpx;
+		  background-color: #A1C200;
+		  .icon-arrow-right {
+			  font-size: 20rpx;
+			  color: #fff;
+		  }
+	  }
+    }
+  }
+}
+
+@keyframes hengos {
+  0% {
+    height: 18rpx;
+  }
+  50% {
+    height: 6rpx;
+  }
+  100% {
+    height: 18rpx;
+  }
+}
+@keyframes hengts {
+  0% {
+    height: 6rpx;
+  }
+  50% {
+    height: 18rpx;
+  }
+  100% {
+    height: 6rpx;
+  }
+}
+@keyframes henghs {
+  0% {
+    height: 18rpx;
+  }
+  50% {
+    height: 6rpx;
+  }
+  100% {
+    height: 18rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-note-desc.vue b/pagesA/themes/baiLiTiaoTi/components/themes-note-desc.vue
new file mode 100644
index 0000000..cfbcb2e
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-note-desc.vue
@@ -0,0 +1,140 @@
+<template>
+  <view class="themes-note">
+    <view class="note-til flex flex-colum al-item-center">
+      <text class="tex1">热门笔记</text>
+      <view class="flex flex-colum al-item-center">
+        <text class="tex2">POPULAR NOTES</text>
+        <text class="tex-bg"></text>
+      </view>
+    </view>
+    <view class="themes-note__list">
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="themes-note__item"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <image
+            class="themes-note__item-img"
+            :src="item.pic+'?x-oss-process=image/resize,m_fill,w_167,h_245'"
+            mode="aspectFill"
+          ></image>
+          <view class="themes-note__item-txt">{{ item.title }}</view>
+          <view class="note-c-b flex al-item-center j-between">
+            <view class="note-c-b-l flex al-item-center">
+              <image
+                class="note-u-img border-rius-r"
+                :src="item.headimg"
+                mode="aspectFill"
+              ></image>
+              <text class="text-overflow-tx flex1">{{ item.nickname }}</text>
+            </view>
+            <view class="note-c-b-r flex al-item-center">
+              <text class="iconfont icon-aixin"></text>
+              <!-- <text class="iconfont icon-aixin_shixin" :style="{'color':t('color1')}"></text> -->
+              <text class="z-tx">{{ item.zan }}</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+  margin-top: 30rpx;
+  .note-til {
+    padding-bottom: 30rpx;
+    letter-spacing: 4rpx;
+    .tex1 {
+      font-size: 48rpx;
+      padding-bottom: 10rpx;
+    }
+    .tex2 {
+      z-index: 6;
+      color: #efbd6f;
+    }
+    .tex-bg {
+      height: 12rpx;
+      width: 92%;
+      margin-top: -12rpx;
+      z-index: 2;
+      background: rgba(239, 189, 111, 0.3);
+    }
+  }
+  &__list {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    margin-bottom: -28rpx;
+  }
+  &__item {
+    width: 334rpx;
+    height: 490rpx;
+    padding-bottom: 18rpx;
+    box-sizing: border-box;
+    box-shadow: 0 0 4rpx 1rpx rgba(0, 0, 0, 0.1);
+    border-radius: 6rpx 6rpx 6rpx 6rpx;
+    margin-bottom: 28rpx;
+    &-img {
+      width: 100%;
+      height: 320rpx;
+    }
+    &-txt {
+      padding: 16rpx 16rpx 0rpx;
+      min-height: 92rpx;
+      font-size: 28rpx;
+      color: #333;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+    .note-c-b {
+      margin-top: 10rpx;
+      font-size: 20rpx;
+      color: #999;
+      padding: 0 16rpx;
+      .note-c-b-l {
+        width: 60%;
+        .note-u-img {
+          width: 36rpx;
+          height: 36rpx;
+          border-radius: 50%;
+          margin-right: 16rpx;
+        }
+      }
+      .note-c-b-r {
+        .icon-aixin {
+          font-size: 24rpx;
+        }
+        .icon-aixin_shixin {
+          font-size: 24rpx;
+        }
+        .z-tx {
+          padding-left: 10rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-note.vue b/pagesA/themes/baiLiTiaoTi/components/themes-note.vue
new file mode 100644
index 0000000..8903486
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-note.vue
@@ -0,0 +1,179 @@
+<template>
+  <view class="themes-note">
+    <!-- <themes-chunk-title title="热门笔记" :iconSrc="event_rul + '/static/theme/note-icon.svg'"></themes-chunk-title> -->
+	<view class="title flex j-center">
+		<view class="flex">
+			<image class="t-bg-l" :src="event_rul + '/static/images/bl/bl-ttr.png'" mode="widthFix"></image>
+			<text class="t-bg-c font-w"  mode="widthFix">热门笔记</text>
+			<image class="t-bg-r" :src="event_rul + '/static/images/bl/bl-ttl.png'" mode="widthFix"></image>
+		</view>
+	</view>
+    <scroll-view
+      class="scroll-list"
+      :scroll-x="true"
+    >
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="scroll-list-item overflow-hd"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <view class="scroll-list-item-ct flex flex-colum overflow-hd">
+            <view class="note-s overflow-hd position-r">
+              <image class="note-img" :src="item.pic+'?x-oss-process=image/resize,m_fill,w_120,h_115'" mode="aspectFill"></image>
+            </view>
+            <view class="note-b-cnt flex flex1 flex-colum j-between">
+              <text class="note-title text-overflow-line font-w">{{
+                item.title
+              }}</text>
+              <view class="note-c-b flex al-item-center j-between">
+                <view class="note-c-b-l flex al-item-center">
+                  <image
+                    class="note-u-img border-rius-r"
+                    :src="item.headimg"
+                    mode="aspectFill"
+                  ></image>
+                  <text class="text-overflow-tx flex1">{{
+                    item.nickname
+                  }}</text>
+                </view>
+                <view class="note-c-b-r flex al-item-center">
+                  <text class="iconfont icon-aixin"></text>
+                  <text class="z-tx">{{ item.zan ? (item.zan >= 10000 ? (item.zan / 10000).toFixed(1) + '万': item.zan) : 0 }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import themesChunkTitle from './themes-chunk-title.vue'
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitle
+  },
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+	
+	.title {
+		padding: 34rpx 0 24rpx;
+		.t-bg-l{
+			width: 60rpx;
+			margin: 10rpx 4rpx 0 0;
+		}
+		.t-bg-c {
+			font-style: italic;
+			font-size: 36rpx;
+			color: #8DB400;
+			letter-spacing: 2px;
+		}
+		.t-bg-r {
+			width: 60rpx;
+			margin: 10rpx 0 0 10rpx;
+		}
+	}
+  .scroll-list {
+    position: relative;
+    width: calc(100% + 28rpx);
+    right: -28rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+
+    .scroll-list-item {
+      display: inline-block;
+      margin-right: 20rpx;
+      background-color: #fff;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 20rpx;
+      &:last-child {
+        margin-right: 28rpx;
+      }
+
+      .scroll-list-item-ct {
+        width: 320rpx;
+        height: 536rpx;
+
+        .note-s {
+          width: 100%;
+          height: 376rpx;
+
+          .note-img {
+            width: 100%;
+            height: 100%;
+          }
+
+          .note-hot {
+            left: 16rpx;
+            top: 14rpx;
+            line-height: 34rpx;
+
+            .note-hot-img {
+              width: 110rpx;
+              height: 34rpx;
+            }
+            .note-hot-tx {
+              font-size: 20rpx;
+            }
+          }
+        }
+
+        .note-b-cnt {
+          width: 100%;
+          padding: 22rpx 16rpx 20rpx;
+          white-space: normal;
+          .note-title {
+          }
+
+          .note-c-b {
+            font-size: 28rpx;
+            color: #999;
+            .note-c-b-l {
+              width: 60%;
+              .note-u-img {
+                width: 36rpx;
+                height: 36rpx;
+                margin-right: 10rpx;
+              }
+            }
+            .note-c-b-r {
+              .icon-aixin {
+                font-size: 28rpx;
+              }
+              .icon-aixin_shixin {
+                font-size: 28rpx;
+              }
+              .z-tx {
+                padding-left: 6rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-recommend.vue b/pagesA/themes/baiLiTiaoTi/components/themes-recommend.vue
new file mode 100644
index 0000000..5fb73ec
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-recommend.vue
@@ -0,0 +1,204 @@
+<template>
+  <view class="themes-recommend">
+	  <view class="title flex j-center">
+	  	<view class="flex">
+	  		<image class="t-bg-l" :src="event_rul + '/static/images/bl/bl-ttr.png'" mode="widthFix"></image>
+	  		<text class="t-bg-c font-w"  mode="widthFix">精选商品</text>
+	  		<image class="t-bg-r" :src="event_rul + '/static/images/bl/bl-ttl.png'" mode="widthFix"></image>
+	  	</view>
+	  </view>
+    <block
+      class="themes-recommend__list"
+      v-for="(item, idx) in shopProduct"
+      :key="idx"
+    >
+      <view
+        class="themes-recommend__item"
+        @click="goto"
+        :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+      >
+        <text class="themes-recommend__item-tab">抢鲜价</text>
+        <view class="themes-recommend__item-hd">
+          <image
+            class="themes-recommend__item-img"
+            :src="item.pic"
+            mode="aspectFill"
+          ></image>
+        </view>
+        <view class="themes-recommend__item-bd">
+          <view class="themes-recommend__item-title">{{ item.name }}</view>
+          <view class="themes-recommend__item-price">
+            <text class="themes-recommend__item-symbol">¥</text>
+            <text class="themes-recommend__item-num">{{ item.sell_price }}</text>
+          </view>
+          <view
+            class="themes-recommend__item-btn"
+            @click.stop="buydialogChange"
+            :data-proid="item.proid"
+            >立即抢购</view
+          >
+        </view>
+      </view>
+    </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+	var app = getApp();
+export default {
+  props: {
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    menuindex: {
+      default: -1,
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+	   event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {
+    // console.log(this.shopProduct)
+  },
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-recommend {
+	.title {
+		padding: 34rpx 0 0;
+		.t-bg-l{
+			width: 60rpx;
+			margin: 10rpx 4rpx 0 0;
+		}
+		.t-bg-c {
+			font-style: italic;
+			font-size: 36rpx;
+			color: #8DB400;
+			letter-spacing: 2px;
+		}
+		.t-bg-r {
+			width: 60rpx;
+			margin: 10rpx 0 0 10rpx;
+		}
+	}
+  &__list {
+    border-radius: 10rpx;
+    overflow: hidden;
+    &:not(last-child) {
+      margin-top: 28rpx;
+    }
+  }
+  &__item {
+    display: flex;
+    position: relative;
+    height: 296rpx;
+    margin-top: 28rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.03);
+    border-radius: 20rpx;
+    padding: 40rpx 28rpx 0 30rpx;
+    &-tab {
+	  width: 64rpx;
+	  height: 100rpx;
+      position: absolute;
+      top: 0;
+      left: 20rpx;
+      background: linear-gradient(180deg, #DF0000  0%, #C60000  100%);
+      border-radius: 0 0 28rpx 28rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      // line-height: 40rpx;
+	  writing-mode: vertical-lr;
+	  writing-mode: tb-lr;
+	  text-align: center;
+	  line-height: 64rpx;
+	  letter-spacing: 2px;
+      // padding: 0 18rpx;
+      z-index: 1;
+    }
+    &-hd {
+      width: 242rpx;
+      height: 242rpx;
+      flex-shrink: 0;
+    }
+    &-img {
+      width: 100%;
+      height: 100%;
+    }
+    &-bd {
+      flex: 1;
+      padding: 0 0 40rpx 36rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+    &-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 3;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+
+    }
+    &-price {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #CE0000;
+      line-height: 50rpx;
+    }
+    &-symbol {
+      font-size: 24rpx;
+      line-height: 34rpx;
+      margin-right: 6rpx;
+    }
+    &-btn {
+      position: absolute;
+      bottom: 40rpx;
+      right: 28rpx;
+      background: linear-gradient(150deg, #AECB00 0%, #8DB400 100%);
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 50rpx;
+      border-radius: 25rpx;
+      padding: 0 22rpx;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-shop.vue b/pagesA/themes/baiLiTiaoTi/components/themes-shop.vue
new file mode 100644
index 0000000..b4cd508
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-shop.vue
@@ -0,0 +1,168 @@
+<template>
+  <view class="themes-shops">
+		<!-- <themes-chunk-title v-if="isShowTitle" title="精选商品" :iconSrc="event_rul + '/static/theme/choiceness-icon.svg'" tengtx="group purchase"></themes-chunk-title> -->
+    <view class="shops-box">
+      <view class="flex flex-w shop-item">
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-cont bg-color-white overflow-hd"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-cont__hd flex j-center al-item-center">
+              <image
+                class="shops-img"
+                :src="item.pic"
+                mode="widthFix"
+              ></image>
+            </view>
+            <view class="item-info">
+              <view class="shops-c-t text-overflow-line">{{ item.name }}</view>
+              <view class="shops-b-t flex al-item-center j-between">
+                <view class="item-info__price">
+                  <text class="b-t1 flex al-item-center"
+                    >¥<text class="b-t2 font-w">{{ item.sell_price }}</text>
+                  </text>
+                  <view class="shops-s-t">已售 {{ item.sales ? (item.sales >= 10000 ? (item.sales / 10000).toFixed(1) + '万': item.sales) : 0 }}</view>
+                </view>
+                <view
+                  class="car flex border-rius-r al-item-center j-center"
+                  @click.stop="buydialogChange"
+                  :data-proid="item.proid"
+                >
+                  <text class="iconfont icon-gouwuche1"></text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+import themesChunkTitle from './themes-chunk-title.vue';
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitle
+  },
+  props: {
+    isShowTitle: { type: Boolean, default: false },
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-shops {
+  padding: 22rpx 0 20rpx;
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    width: 49%;
+    border-radius: 12rpx;
+    box-sizing: border-box;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+    border-radius: 20rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &__hd {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+    }
+
+    .shops-img {
+      width: 100%rpx;
+      height: 260rpx;
+    }
+    .item-info {
+      padding: 24rpx 20rpx;
+      width: 100%;
+    }
+    .shops-c-t {
+      min-height: 72rpx;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+    }
+    .shops-s-t {
+      display: flex;
+      align-items: center;
+      margin-top: 2rpx;
+      font-size: 18rpx;
+      color: #999999;
+      line-height: 22rpx;
+    }
+    .shops-b-t {
+      padding-top: 28rpx;
+
+      .b-t1 {
+        color: #CE0000;
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 36rpx;
+        margin-left: 6rpx;
+      }
+      .car {
+        width: 54rpx;
+        height: 54rpx;
+        background: #9FC100;
+
+        .icon-gouwuche1 {
+          color: #fff;
+          font-size: 36rpx;
+          line-height: 44rpx;
+          height: 48rpx;
+        }
+      }
+    }
+  }
+  .shops-cont:nth-child(2n) {
+    // margin-left: calc(100% - 680rpx);
+    margin-left: 2%;
+  }
+  .shops-cont:nth-child(n + 3) {
+    margin-top: 20rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-tuangou-item.vue b/pagesA/themes/baiLiTiaoTi/components/themes-tuangou-item.vue
new file mode 100644
index 0000000..3746ade
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-tuangou-item.vue
@@ -0,0 +1,216 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:48%;margin-right:'+(index%2==0?'4%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" >
+			<view class="" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+				<view class="product-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+					<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+				</view>
+				<view class="product-info">
+					<view class="p1" v-if="showname == 1">{{item.name}}</view>
+					<view class="p2">
+						<view class="p2-1" v-if="showprice != '0'">
+							<text class="t1" :style="{color:'#CE0000'}"><text style="font-size:24rpx">低至￥</text>{{item.min_price}}</text>
+							<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+						</view>
+					</view>
+					<view class="p3" v-if="showsales=='1' && item.sales>0">已售{{item.sales}}件</view>
+					<view class="p4 flex border-rius-r al-item-center j-center" :style="{background:'#9DBF00'}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon-gouwuche1"></text></view>
+					<view class="p4" :style="{background:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+				</view>
+			</view>
+			<view class="overdue" v-if="item.endtime < timestamp">
+				<view class="overdue-box position-a">
+					<image class="overdue-img" :src="event_rul + '/static/images/bl/矩形@2x.png'" mode="widthFix"></image>
+					<text class="tex">活动已结束</text>
+				</view>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 0,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  props: {
+    showstyle: { default: 2 },
+    menuindex: { default: -1 },
+    saleimg: { default: "" },
+    showname: { default: 1 },
+    namecolor: { default: "#333" },
+    showprice: { default: "1" },
+    showsales: { default: "1" },
+    showcart: { default: "1" },
+	timestamp:{ default: 0 },
+    cartimg: {
+      default: app.globalData.event_url + "/static/img/static/imgsrc/cart.svg",
+    },
+    data: {},
+    idfield: { default: "id" },
+  },
+  methods: {
+    buydialogChange: function (e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+      console.log(this.buydialogShow);
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.dp-tuangou-item {
+  height: auto;
+  position: relative;
+  overflow: hidden;
+  padding: 0rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 30rpx;
+}
+.dp-tuangou-item .item {
+  display: inline-block;
+  position: relative;
+  margin-bottom: 12rpx;
+  background: #fff;
+  border-radius: 10rpx;
+  overflow: hidden;
+  // border: 1rpx solid rgba(0, 0, 0, 0.08);
+  box-shadow: 0rpx 4rpx 4rpx 0rpx rgba(0,0,0,0.0300);
+}
+.dp-tuangou-item .product-pic {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  background: #ffffff;
+  padding-bottom: 100%;
+  position: relative;
+}
+.dp-tuangou-item .product-pic .image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: auto;
+}
+.dp-tuangou-item .product-pic .saleimg {
+  position: absolute;
+  width: 60px;
+  height: auto;
+  top: -3px;
+  left: -3px;
+}
+.dp-tuangou-item .product-info {
+  padding: 20rpx 20rpx;
+  position: relative;
+}
+.dp-tuangou-item .product-info .p1 {
+  color: #323232;
+  font-weight: bold;
+  font-size: 26rpx;
+  line-height: 36rpx;
+  margin-bottom: 10rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  height: 72rpx;
+}
+.dp-tuangou-item .product-info .p2 {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  padding: 2px 0;
+}
+.dp-tuangou-item .product-info .p2-1 {
+  flex-grow: 1;
+  flex-shrink: 1;
+  height: 40rpx;
+  line-height: 40rpx;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.dp-tuangou-item .product-info .p2-1 .t1 {
+  font-size: 36rpx;
+  color: #efbd6f;
+}
+.dp-tuangou-item .product-info .p2-1 .t2 {
+  margin-left: 10rpx;
+  font-size: 24rpx;
+  color: #aaa;
+  text-decoration: line-through; /*letter-spacing:-1px*/
+}
+.dp-tuangou-item .product-info .p2-2 {
+  font-size: 20rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: right;
+  padding-left: 20rpx;
+  color: #999;
+}
+.dp-tuangou-item .product-info .p3 {
+  color: #999999;
+  font-size: 20rpx;
+  margin-top: 10rpx;
+}
+.dp-tuangou-item .product-info .p4 {
+  color: #fff;
+  width: 54rpx;
+  height: 54rpx;
+  border-radius: 50%;
+  position: absolute;
+  display: relative;
+  bottom: 20rpx;
+  right: 20rpx;
+  text-align: center;
+}
+.dp-tuangou-item .product-info .p4 .icon-gouwuche1 {
+  font-size: 36rpx;
+  height: 48rpx;
+  line-height: 44rpx;
+}
+.dp-tuangou-item .product-info .p4 .img {
+  width: 100%;
+  height: 100%;
+}
+.overdue {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, .2);
+	.overdue-box {
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.overdue-img {
+		width: 202rpx;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.tex {
+		transform: rotate(-15deg);
+		display: block;
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #A4150B;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-tuangou.vue b/pagesA/themes/baiLiTiaoTi/components/themes-tuangou.vue
new file mode 100644
index 0000000..36a9e77
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-tuangou.vue
@@ -0,0 +1,160 @@
+<template>
+	<view class="themes-miao-s bg-color-white position-r" :class="top ? 'mg-top': 'mg-top'">
+		<!-- <themes-chunk-title title="团购活动" :iconSrc="event_rul + '/static/theme/avtivity-icon.svg'" tengtx="group purchase"></themes-chunk-title> -->
+		<view class="con-title position-a">
+			<image class="t-bg" :src="event_rul + '/static/images/bl/bl-tgtt.png'" mode="widthFix"></image>
+			<text class="t-tex color-white position-a">团购活动</text>
+		</view>
+		<scroll-view :scroll-x="true" class="miao-cont">
+			<block v-for="item in shopTuangou" :key="item.id">
+				<view class="miao-cont__item al-item-center flex-colum j-between" @click="goto"
+				:data-url="'/activity/tuangou/product?id=' + item.proid">
+					<image class="miao-cont__item-img" :src="item.pic" mode="aspectFill"></image>
+					<view class="miao-cont__item-title">{{ item.name }}</view>
+					<view class="miao-cont__item-bottom">
+						<view class="miao-cont__item-price">
+							<view class="miao-cont__item-current"><text class="price-symbol">低至¥</text><text>{{ item.min_price }}</text></view>
+							<view class="miao-cont__item-original"><text class="price-symbol">¥</text><text>{{ item.sell_price }}</text></view>
+						</view>
+						<text class="iconfont icon-jiahao"></text>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	
+	var app = getApp();
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopTuangou: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+			top: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data(){
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+
+	.themes-miao-s {
+		width: 100%;
+		margin-top: 28rpx;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 20rpx 0 30rpx 30rpx;
+		
+		.con-title {
+			top: -40rpx;
+			left: 50%;
+			transform:  translateX(-50%);
+			z-index: 3;
+			.t-bg {
+				width: 340rpx;
+				vertical-align: middle;
+			}
+			.t-tex {
+				font-size: 36rpx;
+				top: 50%;
+				left: 50%;
+				transform:  translate(-50%, -50%);
+			}
+		}
+		.miao-cont {
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			&__item {
+				width: 260rpx;
+				flex-shrink: 0;
+				margin-right: 40rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				display: inline-flex;
+				&:last-child {
+					margin-right: 22rpx;
+				}
+				&-img {
+					width: 156rpx;
+					height: 156rpx;
+					margin-bottom: 16rpx;
+				}
+				&-title {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 36rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					/* autoprefixer: ignore next */
+					-webkit-box-orient: vertical;
+					text-align: justify;
+					white-space: pre-wrap;
+					word-break: break-all;
+
+				}
+				&-bottom {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-top: 4rpx;
+				}
+				&-price {
+					display: flex;
+					align-items: flex-end;
+				}
+				&-current {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #CE0000;
+					line-height: 50rpx;
+					.price-symbol {
+						font-size: 22rpx;
+						line-height: 32rpx;
+						margin-right: 4rpx;
+					}
+				}
+				&-original {
+					margin: 0 0 6rpx 4rpx;
+					font-size: 20rpx;
+					font-weight: 500;
+					color: #999999;
+					line-height: 28rpx;
+					text-decoration: line-through;
+				}
+				.icon-jiahao {
+					font-size: 46rpx;
+					color: #9DBF00;
+				}
+			}
+		}
+	}
+	.mg-top {
+		margin-top: 66rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/components/themes-vip.vue b/pagesA/themes/baiLiTiaoTi/components/themes-vip.vue
new file mode 100644
index 0000000..42ef9fd
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/components/themes-vip.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="head-new-vu flex al-item-center">
+    <swiper
+      class="swiper-box"
+      vertical="true"
+      autoplay="true"
+      circular="true"
+      :indicator-dots="false"
+      :auto-play="true"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopNotice"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <view class="new-cnt">
+          <image class="notice-icon" :src="noticeIcon ? noticeIcon:event_rul + '/static/theme/note-icon.svg'"></image>
+          <view class="notice-txt">{{ item.title }}</view>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  props: {
+    noticeIcon: {
+      type: String,
+      default: '',
+    },
+    shopNotice: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.head-new-vu {
+  width: 100%;
+  height: 90rpx;
+  margin-top: 30rpx;
+  border-radius: 12rpx;
+  background: rgba(255,255,255,0.3);
+  border: 1rpx solid #FFF;
+  .swiper-box,.swiper-item {
+    width: 100%;
+    height: 100%;
+  }
+
+  .new-cnt {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    margin: 0 20rpx;
+    .notice-icon {
+      width: 50rpx;
+      height: 50rpx;
+      flex-shrink: 0;
+      margin-right: 12rpx;
+    }
+    .notice-txt {
+      flex: 1;
+      color: #333;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/goods.vue b/pagesA/themes/baiLiTiaoTi/goods.vue
new file mode 100644
index 0000000..c51cbe7
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/goods.vue
@@ -0,0 +1,120 @@
+<template>
+  <view class="themes-goods position-a"
+        :style="{ height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view :class="{'themes-goods__content' : !nodata}">
+      <view class="nav-list flex j-between al-item-center">
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="!field || field == 'sort' ? 'color:#D11800' : ''"
+          data-field="sort"
+          data-order="desc"
+          >推荐</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'sales' ? 'color:#D11800' : ''"
+          data-field="sales"
+          data-order="desc"
+          >销量</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'createtime' ? 'color:#D11800' : ''"
+          data-field="createtime"
+          data-order="desc"
+          >新品</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          data-field="sell_price"
+          :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+          <text :style="field == 'sell_price' ? 'color:#D11800' : ''"
+            >价格</text
+          >
+          <text
+            style="font-size: 26rpx"
+            class="iconfont icon-danbianjiantou1"
+            :style="{
+              color: field == 'sell_price' && order == 'asc' ? '#D11800' : '',
+            }"
+          ></text>
+          <text
+            style="font-size: 26rpx; margin-left: -10rpx"
+            class="iconfont icon-danbianjiantou"
+            :style="{
+              color: field == 'sell_price' && order == 'desc' ? '#D11800' : '',
+            }"
+          ></text>
+        </view>
+      </view>
+      <scroll-view
+        class="scroll-list"
+        :scroll-y="true"
+        v-if="shopSelPro && shopSelPro.length > 0"
+      >
+        <themes-shop
+          :mgtop="0"
+          :mgright="30"
+          :mgleft="30"
+          :mgbottom="2"
+          :shopProduct="shopSelPro"
+        ></themes-shop>
+        <nomore v-if="nomore"></nomore>
+      </scroll-view>
+    </view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/goods.js";
+import themesHead from "./components/themes-head.vue";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-goods {
+  background: #F4F4F4;
+  left: 0;
+  right: 0;
+  border-radius: 20rpx 20rpx 0 0;
+  display: flex;
+  flex-direction: column;
+}
+.themes-goods__content {
+	height: 100%;
+}
+.nav-list {
+  height: 80rpx;
+  padding: 28rpx 30rpx 12rpx;
+
+  .selec {
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  height: calc(100% - 80rpx);
+  padding: 0 28rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/index.vue b/pagesA/themes/baiLiTiaoTi/index.vue
new file mode 100644
index 0000000..3178c50
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/index.vue
@@ -0,0 +1,85 @@
+<template>
+  <view class="themes-default" :class="bgColor ? '' : 'bgthem'">
+    <image
+      class="themes-default__img"
+      :src="shopData.bgimg
+          ? shopData.bgimg
+          : event_rul + '/static/images/df-bg.png'
+      "
+	  mode="widthFix"
+    ></image>
+    <!-- 头部 -->
+    <themes-head
+      :navHeight="navHeight"
+      @navselect="navHeadSelect"
+      :navList="navList"
+      :navIndex="navIndex"
+      :shopData="shopData"
+    ></themes-head>
+    <view class="themes-content position-r" :class="bgColor ? 'bgthem' : ''">
+	  <view class="top-mg"></view>
+      <Choiceness v-if="tabArr.indexOf(0) > -1" v-show="navIndex === 0"></Choiceness>
+      <Goods v-if="tabArr.indexOf(1) > -1" v-show="navIndex === 1" :hearHeight="hearHeight"></Goods>
+      <Activity v-if="tabArr.indexOf(2) > -1" v-show="navIndex === 2" :hearHeight="hearHeight"></Activity>
+      <new-product v-if="tabArr.indexOf(3) > -1" v-show="navIndex === 3" :hearHeight="hearHeight"></new-product>
+    </view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/index.js";
+import themesHead from "./components/themes-head.vue";
+import Choiceness from "./choiceness.vue";
+import Activity from "./activity.vue";
+import newProduct from "./newProduct.vue";
+import Goods from "./goods.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    Choiceness,
+    Activity,
+    newProduct,
+    Goods,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-default {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #FAF8F8;
+  position: relative;
+  z-index: 1;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    // height: 1020rpx;
+  }
+}
+.themes-content {
+  flex: 1;
+  z-index: 2;
+  padding: 0 28rpx 40rpx;
+  // margin-top: 24rpx;
+  
+  .top-mg {
+	  width: 100%;
+	  height: 24rpx;
+  }
+}
+
+.bgthem {
+	background-color: #E9E7C7;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/newProduct.vue b/pagesA/themes/baiLiTiaoTi/newProduct.vue
new file mode 100644
index 0000000..c8ae570
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/newProduct.vue
@@ -0,0 +1,56 @@
+<template>
+  <view class="themes-newProduct position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <scroll-view
+      class="scroll-list"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopProduct && shopProduct.length > 0"
+    >
+      <themes-shop
+        :mgtop="0"
+        :mgright="30"
+        :mgleft="30"
+        :mgbottom="2"
+        :shopProduct="shopProduct"
+      ></themes-shop>
+      <nomore v-if="nomore"></nomore>
+    </scroll-view>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/newProduct.js";
+import themesHead from "./components/themes-head.vue";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesShop,
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-newProduct {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #F4F4F4;
+  padding: 0 28rpx 0;
+  border-radius: 20rpx 20rpx 0 0;
+  left: 0;
+  right: 0;
+}
+.scroll-list {
+  height: 100%;
+  overflow-y: scroll;
+  // padding-bottom: 40rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/baiLiTiaoTi/shop-detail.vue b/pagesA/themes/baiLiTiaoTi/shop-detail.vue
new file mode 100644
index 0000000..f39b0a9
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/shop-detail.vue
@@ -0,0 +1,353 @@
+<template>
+  <view class="store-detail">
+    <view v-if="!loading">
+		<view class="flex">
+			<image class="img-logo" :src="info.logo" mode="aspectFill"></image>
+		</view>
+		<view class="detail-contetn">
+			<view class="content-h border-btm flex al-item-center">
+				<view class="h-l">
+					<view class="title">{{ info.name }}</view>
+					<view class="text-n fs12">{{ followCount || 0 }}人关注</view>
+				</view>
+				<view class="su"></view>
+				<view class="h-r flex ">
+					<view class="h-r__info flex flex-colum al-item-center" @click="followFn">
+						<!-- <image class="follow-icon" v-if="!shopInfo.isFollow" :src="event_rul + '/static/theme/follow-icon.svg'" mode="widthFix"></image> -->
+						<text class="iconfont" :class="{'isFollow icon-aixin_shixin': info.isFollow, 'icon-aixin': !info.isFollow}" style="font-size: 44rpx;color: #CE0000;"></text>
+						<text class="follow-tx fs12">{{info.isFollow ? "已关注" : "关注"}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.content">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-themes-coupon"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">店铺简介</view>
+					<view class="text fs12">{{ info.content }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.address">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-location"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">店铺地址</view>
+					<view class="text fs12">{{ info.address }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.createtime">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-rilitianchong"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">开店时间</view>
+					<view class="text fs12">{{ info.createtime }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.start_hours || info.end_hours">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-clock"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">营业时间</view>
+					<view class="text fs12">{{ info.start_hours || "" }}-{{ info.end_hours || "" }}</view>
+				</view>
+			</view>
+			<view class="content-t  flex al-item-center" v-show="info.tel">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-phone"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">联系电话</view>
+					<view class="text fs12">{{ info.tel }}</view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" @tap="goback">去看看全部商品</button>
+    </view>
+    <loading v-else></loading>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      info: {},
+      loading: false,
+	  event_rul: app.globalData.event_url,
+	  followCount: 0,
+    shopData: uni.getStorageSync('header_data') || {}, 
+    };
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  created() {
+    this.loading = true;
+  },
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    goback() {
+      uni.navigateBack(1);
+    },
+    followFn() {
+      var that = this;
+
+      // 暂时写死follow_id：27，正确为 follow_id: that.opt.bid
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.opt.bid || "", type: "store" },
+        function (res) {
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo()
+          setTimeout(() => {
+            that.$set(that.shopData,'attention',that.info.fans_count);
+            that.$set(that.shopData,'isFollow',that.info.isFollow);
+            uni.setStorage({
+              key: "header_data",
+              data: that.shopData,
+            });
+          }, 200);
+        }
+      );
+    },
+	// 获取详情信息
+    getInfo() {
+      var that = this;
+      // 暂时写死id: 27,正确为 id: that.opt.bid
+      app.get(
+        "ApiBusiness/newIndex",
+        { id: that.opt.bid || "" },
+        function (res) {
+          that.info = res.business;
+		  that.followCount = res.followCount
+          that.loading = false;
+        }
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.store-detail {
+  letter-spacing: 2rpx;
+  color: #333;
+  
+  .img-logo {
+	  width: 100%;
+	  height: 400rpx;
+  }
+  .detail-contetn {
+	  padding: 0 40rpx;
+	  background-color: #fff;
+	  .content-h {
+		  padding: 28rpx 0;
+		  
+		  .h-l {
+			  width: 452rpx;
+			  padding-right: 10rpx;
+			 .title {
+				 font-weight: 500;
+			 	 font-size: 34rpx;
+			 }
+			 .text-n {
+			 	padding-top: 14rpx;
+				color: #666;
+				font-weight: 400;
+			 } 
+		  }
+		  .su {
+			  width: 2rpx;
+			  height: 56rpx;
+			  background-color: #CE0000;
+		  }
+		  .h-r {
+			  width: 180rpx;
+			  justify-content: flex-end;
+        &__info {
+          width: 80rpx;
+        }
+        .icon-aixin {
+          color: #666666;
+          &.isFollow {
+            color: #CE0000;
+          }
+        }
+			  
+			  .follow-icon {
+			    width: 44rpx;
+			  }
+			  .follow-tx {
+				  color: #666;
+			  }
+		  }
+	  }
+	  
+	  .content-t {
+		  padding: 20rpx 0;
+		  
+		  .iocns {
+			  font-size: 40rpx;
+			  color: #CE0000;
+		  }
+		  .t-img {
+			  width: 40rpx;
+		  }
+		  
+		  .title {
+			font-weight: 500;
+		  }
+		  .text {
+			  font-weight: 500;
+			  padding-top: 8rpx;
+			  color: #666;
+		  }
+	  }
+  }
+  .btn {
+    font-size: 36rpx;
+    // font-weight: bold;
+    width: 630rpx;
+    margin: 90rpx auto;
+    border-radius: 400rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-image: linear-gradient(to right, #AECB00, #8DB400);
+    color: #fff;
+  }
+  .border-btm {
+	  border-bottom: 2rpx solid #ECECEC;
+  }
+  
+  // .attention {
+  //   padding: 30rpx 20rpx;
+
+  //   .attention-box {
+  //     padding: 30rpx 20rpx;
+  //     background: #fff;
+  //     display: flex;
+  //     align-items: center;
+  //     justify-content: space-between;
+  //     box-sizing: border-box;
+  //     border-radius: 10rpx;
+
+  //     .attention-l {
+  //       display: flex;
+  //       align-items: center;
+
+  //       .attention-l-img {
+  //         width: 120rpx;
+  //         height: 120rpx;
+  //         border-radius: 16rpx;
+  //         flex-shrink: 0;
+  //       }
+  //       .attention-l-text {
+  //         height: 100%;
+  //         padding-left: 20rpx;
+  //         display: flex;
+  //         flex-direction: column;
+  //         .attention-l-title {
+  //           font-size: 30rpx;
+  //           font-weight: bold;
+  //         }
+  //         .attention-l-text-s {
+  //           padding-top: 10rpx;
+  //           display: flex;
+  //           align-items: center;
+  //           font-size: 24rpx;
+  //           color: #bdbdbd;
+
+  //           .icon_arrow_right {
+  //             padding-left: 20rpx;
+  //           }
+  //         }
+  //       }
+  //     }
+  //     .attention-r {
+  //       width: 120rpx;
+  //       height: 54rpx;
+  //       line-height: 54rpx;
+  //       text-align: center;
+  //       flex-shrink: 0;
+  //       border-radius: 8rpx;
+  //       &.isFollow {
+  //         background-color: #efbd6f;
+  //         color: #FFF;
+  //       }
+  //       &.followed {
+  //         color: #efbd6f;
+  //         position: relative;
+  //         &::before {
+  //           content: "";
+  //             position: absolute;
+  //             left: 0;
+  //             width: 200%;
+  //             height: 200%;
+  //             border: 2rpx solid #efbd6f;
+  //             box-sizing: border-box;
+  //             transform: scale(0.5,0.5);
+  //             border-radius: 16rpx;
+  //             transform-origin: 0 0;
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
+
+  // .store-detail-conten {
+  //   padding: 0 20rpx;
+  //   .detail-conten-b {
+  //     display: flex;
+  //     flex-direction: column;
+  //     border-radius: 10rpx;
+  //     background-color: #fff;
+
+  //     .detail-conten-c {
+  //       min-height: 400rpx;
+  //       padding: 0 20rpx;
+  //       display: flex;
+  //       flex-direction: column;
+  //       justify-content: space-evenly;
+  //     }
+  //     .detail-conten-t {
+  //       display: flex;
+  //       // align-items: center;
+  //       .detail-conten-t-tilt {
+  //         width: 150rpx;
+  //         font-weight: bold;
+  //         font-size: 30rpx;
+  //       }
+
+  //       .detail-conten-t-text {
+  //         flex: 1;
+  //         // color: #bdbdbd;
+  //         padding-top: 4rpx;
+  //         // font-weight: bold;
+  //         color: #111111;
+  //       }
+  //     }
+
+  //     .btn {
+  //       font-size: 30rpx;
+  //       font-weight: bold;
+  //       width: 650rpx;
+  //       margin: 30rpx auto;
+  //       border-radius: 400rpx;
+  //       height: 70rpx;
+  //       display: flex;
+  //       justify-content: center;
+  //       align-items: center;
+  //       background-image: linear-gradient(to right, #fbd89e, #eec071);
+  //       color: #fff;
+  //     }
+  //   }
+  // }
+}
+</style>
diff --git a/pagesA/themes/baiLiTiaoTi/themes-search.vue b/pagesA/themes/baiLiTiaoTi/themes-search.vue
new file mode 100644
index 0000000..858a46b
--- /dev/null
+++ b/pagesA/themes/baiLiTiaoTi/themes-search.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="themes-search">
+		<view class="search-head">
+			<view class="head-b flex al-item-center border-rius-r">
+				<text class="iconfont icon-search"></text>
+				<input v-model="keyword" placeholder="商品搜索" placeholder-style="font-size:28rpx;" @confirm="searchConfirm" />
+        <text class="iconfont icon-shanchu" @click="delKeywordtex"></text>
+			</view>
+		</view>
+		<view class="search-content">
+			<view class="nav-list flex j-between al-item-center">
+				<view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="!field || field == 'sort' ? 'color: #D11800' : ''"
+            data-field="sort"
+            data-order="desc"
+            >推荐</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'sales' ? 'color: #D11800' : ''"
+            data-field="sales"
+            data-order="desc"
+            >销量</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'createtime' ? 'color: #D11800' : ''"
+            data-field="createtime"
+            data-order="desc"
+            >新品</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            data-field="sell_price"
+            :data-order="order == 'asc' ? 'desc' : 'asc'"
+          >
+            <text :style="field == 'sell_price' ? 'color: #D11800' : ''"
+              >价格</text
+            >
+            <text
+              style="font-size: 26rpx"
+              class="iconfont icon-danbianjiantou1"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'asc' ? '#D11800' : '',
+              }"
+            ></text>
+            <text
+              style="font-size: 26rpx; margin-left: -10rpx"
+              class="iconfont icon-danbianjiantou"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'desc' ? '#D11800' : '',
+              }"
+            ></text>
+          </view>
+			</view>
+		</view>
+		<scroll-view class="scroll-list lise-h" :scroll-y="true" @scrolltolower="getmorecomment" >
+			<themes-shop :shopProduct="shopProduct" :mgtop="0" :mgright="30" :mgleft="30" :mgbottom="2"></themes-shop>
+		<loading v-if="loading"></loading>
+        <nomore v-if="nomore"></nomore>
+        <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+		</scroll-view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+import { myMixin } from '../logic/search.js';
+import themesShop from "../default/components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss">
+.themes-search {
+  height: 100vh;
+  overflow-y: hidden;
+  display: flex;
+  flex-direction: column;
+  background: #F4F4F4;
+  ::v-deep .classify-shops {
+    .shops-item {
+      padding: 24rpx 40rpx 12rpx 20rpx;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 10rpx;
+      border-bottom: 0;
+      margin-bottom: 20rpx;
+    }
+  }
+  .search-head {
+    width: 100%;
+    height: 74rpx;
+    padding: 10rpx 28rpx 0;
+    flex-shrink: 0;
+    background: #FFF;
+    .head-b {
+      width: 100%;
+      height: 100%;
+      padding: 0 12rpx;
+      background-color: #F7F7F7;
+
+      .icon-search {
+        color: #ABABAB;
+        font-size: 50rpx;
+        flex-shrink: 0;
+      }
+      input {
+        flex: 1;
+        font-size: 28rpx;
+        line-height: 40rpx;
+        margin-left: 14rpx;
+        color: #333333;
+      }
+      .icon-shanchu {
+        font-size: 40rpx;
+        color: #cccccc;
+      }
+    }
+  }
+
+  .search-content {
+    flex-shrink: 0;
+    background: #FFFFFF;
+    .nav-list {
+      height: 100rpx;
+      padding: 34rpx 32rpx 34rpx 40rpx;
+
+      .selec {
+        // font-size: 32rpx;
+        transform: scale(1.2);
+      }
+    }
+  }
+
+  .scroll-list {
+    flex: 1;
+    overflow-y: scroll;
+    padding: 20rpx 28rpx;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/activity.vue b/pagesA/themes/chengXinRuYi/activity.vue
new file mode 100644
index 0000000..73da20b
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/activity.vue
@@ -0,0 +1,379 @@
+<template>
+  <view class="themes-activity position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view class="" >
+      <view class="title-box">
+        <image
+        :src="event_rul + '/static/theme/title-bg.svg'"
+        class="img-n"
+        mode="widthFix"
+        />
+        <view class="title-txt">团购活动</view>
+      </view>
+      
+      <view class="nav-list flex j-between al-item-center">
+      
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="!field || field == 'sort' ? 'color:' + '#ED5925' : ''"
+        data-field="sort"
+        data-order="desc"
+        >推荐</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="field == 'sales' ? 'color:' + '#ED5925' : ''"
+        data-field="sales"
+        data-order="desc"
+        >销量</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        data-field="sell_price"
+        :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+        <text :style="field == 'sell_price' ? 'color:' + '#ED5925' : ''"
+          >价格</text
+        >
+        <text
+          style="font-size: 26rpx"
+          class="iconfont icon-danbianjiantou1"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'asc' ? '#ED5925' : '#999',
+          }"
+        ></text>
+        <text
+          style="font-size: 26rpx; margin-left: -10rpx"
+          class="iconfont icon-danbianjiantou"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'desc' ? '#ED5925' : '#999',
+          }"
+        ></text>
+        </view>
+        <view @tap="open" >筛选 <text class="iconfont icon-shaixuan" style="font-size: 26rpx; margin-left: 4rpx;color: #999;"></text></view>
+      </view>
+    </view>
+    <scroll-view
+      class="scroll-list lise-t"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopTuangou && shopTuangou.length > 0"
+    >
+      <themes-tuangou-item v-if="isActivity" :data="shopTuangou" :timestamp="timestamp" :menuindex="menuindex"></themes-tuangou-item>
+      <view class="flex flex-colum" v-else>
+        <image class="n-thing" :src="event_rul + '/static/images/n-thing.png'" mode="widthFix"></image>
+        <view class="text-center color-gray">暂无活动～</view>
+      </view>
+    </scroll-view>
+    <view
+      v-if="visibleSync"
+      :class="{ 'uni-drawer--visible': showDrawer }"
+      class="uni-drawer"
+      @touchmove.stop.prevent="clear"
+    >
+      <view
+        class="uni-drawer__mask"
+        :class="{ 'uni-drawer__mask--visible': showDrawer && mask }"
+        @tap="close('mask')"
+      />
+      <view
+        class="uni-drawer__content"
+        :class="{
+          'uni-drawer--right': !rightMode,
+          'uni-drawer--left': rightMode,
+          'uni-drawer__content--visible': showDrawer,
+        }"
+      >
+        <view class="bolting-box">
+          <view class="name">筛选</view>
+          <view class="title">商品分类</view>
+          <view class="content flex flex-w">
+            <view
+              class="text"
+              :style="{
+                color: boltingListIndex === 0 ? '#EA4E34' : '#333333',
+                backgroundColor: boltingListIndex === 0 ? '#FFE4C2' : '#F7F7F7 ',
+              }"
+              @tap="bolting(0)"
+              >全部</view
+            >
+            <block v-for="(item, idx) in boltingList" :key="idx">
+              <view
+                class="text"
+                v-show="boltingList.length != 0"
+                :style="{
+                  color: boltingListIndex === idx + 1 ? '#EA4E34' : '#333333',
+                  backgroundColor: boltingListIndex === idx + 1 ? '#FFE4C2' : '#F7F7F7 ',
+                }"
+                @tap="bolting(idx + 1)"
+                >{{ item.name }}</view
+              >
+            </block>
+          </view>
+          <view class="bolting-box-b flex j-between">
+            <view class="res btn" @tap="boltingAll()">重置</view>
+            <view
+              class="comf btn"
+              :style="{ 'background-color': '' }"
+              @tap="filterConfirm(cpid)"
+              >确定</view
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/activity.js';
+import themesShop from "./components/themes-shop.vue";
+import themesTuangouItem from "./components/themes-tuangou-item.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+    themesTuangouItem
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-activity {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  border-radius: 20rpx 20rpx 0;
+  flex: 1;
+  left: 0;
+  right: 0;
+  background: linear-gradient(180deg,rgba(255,255,255,0) 0,rgba(255,255,255,0) 30rpx,#f4f4f4 30rpx, #f4f4f4 100%);
+  &::before {
+    content: "";
+    position: absolute;
+    top: 20rpx;
+    left: 0;
+    width: 100%;
+    height: 80rpx;
+    background: linear-gradient(180deg, #FFD7B7 0, #f4f4f4 100%);
+    border-radius: 10rpx 10rpx 0 0;
+  }
+}
+.title-box {
+  flex-shrink: 0;
+  margin-top: -20rpx;
+  height: 114rpx;
+  position: relative;
+
+  .img-n {
+    width: 354rpx;
+    height: 100%;
+    display: block;
+    margin: 0 auto;
+  }
+  .title-txt {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    font-size: 36rpx;
+    font-weight: 500;
+    color: #333333;
+    line-height: 50rpx;
+    letter-spacing: 2rpx;
+    padding-top: 26rpx;
+  }
+
+  .txt {
+    padding: 0 30rpx;
+  }
+}
+.nav-list {
+  flex-shrink: 0;
+  padding: 34rpx 30rpx 34rpx;
+  .actived {
+    color: #FB5E00;
+  }
+  .selec {
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  flex: 1;
+  overflow-y: scroll;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.n-thing {
+	width: 282rpx;
+	margin: 100rpx auto 0;
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+
+.select-box {
+  width: 100%;
+  height: calc(100% - 80rpx);
+  position: absolute;
+  left: 0;
+  top: 80rpx;
+  .select-mxk {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 66;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+
+  .select-box-content {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 68;
+
+    .content-item {
+      border-top: 2rpx solid #f2f2f4;
+    }
+  }
+}
+// 筛选
+.uni-drawer {
+  height: 100%;
+  width: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+  z-index: 999;
+  top: 20rpx;
+}
+
+.uni-drawer__content {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  top: 0;
+  width: 250px;
+  bottom: 0;
+  background-color: #ffffff;
+  transition: transform 0.3s ease;
+}
+
+.uni-drawer--left {
+  left: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(-251px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(-100%);
+  /* #endif */
+}
+
+.uni-drawer--right {
+  right: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(251px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(100%);
+  /* #endif */
+}
+
+.uni-drawer__content--visible {
+  transform: translateY(0px);
+}
+
+.uni-drawer__mask {
+  width: 100%;
+  height: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 0;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  transition: opacity 0.3s;
+}
+
+.uni-drawer__mask--visible {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 1;
+}
+
+.bolting-box {
+  padding: 30rpx 0 30rpx 28rpx;
+
+  .name {
+    font-size: 32rpx;
+    color: #333333;
+  }
+  .title {
+    font-size: 24rpx;
+    color: #666666;
+    margin-top: 34rpx;
+  }
+  .content {
+    width: 100%;
+    padding: 28rpx 0 10rpx;
+    margin: 0 -8rpx;
+	
+    .text {
+      width: 140rpx;
+      height: 60rpx;
+      padding: 0 10rpx;
+      box-sizing: border-box;
+      line-height: 60rpx;
+      text-align: center;
+      margin: 0 8rpx 18rpx;
+      font-size: 24rpx;
+      border-radius: 4rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+  .bolting-box-b {
+    margin-right: 28rpx;
+    padding-top: 58rpx;
+    border-top: 1rpx solid #ECECEC;
+    .btn {
+      width: 214rpx;
+      font-size: 28rpx;
+      line-height: 60rpx;
+      text-align: center;
+      border-radius: 6rpx;
+    }
+    .res {
+      color: #333333;
+      border: 1rpx solid #ECECEC;
+    }
+    .comf {
+      color: #FFFFFF;
+      background: linear-gradient(to right, #FF9F28 0, #FF5E07 100%);
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/choiceness.vue b/pagesA/themes/chengXinRuYi/choiceness.vue
new file mode 100644
index 0000000..83bd106
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/choiceness.vue
@@ -0,0 +1,73 @@
+<template>
+  <view class="themes-choiceness">
+    <!-- 优惠 -->
+    <themes-coupon-one
+      v-if="shopCoupon.length != 0"
+      :shopCoupon="shopCoupon"
+    ></themes-coupon-one>
+    <!-- 视频 -->
+    <themes-live
+      v-if="shopVideo.length != 0"
+      :shopVideo="shopVideo"
+      :shopNotice="shopNotice"
+      :noticeIcon="shopData.noticeIcon"
+    ></themes-live>
+    <!-- 菜单 -->
+    <themes-hot
+      v-if="shopMenu.length != 0"
+      :shopMenu="shopMenu"
+      :isShowDots="isShowDots"
+    ></themes-hot>
+    <!-- 团购 -->
+    <themes-tuangou
+      v-if="shopTuangou.length != 0"
+      :shopTuangou="shopTuangou"
+    ></themes-tuangou>
+    <!-- 笔记 -->
+    <themes-note
+      v-if="shopNote.length != 0"
+      :shopNote="shopNote"
+    ></themes-note>
+    <!-- 推荐商品 -->
+    <themes-recommend
+      v-if="shopProduct.length != 0"
+      :shopProduct="shopProduct"
+    ></themes-recommend>
+    <!-- 精选商品 -->
+    <themes-shop
+      v-if="shopSelPro.length != 0"
+      :shopProduct="shopSelPro"
+    ></themes-shop>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/choiceness.js";
+import themesCouponOne from "./components/themes-coupon-one.vue";
+import themesHot from "./components/themes-hot.vue";
+import themesTuangou from "./components/themes-tuangou.vue";
+import themesRecommend from "./components/themes-recommend.vue";
+import themesShop from "./components/themes-shop.vue";
+import themesNote from "./components/themes-note.vue";
+import themesLive from "./components/themes-live.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesCouponOne,
+    themesHot,
+    themesTuangou,
+    themesRecommend,
+    themesShop,
+    themesNote,
+    themesLive,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-choiceness {
+    margin-top: -30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/classify.vue b/pagesA/themes/chengXinRuYi/classify.vue
new file mode 100644
index 0000000..660c60e
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/classify.vue
@@ -0,0 +1,173 @@
+<template>
+  <view class="themes-classify">
+    <image class="themes-classify__img" :src="shopData.bgimg" mode="widthFix"></image>
+    <block v-if="flag">
+      <themes-head
+        :navHeight="navHeight"
+        :shopData="shopData"
+        :isShowNav="false"
+        :navIndex="1"
+      ></themes-head>
+      <view class="themes-content">
+        <view class="themes-content__left">
+          <view
+            class="classify-item"
+            :class="{ actived: currentIndex === '' }"
+            @tap="selectAll()"
+            >全部</view
+          >
+          <view
+            class="classify-item"
+            v-for="(item, index) in shopCategory"
+            :key="index"
+            :class="{ actived: currentIndex === index }"
+            @tap="categoryHandle(item.id, index)"
+          >
+            {{ item.name }}
+          </view>
+        </view>
+        <view class="themes-content__right">
+          <view class="classify-tabs">
+            <view
+              class="classify-tabs__item"
+              :class="{ actived: isSelectAll }"
+              @tap="selectCategoryAll()"
+              >全部</view
+            >
+            <view
+              class="classify-tabs__item"
+              v-for="(item, index) in shopCategorychild"
+              :key="index"
+              :class="{ actived: curidx === index && !isSelectAll }"
+              @tap="categoryChildHandle(item.id, index)"
+              >{{ item.name }}</view
+            >
+          </view>
+          <scroll-view
+            class="themes-content__scroll"
+            :scroll-y="true"
+            @scrolltolower="getmorecomment"
+          >
+            <classifyShop :shopProduct="shopProduct"></classifyShop>
+            <loading v-if="loading"></loading>
+            <nomore v-if="nomore"></nomore>
+            <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+          </scroll-view>
+        </view>
+      </view>
+    </block>
+    <loading v-else></loading>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/classify.js';
+import themesHead from "./components/themes-head.vue";
+import classifyShop from "./components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    classifyShop,
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.themes-classify {
+  height: 100vh;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  z-index: 1;
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    height: 1020rpx;
+  }
+}
+.themes-content {
+  position: relative;
+  z-index: 2;
+  box-sizing: border-box;
+  overflow: hidden;
+  margin-top: 28rpx;
+  background: #fff;
+  position: relative;
+  border-radius: 12rpx 12rpx 0 0;
+  display: flex;
+  flex: 1;
+  &__left {
+    width: 180rpx;
+    flex-shrink: 0;
+    background: #f8f9fa;
+    overflow-y: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  &__right {
+    flex: 1;
+    box-sizing: border-box;
+    padding: 28rpx 28rpx 0;
+    position: relative;
+    /deep/ .nodata {
+      margin-left: -30rpx;
+    }
+  }
+  &__scroll {
+    height: calc(100% - 86rpx);
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  .classify-item {
+    height: 110rpx;
+    line-height: 110rpx;
+    text-align: center;
+    font-size: 28rpx;
+    color: #666666;
+    &.actived {
+      color: #FB5E00;
+      background: #fff;
+      font-weight: 500;
+    }
+  }
+  .classify-tabs {
+    display: flex;
+    margin-bottom: 30rpx;
+    overflow-x: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &__item {
+      flex-shrink: 0;
+      min-width: 80rpx;
+      box-sizing: border-box;
+      margin-right: 20rpx;
+      padding: 0 18rpx;
+      font-size: 22rpx;
+      line-height: 42rpx;
+      border-radius: 42rpx;
+      color: #666666;
+      background: #f7f7f7;
+      &.actived {
+        background: #FFE4C2;
+        color: #FB5E00;
+      }
+    }
+  }
+  /deep/ .nomore {
+    margin-left: 32rpx;
+  }
+  /deep/ .nodata {
+    width: calc(100vw - 180rpx);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/classify-shop.vue b/pagesA/themes/chengXinRuYi/components/classify-shop.vue
new file mode 100644
index 0000000..9e1ac44
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/classify-shop.vue
@@ -0,0 +1,221 @@
+<template>
+  <view
+    class="classify-shops"
+  >
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-item flex"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-item__hd flex j-center al-item-center">
+              <image
+                class="shops-item__img"
+                :src="item.pic"
+                mode="aspectFill"
+              ></image>
+            </view>
+            <view class="shops-item__bd">
+              <view class="shops-item__title text-overflow-line">{{ item.name }}</view>
+              <view class="shops-item__sale">已售{{ item.sales }}</view>
+              <view class="shops-item__bottom flex al-item-center j-between">
+                <view class="shops-item__price flex">¥<text class="shops-item__num">{{ item.sell_price }}</text></view>
+                <view class="shops-item__icon"
+                    @click.stop="buydialogChange"
+                    :data-proid="item.proid"></view>
+              </view>
+            </view>
+          </view>
+        </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.classify-shops {
+    padding-bottom: 20rpx;
+    box-sizing: border-box;
+    .shops-item {
+      padding: 20rpx 0 14rpx;
+      &:not(:last-child) {
+        border-bottom: 1rpx solid #ECECEC;
+      }
+      &__hd {
+        width: 192rpx;
+        height: 192rpx;
+        flex-shrink: 0;
+      }
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+      &__bd {
+        flex: 1;
+        margin-left: 12rpx;
+      }
+      &__title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: 36rpx;
+        margin-bottom: 36rpx;
+        min-height: 72rpx;
+      }
+      &__sale {
+        font-size: 18rpx;
+        color: #999999;
+        line-height: 22rpx;
+        margin-bottom: 4rpx;
+      }
+      &__price {
+        color: #ED5925;
+        font-weight: 500;
+        font-size: 24rpx;
+        line-height: 34rpx;
+        align-items: baseline;
+      }
+      &__num {
+        margin-left: 4rpx;
+        font-size: 36rpx;
+        line-height: 50rpx;
+      }
+      &__icon {
+					width: 44rpx;
+					height: 44rpx;
+          margin-top: -4rpx;
+					background: linear-gradient(180deg,#ff9623 0%, #ff7713 100%);
+					border-radius: 20rpx;
+					position: relative;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 8rpx;
+						right: 8rpx;
+						height: 4rpx;
+						top: 50%;
+						transform: translateY(-50%);
+						background: #FFF;
+					}
+					&::after {
+						content: "";
+						position: absolute;
+						top: 8rpx;
+						bottom: 8rpx;
+						width: 4rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						background: #FFF;
+					}
+				}
+    }
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    border: none;
+    // width: 100%;
+    height: auto;
+    display: flex;
+    padding-bottom: 25rpx;
+    &:not(:last-child) {
+      position: relative;
+      &::after {
+        content: "";
+        position: absolute;
+        bottom: 5rpx;
+        left: 0;
+        right: 0;
+        border-bottom: 1rpx solid rgba(0,0,0,0.1);
+        transform: scaleY(0.5);
+      }
+    }
+    &__hd {
+      width: 200rpx;
+      height: 200rpx;
+      border-radius: 12rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+    .shops-img {
+      width: 100%;
+      height: 100%;
+    }
+    .item-info {
+      flex: 1;
+      padding: 0 20rpx;
+    }
+    .shops-c-t {
+      padding-top: 15rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      min-height: 75rpx;
+    }
+    .shops-s-t {
+      padding-top: 10rpx;
+      font-size: 24rpx;
+      color: #999;
+    }
+    .shops-b-t {
+      padding-top: 10rpx;
+
+      .b-t1 {
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 30rpx;
+      }
+      .b-t3 {
+        color: #999;
+      }
+      .car {
+        width: 44rpx;
+        height: 44rpx;
+
+        .icon_gouwuche {
+          color: #fff;
+          font-size: 32rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-banner.vue b/pagesA/themes/chengXinRuYi/components/themes-banner.vue
new file mode 100644
index 0000000..7f5fdee
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-banner.vue
@@ -0,0 +1,74 @@
+<template>
+  <view class="themes-banner">
+    <swiper
+      class="swiper-container"
+      :indicator-dots="true"
+      :autoplay="true"
+      circular="true"
+      :interval="5000"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopBanner"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <image class="swiper-item__img" :src="item.imgurl"></image>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopBanner: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-banner {
+  .swiper-container {
+    width: 100%;
+    height: 800rpx;
+    margin-top: 28rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+    .wx-swiper-dot {
+      width: 12rpx;
+      height: 8rpx;
+      border-radius: 20rpx;
+    }
+    .wx-swiper-dot::before {
+      content: "";
+      flex-grow: 1;
+      background: #efbd6f;
+    }
+    .wx-swiper-dot-active::before {
+      width: 50rpx;
+      background: #efbd6f;
+    }
+    .swiper-item {
+      width: 100%;
+      height: 100%;
+      border-radius: 10rpx;
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-c-img.vue b/pagesA/themes/chengXinRuYi/components/themes-c-img.vue
new file mode 100644
index 0000000..1c986be
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-c-img.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="themes-c-img" :class="[top? 'top' : 'top-z',navHeight > 60 ? 'top-m': '']">
+		<image class="kn-img" src="https://img0.baidu.com/it/u=617696644,3314521124&fm=253&fmt=auto&app=138&f=JPEG?w=625&h=500" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			top: {
+				type: Boolean,
+				default: false
+			},
+			navHeight: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+	
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-c-img {
+		display: flex;
+		.kn-img {
+			width: 100%;
+			border-radius: 12rpx
+			// vertical-align: middle;
+		}
+	}
+	.top {margin-top: -190rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -160rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-chunk-title-two.vue b/pagesA/themes/chengXinRuYi/components/themes-chunk-title-two.vue
new file mode 100644
index 0000000..948bcef
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-chunk-title-two.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="shops-til flex">
+		<image class="shops-til__icon" :src="event_rul + '/static/theme/title-bg.svg'"></image>
+		<view class="shops-til__title">{{ title }}</view>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default{
+		data() {
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props:{
+			title: {
+				type: String,
+				default: ''
+			},
+			titleBg: {
+				type: String,
+				default: ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shops-til {
+        position: relative;
+        justify-content: center;
+        height: 114rpx;
+		&__icon {
+            position: absolute;
+            z-index: -1;
+            left: 50%;
+            top: 0;
+            transform: translateX(-50%);
+			width: 354rpx;
+			height: 100%;
+			flex-shrink: 0;
+		}
+		&__title {
+            margin-top: 26rpx;
+			font-size: 36rpx;
+            font-weight: 500;
+            color: #333333;
+            line-height: 50rpx;
+            letter-spacing: 2rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-chunk-title.vue b/pagesA/themes/chengXinRuYi/components/themes-chunk-title.vue
new file mode 100644
index 0000000..0ca9d13
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-chunk-title.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="shops-til flex al-item-center">
+		<image class="shops-til__icon" :src="iconSrc"></image>
+		<view class="shops-til__title">{{ title }}</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			title: {
+				type: String,
+				default: ''
+			},
+			iconSrc: {
+				type: String,
+				default: ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shops-til {
+		padding: 24rpx 0;
+		&__icon {
+			width: 50rpx;
+			height: 50rpx;
+			flex-shrink: 0;
+			margin-right: 12rpx;
+		}
+		&__title {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 44rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-coupon-one.vue b/pagesA/themes/chengXinRuYi/components/themes-coupon-one.vue
new file mode 100644
index 0000000..de73243
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-coupon-one.vue
@@ -0,0 +1,198 @@
+<template>
+	<view class="themes-coupon">
+		<scroll-view class="scroll-list" :scroll-x="true">
+			<block v-for="(item, idx) in shopCoupon1" :key="idx">
+				<!-- isUse 是按钮为'去使用'的优惠券 -->
+				<view class="scroll-list__item" v-if="!item.isOver" :class="{ 'isUse': item.isUse }" @tap.stop="getcoupon" :data-idx="idx" :data-id="item.couponid" :data-price="item.price" :data-score="item.score">
+					<image class="scroll-list__item-bg" :src="item.isUse ? event_rul + '/static/theme/coupon-bg1.svg' : event_rul + '/static/theme/coupon-bg.svg'"></image>
+					<view class="conpon-price">
+						<view class="conpon-price-c flex j-center">
+							<text class="price-f">¥</text>
+							<text class="price-num font-w">{{ item.money }}</text>
+						</view>
+						<view class="conpon-price-h">满{{ item.minprice }}元使用</view>
+					</view>
+					<view class="conpon-ft">
+						<view class="conpon-txt">优惠券</view>
+						<view class="conpon-btn border-rius-r flex al-item-center">{{ item.msg || '点击领取' }}</view>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	import { mapState } from "vuex";
+	export default{
+		props:{
+			shopCoupon: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data() {
+			return {
+				shopCoupon1: this.shopCoupon,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		watch: {
+			shopCoupon (newV, oldV) {
+				this.shopCoupon1 = newV;
+			
+				console.log("shopCoupon1",this.shopCoupon1)
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+		methods: {
+			// 点击领取优惠券
+			getcoupon: function (e) {
+				
+				var that = this;
+				var idx = e.currentTarget.dataset.idx;
+				var id = e.currentTarget.dataset.id;
+				var score = parseInt(e.currentTarget.dataset.score);
+				var price = e.currentTarget.dataset.price;
+				
+				if (price > 0) {
+					app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+						console.log(res)
+						if(res.status == 0) {
+								app.error(res.msg);
+						} else {
+							app.goto('/pages/pay/pay?id=' + res.payorderid);
+						}
+					})
+					return;
+				}
+				if (score > 0) {
+					app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+						app.showLoading('兑换中');
+						app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+							app.showLoading(false);
+							if (data.status == 0) {
+								app.error(data.msg);
+							} else {
+								app.success(data.msg);
+							}
+						});
+					});
+				}
+				that.shopCoupon.map((item,index) => {
+					console.log(index,idx)
+					if(index === idx) {
+						if(item.isUse) {
+							uni.navigateTo({
+								url:'/pages/shop/prolist?cpid='+ id
+							})
+						} else if(item.isOver) {
+							return;
+						} else {
+							app.showLoading('领取中');
+							app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+								app.showLoading(false);
+								if (data.status == 0) {
+									app.error(data.msg);
+								} else {
+									app.success(data.msg);
+									that.$set(item,"msg","去使用");
+									that.$set(item,'isUse',true);
+									that.$set(item,'isOver',false);
+								}
+							});
+						}
+					}
+				})				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-coupon {
+		margin-top: 24rpx;
+		position: relative;
+		right: -28rpx;
+		left: 0;
+		width: calc(100% + 28rpx);
+		.scroll-list {
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			.scroll-list__item {
+				// background: pink;
+				display: inline-flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-right: 28rpx;
+				position: relative;
+				width: 234rpx;
+				height: 106rpx;
+				padding: 8rpx 12rpx 16rpx 16rpx;
+				z-index: 1;
+				&.isUse {
+					.conpon-btn {
+						border: 1rpx solid #FB5E00;
+						color: #FB5E00;
+					}
+				}
+				&-bg {
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 100%;
+					height: 100%;
+					z-index: -1;
+				}
+				.conpon-price {
+					color: #FFF;
+					.conpon-price-c {
+						align-items: flex-start;
+						.price-f {
+							padding: 20rpx 2rpx 0 0;
+							font-size: 24rpx;
+							line-height: 34rpx;
+						}
+						.price-num {
+							font-size: 44rpx;
+							line-height: 60rpx;
+							letter-spacing: 2rpx;
+						}
+					}
+					.conpon-price-h {
+						margin-top: -6rpx;
+						font-size: 20rpx;
+						line-height: 28rpx;
+					}
+				}
+				.conpon-txt {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #FB5E00;
+					line-height: 34rpx;
+					padding-top: 10rpx;
+				}
+				.conpon-btn {
+					width: 76rpx;
+					justify-content: center;
+					margin-top: 14rpx;
+					font-size: 16rpx;
+					line-height: 22rpx;
+					color: #FFF;
+					background: #FB5E00;
+				}
+			}
+		}
+	}
+	
+	.top {margin-top: -70rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -40rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-head.vue b/pagesA/themes/chengXinRuYi/components/themes-head.vue
new file mode 100644
index 0000000..459c46a
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-head.vue
@@ -0,0 +1,418 @@
+<template>
+  <view
+    class="themes-head position-r"
+    :style="{ 'padding-top': navHeight + 'px' }"
+  >
+    <view
+      class="head-bx-h"
+      :style="'height:'+ navHeight+'px;background:'+(shopInfo.bgimg ?'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top 0 left 0':'')"
+    >
+      <view class="head-bx-ct position-a flex al-item-center">
+        <text class="iconfont icon-icon_arrow_left" @tap="goBack"></text>
+        <text
+          class="iconfont icon-shouye"
+          @tap="goto"
+          data-url="/pages/index/index"
+          data-opentype="reLaunch"
+        ></text>
+        <view class="search flex al-item-center j-between border-rius-r">
+          <text class="iconfont icon-search"></text>
+          <input
+            placeholder="请输入搜索内容..."
+            type="text"
+            v-model="searchVlaue"
+            @confirm="search"
+          />
+        </view>
+      </view>
+    </view>
+
+    <view class="head-bx-cont">
+      <view class="head-store flex al-item-center j-between">
+        <view class="store-l flex al-item-center">
+          <image class="store-logo" :src="shopInfo.logo"></image>
+          <view class="store-l-c flex1">
+            <view
+              class="store-l-tlt flex al-item-center"
+              @click="goto"
+              :data-url="
+                '/pagesA/shop/shop-detail?bid=' +
+                shopInfo.id +
+                '&pagestext=' +
+                shopInfo.name
+              "
+            >
+              <text class="head-store__name">{{ shopInfo.name || "" }}</text>
+              <text class="iconfont icon-arrow-right"></text>
+            </view>
+            <!-- <view class="store-l-tx text-center" :style="{'background-color': '#FF8017'}">自营</view> -->
+          </view>
+        </view>
+        <view class="store-r flex flex-colum al-item-center">
+          <view
+            @tap="followFn"
+            class="store-r-tlt text-center"
+            :class="shopInfo.isFollow ? 'followed' : 'isFollow'"
+          >
+            <image
+              class="follow-icon"
+              v-if="!shopInfo.isFollow"
+              :src="event_rul + '/static/theme/follow-icon.svg'"
+            ></image>
+            <text>{{ shopInfo.isFollow ? "已关注" : "关注" }}</text>
+          </view>
+          <!-- <view class="store-r-tlt text-center" :style="{'border-color': '#FF8017', 'color': '#FF8017','border':' 1px solid'}">已关注</view> -->
+          <view class="store-r-tx">{{ shopInfo.attention || 0 }}人关注</view>
+        </view>
+      </view>
+      <view
+        v-if="isShowNav"
+        class="head-nav-list flex j-between"
+        :class="{'isFixed': navFixed}"
+        :style="'top:'+ (navHeight - 1) + 'px;background:'+(navFixed ? (shopInfo.bgimg ? 'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top -60px left 0':''):'')"
+      >
+        <block v-for="(item, idx) in navBar" :key="idx">
+          <view class="nav-list-itm" @tap="selectNav(idx)">
+            <view class="itm-tx color-white">{{ item }}</view>
+            <view
+              v-show="navIndex == idx"
+              class="itm-select border-rius-r"
+            ></view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState, mapActions } from "vuex";
+var app = getApp();
+export default {
+  props: {
+    navHeight: {
+      type: Number,
+      default: 0,
+    },
+    navList: {
+      typa: Array,
+      default: function() {
+        return [];
+      },
+    },
+    shopData: {
+      typa: Object,
+      default: {},
+    },
+    navIndex: {
+      type: Number,
+      default: 0,
+    },
+    isShowNav: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      bxContHeight: 0,
+      timeout: null,
+      timeouttwo: null,
+      searchVlaue: "",
+      shopInfo: this.shopData,
+      event_rul: app.globalData.event_url,
+      navBar: [],
+    };
+  },
+  computed: {
+    ...mapState(["opt","navFixed","heardHeight"]),
+  },
+  watch: {
+    // 监听shopData变化
+    shopData(newV, oldV) {
+      this.shopInfo = newV;
+    },
+    navList: {
+      handler: function(newV, oldV) {
+        this.navBar = newV;
+      },
+      deep: true,
+    }
+  },
+  mounted() {
+    const vr = uni.getSystemInfoSync();
+    this.styleHeight();
+    this.getData();
+  },
+  beforeDestroy() {
+    clearTimeout(this.timeout);
+    clearTimeout(this.timeouttwo);
+  },
+  methods: {
+    ...mapActions(["acNavHeightTop","acHeardHeight"]),
+    getData() {
+      if (this.navList.length == 0) {
+        this.navBar = ["精选", "商品", "活动", "新品"];
+      } else {
+        this.navBar = this.navList;
+      }
+      const query = uni.createSelectorQuery().in(this);
+      this.timeouttwo = setTimeout(() => {
+        let listTop = 0;
+        query.select(".head-nav-list").boundingClientRect((data) => {
+          listTop = data ? Number(data.top) : 0;
+        }).exec();
+        query.select(".head-bx-cont").boundingClientRect((data) => {
+          const heightTop = listTop - (data ? Number(data.top) : 0);
+          this.acNavHeightTop(heightTop);
+        }).exec();
+      }, 200)
+    },
+    // 关注店铺
+    followFn() {
+      var that = this;
+      console.log("打印店铺信息+++++", this.shopData, this.shopData);
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.shopData.id || "", type: "store" },
+        function (res) {
+          console.log("点击关注和取消关注addFollow===========", res);
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo();
+        }
+      );
+    },
+
+    getInfo() {
+      var that = this;
+      // 暂时写死 id：27，正确为 id：that.shopData.id
+      app.post(
+        "/ApiBusiness/follow",
+        { bid: that.shopData.id || "" },
+        function (res) {
+          that.$set(that.shopData, "attention", res.data.followCount);
+          that.$set(that.shopData, "isFollow", res.data.isFollow);
+
+          console.log("-----", that.shopData);
+          // 公共头部信息
+          uni.setStorage({
+            key: "header_data",
+            data: that.shopData,
+          });
+        }
+      );
+    },
+
+    styleHeight() {
+      let query = uni.createSelectorQuery().in(this);
+      query.select(".head-bx-cont").boundingClientRect();
+      query.select(".themes-head").boundingClientRect();
+      this.timeout = setTimeout(() => {
+        query.exec((res) => {
+          if (res[0] != null && res[1] != null) {
+            this.bxContHeight = res[0].height;
+            console.log(this.navFixed)
+            if(!this.navFixed) {
+              this.acHeardHeight(res[1].height)
+            }
+          }
+        });
+      }, 200)
+    },
+    // 返回
+    goBack() {
+      uni.navigateBack();
+    },
+    // 搜索
+    search() {
+      uni.navigateTo({
+        url:
+          "/pagesA/shop/search?keyword=" +
+          this.searchVlaue +
+          "&id=" +
+          this.shopData.id,
+      });
+      return;
+    },
+    selectNav(idx) {
+      this.$emit("navselect", idx, this.bxContHeight, this.heardHeight);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-head {
+  width: 100%;
+  flex-shrink: 0;
+  z-index: 3;
+  .head-bx-h {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 99;
+    background-size: 100% 1020rpx;
+    background-position: top 0 left 0;
+    .head-bx-ct {
+      height: 32px;
+      left: 0;
+      bottom: 4px;
+
+      .icon-icon_arrow_left {
+        padding-left: 30rpx;
+        color: #fff;
+        font-size: 50rpx;
+      }
+      .icon-shouye {
+        font-size: 45rpx;
+        color: #fff;
+        padding: 10rpx 20rpx;
+      }
+      .search {
+        margin-left: 20rpx;
+        width: 60%;
+        height: 100%;
+        padding: 0 20rpx;
+        background-color: #fff;
+
+        .icon-search {
+          font-size: 50rpx;
+          color: #ababab;
+        }
+        input {
+          padding-left: 10rpx;
+        }
+      }
+    }
+  }
+
+  .head-bx-cont {
+    padding-top: 30rpx;
+
+    .head-store {
+      color: #fff;
+      padding: 0 28rpx;
+      &__name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        /* autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        text-align: justify;
+      }
+      .store-l {
+        width: 80%;
+        .store-logo {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 12rpx;
+        }
+
+        .store-l-c {
+          padding-left: 20rpx;
+          .store-l-tlt {
+            font-size: 32rpx;
+            white-space: pre-wrap;
+            word-break: break-all;
+            padding-right: 45rpx;
+            display: flex;
+            align-items: center;
+
+            .icon-arrow-right {
+              font-size: 40rpx;
+              padding: 6rpx 0 0 0;
+            }
+          }
+          .store-l-tx {
+            min-width: 60rpx;
+            // min-height: 30rpx;
+            padding: 4rpx 10rpx;
+            margin-top: 8rpx;
+            line-height: 30rpx;
+            display: inline-block;
+            font-size: 24rpx;
+            border-radius: 4rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
+
+      .store-r {
+        .store-r-tlt {
+          width: 120rpx;
+          height: 48rpx;
+          line-height: 48rpx;
+          border-radius: 24rpx;
+          font-size: 24rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          &.isFollow {
+            background: linear-gradient(150deg, #EA1F05 0%, #F54617 100%);
+            color: #fff;
+            .follow-icon {
+              width: 28rpx;
+              height: 24rpx;
+              margin-right: 6rpx;
+            }
+          }
+          &.followed {
+            color: #fff;
+            position: relative;
+            &::before {
+              content: "";
+              position: absolute;
+              left: 0;
+              top: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #fff;
+              box-sizing: border-box;
+              transform: scale(0.5, 0.5);
+              border-radius: 48rpx;
+              transform-origin: 0 0;
+            }
+          }
+        }
+
+        .store-r-tx {
+          padding-top: 6rpx;
+          font-size: 22rpx;
+        }
+      }
+    }
+
+    .head-nav-list {
+      padding: 0 28rpx;
+      font-size: 28rpx;
+      align-items: flex-start;
+      background-size: 100% 1020rpx;
+      &.isFixed {
+        position: fixed;
+        left: 0;
+        right: 0;
+      }
+      .nav-list-itm {
+        padding: 28rpx 32rpx 0;
+        .itm-tx {
+          z-index: 6;
+        }
+        .itm-select {
+          width: 100%;
+          height: 6rpx;
+          margin-top: 6rpx;
+          z-index: 2;
+          background: #fff;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-hot.vue b/pagesA/themes/chengXinRuYi/components/themes-hot.vue
new file mode 100644
index 0000000..db0ecf0
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-hot.vue
@@ -0,0 +1,183 @@
+<template>
+  <view class="themes-hot-sale">
+    <scroll-view class="scroll-list" :scroll-x="true" @scroll="scrollHandle($event)">
+      <view class="scroll-list-row" v-for="(items, idx) in shopMenu" :key="idx">
+        <view
+          class="scroll-list-item"
+          v-for="(item, index) in items"
+          :key="index"
+          @tap.stop="goShopCgry(item.hrefurl, item.id)"
+        >
+          <view class="list-item flex flex-w">
+            <view class="list-item-c flex flex-colum al-item-center">
+              <view class="list-item-cnt position-r">
+                <image
+                  class="item-c-img border-rius-r"
+                  :src="item.imgurl"
+                  mode=""
+                ></image>
+                <!-- <text
+                  class="item-c-hot hot-s1 position-a"
+                  :style="{ 'border-color': '#FE7D11', color: '#FE7D11' }"
+                  v-if="index == 0"
+                  >HOT</text
+                > -->
+              </view>
+              <text class="list-item-tl fs12">{{ item.text }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view v-if="isShowDots" class="list-dots">
+      <view class="list-dots__item" :style="'left:' + dotLeft + 'px'"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  props: {
+    shopMenu: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    isShowDots: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      width: 0,  // scroll-list节点宽度
+      dotLeft: 0,  // 圆点滚动的距离
+    }
+  },
+  computed: {
+    ...mapState(["opt"]),
+  },
+  mounted() {
+    const query = uni.createSelectorQuery().in(this);
+    query.select('.scroll-list').boundingClientRect(data => {
+      this.width = data.width;
+      console.log("得到布局位置信息" + this.width);
+    }).exec();
+  },
+  methods: {
+    scrollHandle(e){
+      let scrollLeft = e.detail.scrollLeft;
+      let scrollWidth  = e.detail.scrollWidth;
+      let ratio = scrollLeft / (scrollWidth - this.width);
+      this.dotLeft = 18 * ratio;
+    },
+    goShopCgry(url, id) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-hot-sale {
+  background: #FFF;
+  padding: 16rpx 16rpx;
+  box-shadow: 0rpx 4px 8rpx 0rpx rgba(0,0,0,0.0300);
+  border-radius: 20rpx;
+  margin-top: 28rpx;
+  .swiper-container {
+    height: 450rpx;
+    &.swiper-single {
+      height: 210rpx;
+    }
+  }
+
+  .scroll-list {
+    width: 100%;
+    position: relative;
+    width: calc(100% + 16rpx);
+    right: -16rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &-row:not(:last-child) {
+      margin-bottom: 18rpx;
+    }
+    .scroll-list-item {
+      background: none;
+      display: inline-block;
+      margin-left: 35rpx;
+
+      .list-item-c {
+        width: 106rpx;
+
+        .list-item-cnt {
+          .item-c-img {
+            width: 90rpx;
+            height: 90rpx;
+            vertical-align: middle;
+          }
+
+          .item-c-hot {
+            padding: 2rpx 10rpx;
+            font-size: 20rpx;
+            border: 2rpx solid;
+            border-radius: 50rpx 60rpx 60rpx 0px;
+            background-color: #fff;
+            top: 6rpx;
+            right: -12rpx;
+          }
+
+          .hot-s1 {
+            background-color: #fff;
+          }
+        }
+        .list-item-tl {
+          max-width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          padding-top: 10rpx;
+        }
+      }
+    }
+    .scroll-list-item:first-child {
+      margin-left: 0;
+    }
+  }
+  .list-dots {
+    margin-top: 18rpx;
+    position: relative;
+    width: 72rpx;
+    height: 6rpx;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #EAEAEA;
+    border-radius: 6rpx;
+    &__item {
+      position: absolute;
+      top: 0;
+      width: 50%;
+      height: 100%;
+      background: #EA4E34;
+    }
+  }
+}
+
+.top {
+  margin-top: -60rpx;
+}
+.top-z {
+  margin-top: 0rpx;
+}
+.top-m {
+  margin-top: -50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-live.vue b/pagesA/themes/chengXinRuYi/components/themes-live.vue
new file mode 100644
index 0000000..d4833bf
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-live.vue
@@ -0,0 +1,328 @@
+<template>
+  <view class="themes-live position-r">
+    <view
+      v-for="(item, index) in shopVideo"
+      :key="index"
+      @click="goto"
+      :data-url="'/activity/shortvideo/detail?id=' + item.videoId"
+    >
+    <view class="themes-live__item flex">
+      <view class="themes-live__item-hd"
+        @click="goto"
+        :data-url="'/activity/shortvideo/detail?id=' + item.videoId">
+        <view class="bofang-box">
+          <text class="iconfont icon-bofang"></text>
+        </view>
+        <image
+          class="themes-live__item-img"
+          :src="item.coverimg"
+          mode="aspectFill"
+        ></image>
+      </view>
+      <view class="themes-live__item-bd">
+        <view class="themes-live__item-title">{{item.description}}</view>
+        <view class="themes-live__item-time">
+          <view class="themes-live__item-duration">{{
+            formatSeconds(Number(item.video_duration)) || "00:00"
+          }}</view>
+          <view class="themes-live__item-animat flex j-between">
+            <text class="heng1"></text>
+            <text class="heng2"></text>
+            <text class="heng3"></text>
+          </view>
+        </view>
+        <themes-vip
+          v-if="shopNotice.length != 0"
+          :shopNotice="shopNotice"
+          :noticeIcon="shopData.noticeIcon"
+        ></themes-vip>
+        <view class="themes-live__item-goods flex al-item-center" v-if="item.hasOwnProperty('goods')">
+          <image
+            class="goods-img"
+            :src="item.goods.propic"
+            mode="aspectFill"
+          ></image>
+          <view class="goods-bd flex flex-colum j-between">
+            <text class="goods-title">{{ item.goods.proname }}</text>
+            <view class="goods-bot flex al-item-center">
+              <view class="goods-price">
+                ¥<text class="goods-price__num font-w">{{
+                item.goods.prosell_price
+              }}</text>
+              </view>
+              <view class="goods-more"></view>
+            </view>
+          </view>
+        </view>
+      </view> 
+    </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import themesVip from "./themes-vip.vue";
+export default {
+  components: {
+    themesVip
+  },
+  props: {
+    shopVideo: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    noticeIcon: {
+      type: String,
+      default: '',
+    },
+    shopNotice: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      shopData:{},
+    };
+  },
+  mounted() {
+    uni.getStorage({
+      key: "header_data",
+      success: function(res){
+          this.shopData = res.data;
+      },
+    })
+  },
+  methods: {
+    formatSeconds(time){
+				let newTime,hour,minite,seconds;
+				if(time >= 3600){
+				hour = parseInt(time/3600) < 10 ? '0' + parseInt(time/3600) : parseInt(time/3600);
+				minite = parseInt(time%3600/60) < 10 ? '0' + parseInt(time%3600/60):parseInt(time%3600/60);
+				seconds = time%3600%60 < 10 ? '0' + Math.round(time%3600%60) : Math.round(time%3600%60);
+				newTime = hour + ':' + minite + ':' + seconds;
+				}else if(time >= 60 && time < 3600){
+				minite = parseInt(time/60) < 10 ? '0' + parseInt(time/60) : parseInt(time/60);
+				seconds = time%60 < 10 ? '0' + Math.round(time%60) : Math.round(time%60);
+				newTime = minite + ':' + seconds;  
+				}else if(time < 60 ){
+				seconds = time < 10 ? '0' + Math.round(time) : Math.round(time);
+				newTime = '00:'+ seconds;
+				}
+				return newTime;
+			},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-live {
+  margin-top: 24rpx;
+  &__item {
+    justify-content: space-between;
+    border-radius: 10rpx;
+    overflow: hidden;
+    background: linear-gradient(to right, #FFE4C2 0%, #FFC382 100%);
+    &-hd {
+      width: 300rpx;
+      height: 416rpx;
+      flex-shrink: 0;
+      position: relative;
+    }
+    &-img {
+      width: 100%;
+      height: 100%;
+    }
+    .bofang-box {
+      top: 50%;
+      left: 50%;
+      width: 66rpx;
+      height: 66rpx;
+      position: absolute;
+      background: rgba($color: #000000, $alpha: 0.5);
+      transform: translateX(-50%) translateY(-50%);
+      border-radius: 50%;
+    }
+    .icon-bofang {
+      position: absolute;
+      color: #FFF;
+      font-size: 30rpx;
+      left: 50%;
+      top: 50%;
+      transform: translateX(-45%) translateY(-50%);
+    }
+    &-bd {
+      padding: 20rpx;
+      flex: 1;
+    }
+    &-title {
+      min-height: 80rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 40rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+    &-time {
+      display: inline-flex;
+      align-items: center;
+      background: linear-gradient(to right, #ff841a 0%, #ff640a 100%);
+      padding: 0 6rpx;
+      border-radius: 4rpx;
+    }
+    &-duration {
+      font-size: 20rpx;
+      color: #FFFFFF;
+      line-height: 30rpx;
+      margin-right: 4rpx;
+    }
+    &-animat {
+      align-items: flex-end;
+      height: 30rpx;
+      padding: 6rpx 0;
+      .heng1,
+      .heng2,
+      .heng3 {
+        display: block;
+        width: 4rpx;
+        border-radius: 4rpx;
+        margin-right: 3rpx;
+        background-color: #fff;
+      }
+      
+      
+      .heng1 {
+        height: 18rpx;
+        animation: hengos .8s linear infinite;
+      }
+      
+      .heng2 {
+        height: 8rpx;
+        animation: hengts .8s linear  infinite;
+      }
+      .heng3 {
+        height: 18rpx;
+        animation: henghs .8s linear .2s infinite;
+        margin-right: 0;
+      }
+    }
+    &-goods {
+      margin-top: 16rpx;
+      background: #FFF;
+      border-radius: 12rpx;
+      padding: 8rpx 14rpx;
+      width: 100%;
+      box-sizing: border-box;
+      .goods-img {
+        width: 122rpx;
+        height: 122rpx;
+        flex-shrink: 0;
+        border-radius: 10rpx;
+      }
+      .goods-bd {
+        flex: 1;
+        max-width: 200rpx;
+        height: 122rpx;
+        margin-left: 10rpx;
+      }
+      .goods-title {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+      .goods-bot {
+        justify-content: space-between;
+      }
+      .goods-price {
+        font-size: 22rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: 32rpx;
+        &__num {
+          margin-left: 4rpx;
+          font-size: 30rpx;
+          line-height: 44rpx;
+        }
+      }
+      .goods-more {
+        width: 30rpx;
+        height: 30rpx;
+        border-radius: 50%;
+        background: linear-gradient(323deg, #FF5E07 0%, #FF9F28 100%);
+        position: relative;
+        &::before {
+          content: "";
+          position: absolute;
+          left: 0;
+          top: 50%;
+          width: 12rpx;
+          height: 12rpx;
+          border-top: 1rpx solid #FFFFFF;
+          border-right: 1rpx solid #FFFFFF;
+          transform: rotate(45deg) translateY(-72%);
+        }
+      }
+    }
+  }
+
+  .live-s-t {
+    width: 308rpx;
+    height: 120rpx;
+    padding: 6rpx 16rpx;
+    border-radius: 12rpx;
+    background-color: #fff;
+    left: 15rpx;
+    bottom: 15rpx;
+    z-index: 3;
+
+    .s-t-img {
+      width: 86rpx;
+      height: 86rpx;
+      border-radius: 12rpx;
+    }
+
+    .tx-bx {
+      min-height: 43px;
+      padding-left: 16rpx;
+      .tx-tl {
+        font-size: 24rpx;
+      }
+      .tx1 {
+        padding-top: 6rpx;
+        font-size: 20rpx;
+      }
+      .tx2 {
+        font-size: 28rpx;
+      }
+    }
+  }
+}
+	@keyframes hengos {
+		0%   {height: 18rpx;}
+		50%  {height: 8rpx;}
+		100% {height: 18rpx;}
+	}
+	@keyframes hengts {
+		0%   {height: 8rpx;}
+		50%  {height: 18rpx;}
+		100% {height: 8rpx;}
+	}
+	@keyframes henghs {
+		0%   {height: 18rpx;}
+		50%  {height: 8rpx;}
+		100% {height: 18rpx;}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-note.vue b/pagesA/themes/chengXinRuYi/components/themes-note.vue
new file mode 100644
index 0000000..0097b1d
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-note.vue
@@ -0,0 +1,156 @@
+<template>
+  <view class="themes-note">
+    <themes-chunk-title-two title="热门笔记"></themes-chunk-title-two>
+    <scroll-view
+      class="scroll-list"
+      :scroll-x="true"
+    >
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="scroll-list-item overflow-hd"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <view class="scroll-list-item-ct flex flex-colum overflow-hd">
+            <view class="note-s overflow-hd position-r">
+              <image class="note-img" :src="item.pic+'?x-oss-process=image/resize,m_fill,w_120,h_115'" mode="aspectFill"></image>
+            </view>
+            <view class="note-b-cnt flex flex1 flex-colum j-between">
+              <text class="note-title text-overflow-line font-w">{{
+                item.title
+              }}</text>
+              <view class="note-c-b flex al-item-center j-between">
+                <view class="note-c-b-l flex al-item-center">
+                  <image
+                    class="note-u-img border-rius-r"
+                    :src="item.headimg"
+                    mode="aspectFill"
+                  ></image>
+                  <text class="text-overflow-tx flex1">{{
+                    item.nickname
+                  }}</text>
+                </view>
+                <view class="note-c-b-r flex al-item-center">
+                  <text class="iconfont icon-aixin"></text>
+                  <text class="z-tx">{{ item.zan ? (item.zan >= 10000 ? (item.zan / 10000).toFixed(1) + '万': item.zan) : 0 }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import themesChunkTitleTwo from './themes-chunk-title-two.vue'
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitleTwo
+  },
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+  .scroll-list {
+    position: relative;
+    width: calc(100% + 28rpx);
+    right: -28rpx;
+    left: 0;
+    white-space: nowrap;
+    margin-top: 6rpx;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+
+    .scroll-list-item {
+      display: inline-block;
+      margin-right: 20rpx;
+      background-color: #fff;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 20rpx;
+      &:last-child {
+        margin-right: 28rpx;
+      }
+
+      .scroll-list-item-ct {
+        width: 320rpx;
+        height: 536rpx;
+
+        .note-s {
+          width: 100%;
+          height: 376rpx;
+
+          .note-img {
+            width: 100%;
+            height: 100%;
+          }
+
+          .note-hot {
+            left: 16rpx;
+            top: 14rpx;
+            line-height: 34rpx;
+
+            .note-hot-img {
+              width: 110rpx;
+              height: 34rpx;
+            }
+            .note-hot-tx {
+              font-size: 20rpx;
+            }
+          }
+        }
+
+        .note-b-cnt {
+          width: 100%;
+          padding: 22rpx 16rpx 20rpx;
+          white-space: normal;
+          .note-title {
+          }
+
+          .note-c-b {
+            font-size: 28rpx;
+            color: #999;
+            margin-top: 18rpx;
+            .note-c-b-l {
+              width: 60%;
+              .note-u-img {
+                width: 36rpx;
+                height: 36rpx;
+                margin-right: 10rpx;
+              }
+            }
+            .note-c-b-r {
+              .icon-aixin {
+                font-size: 28rpx;
+              }
+              .icon-aixin_shixin {
+                font-size: 28rpx;
+              }
+              .z-tx {
+                padding-left: 6rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-recommend.vue b/pagesA/themes/chengXinRuYi/components/themes-recommend.vue
new file mode 100644
index 0000000..7457a4c
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-recommend.vue
@@ -0,0 +1,178 @@
+<template>
+  <view class="themes-recommend">
+    <themes-chunk-title-two title="精选商品"></themes-chunk-title-two>
+    <block
+      class="themes-recommend__list"
+      v-for="(item, idx) in shopProduct"
+      :key="idx"
+    >
+      <view
+        class="themes-recommend__item"
+        @click="goto"
+        :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+      >
+        <view class="themes-recommend__item-tab" :style="'background: url(' + event_rul + '/static/theme/tag-bg.svg);background-size: contain;background-repeat:no-repeat;'">抢鲜价</view>
+        <view class="themes-recommend__item-hd">
+          <image
+            class="themes-recommend__item-img"
+            :src="item.pic"
+            mode="aspectFill"
+          ></image>
+        </view>
+        <view class="themes-recommend__item-bd">
+          <view class="themes-recommend__item-title">{{ item.name }}</view>
+          <view class="themes-recommend__item-price">
+            <text class="themes-recommend__item-symbol">¥</text>
+            <text class="themes-recommend__item-num">{{ item.sell_price }}</text>
+          </view>
+          <view
+            class="themes-recommend__item-btn"
+            @click.stop="buydialogChange"
+            :data-proid="item.proid"
+            >立即抢购</view
+          >
+        </view>
+      </view>
+    </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+import themesChunkTitleTwo from './themes-chunk-title-two.vue'
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitleTwo
+  },
+  props: {
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    menuindex: {
+      default: -1,
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {
+    // console.log(this.shopProduct)
+  },
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-recommend {
+  &__list {
+    border-radius: 10rpx;
+    overflow: hidden;
+    &:not(last-child) {
+      margin-top: 28rpx;
+    }
+  }
+  &__item {
+    display: flex;
+    position: relative;
+    height: 296rpx;
+    margin-top: 6rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.03);
+    border-radius: 20rpx;
+    padding: 40rpx 28rpx 0 30rpx;
+    &-tab {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 76rpx;
+      height: 108rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 26rpx;
+      padding: 6rpx 20rpx 0;
+      z-index: 1;
+    }
+    &-hd {
+      width: 242rpx;
+      height: 242rpx;
+      flex-shrink: 0;
+    }
+    &-img {
+      width: 100%;
+      height: 100%;
+    }
+    &-bd {
+      flex: 1;
+      padding: 0 0 40rpx 36rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+    &-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 3;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+
+    }
+    &-price {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #ED5925;
+      line-height: 50rpx;
+    }
+    &-symbol {
+      font-size: 24rpx;
+      line-height: 34rpx;
+      margin-right: 6rpx;
+    }
+    &-btn {
+      position: absolute;
+      bottom: 28rpx;
+      right: 28rpx;
+      background: linear-gradient(to right, #FF9F28 0%, #FF5E07 100%);
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 50rpx;
+      border-radius: 6rpx;
+      padding: 0 22rpx;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-shop.vue b/pagesA/themes/chengXinRuYi/components/themes-shop.vue
new file mode 100644
index 0000000..263145a
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-shop.vue
@@ -0,0 +1,162 @@
+<template>
+  <view class="themes-shops">
+    <view class="shops-box">
+      <view class="flex flex-w shop-item">
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-cont bg-color-white overflow-hd"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-cont__hd flex j-center al-item-center">
+              <image
+                class="shops-img"
+                :src="item.pic"
+                mode="widthFix"
+              ></image>
+            </view>
+            <view class="item-info">
+              <view class="shops-c-t text-overflow-line">{{ item.name }}</view>
+              <view class="shops-b-t flex al-item-center j-between">
+                <view class="item-info__price">
+                  <text class="b-t1 flex al-item-center"
+                    >¥<text class="b-t2 font-w">{{ item.sell_price }}</text>
+                  </text>
+                  <view class="shops-s-t">已售 {{ item.sales ? (item.sales >= 10000 ? (item.sales / 10000).toFixed(1) + '万': item.sales) : 0 }}</view>
+                </view>
+                <view
+                  class="car flex border-rius-r al-item-center j-center"
+                  @click.stop="buydialogChange"
+                  :data-proid="item.proid"
+                >
+                  <text class="iconfont icon-gouwuche1"></text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  props: {
+    isShowTitle: { type: Boolean, default: false },
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-shops {
+  padding: 22rpx 0 20rpx;
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    width: 49%;
+    box-sizing: border-box;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+    border-radius: 10rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &__hd {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+    }
+
+    .shops-img {
+      width: 100%rpx;
+      height: 260rpx;
+    }
+    .item-info {
+      padding: 24rpx 20rpx;
+      width: 100%;
+    }
+    .shops-c-t {
+      min-height: 72rpx;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+    }
+    .shops-s-t {
+      display: flex;
+      align-items: center;
+      margin-top: 2rpx;
+      font-size: 18rpx;
+      color: #999999;
+      line-height: 22rpx;
+    }
+    .shops-b-t {
+      padding-top: 28rpx;
+
+      .b-t1 {
+        color: #ED5925;
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 36rpx;
+        margin-left: 6rpx;
+      }
+      .car {
+        width: 54rpx;
+        height: 54rpx;
+        background: #ff8e1f;
+
+        .icon-gouwuche1 {
+          color: #fff;
+          font-size: 36rpx;
+          line-height: 44rpx;
+          height: 48rpx;
+        }
+      }
+    }
+  }
+  .shops-cont:nth-child(2n) {
+    // margin-left: calc(100% - 680rpx);
+    margin-left: 2%;
+  }
+  .shops-cont:nth-child(n + 3) {
+    margin-top: 20rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-tuangou-item.vue b/pagesA/themes/chengXinRuYi/components/themes-tuangou-item.vue
new file mode 100644
index 0000000..5678112
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-tuangou-item.vue
@@ -0,0 +1,200 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:48%;margin-right:'+(index%2==0?'4%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" >
+			<view class="" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+				<view class="product-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+					<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+				</view>
+				<view class="product-info">
+					<view class="p1" v-if="showname == 1">{{item.name}}</view>
+					<view class="p2">
+						<view class="p2-1" v-if="showprice != '0'">
+							<text class="t1" :style="{color:'#ED5925'}"><text style="font-size:24rpx">低至￥</text>{{item.min_price}}</text>
+							<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+						</view>
+					</view>
+					<view class="p3" v-if="showsales=='1' && item.sales>0">已售{{item.sales}}件</view>
+					<view class="p4 flex border-rius-r al-item-center j-center" :style="{background:'#ff8e1f'}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon-gouwuche1"></text></view>
+					<view class="p4" :style="{background:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+				</view>
+			</view>
+			<view class="overdue" v-if="item.endtime < timestamp">
+				<image class="overdue-img" :src="event_rul + '/static/theme/isOver.png'" mode="widthFix"></image>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 0,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  props: {
+    showstyle: { default: 2 },
+    menuindex: { default: -1 },
+    saleimg: { default: "" },
+    showname: { default: 1 },
+    namecolor: { default: "#333" },
+    showprice: { default: "1" },
+    showsales: { default: "1" },
+    showcart: { default: "1" },
+	timestamp:{ default: 0 },
+    cartimg: {
+      default: app.globalData.event_url + "/static/img/static/imgsrc/cart.svg",
+    },
+    data: {},
+    idfield: { default: "id" },
+  },
+  methods: {
+    buydialogChange: function (e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+      console.log(this.buydialogShow);
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.dp-tuangou-item {
+  height: auto;
+  position: relative;
+  overflow: hidden;
+  padding: 0rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 24rpx;
+}
+.dp-tuangou-item .item {
+  display: inline-block;
+  position: relative;
+  margin-bottom: 12rpx;
+  background: #fff;
+  border-radius: 10rpx;
+  overflow: hidden;
+  // border: 1rpx solid rgba(0, 0, 0, 0.08);
+  box-shadow: 0rpx 4rpx 4rpx 0rpx rgba(0,0,0,0.0300);
+}
+.dp-tuangou-item .product-pic {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  background: #ffffff;
+  padding-bottom: 100%;
+  position: relative;
+}
+.dp-tuangou-item .product-pic .image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: auto;
+}
+.dp-tuangou-item .product-pic .saleimg {
+  position: absolute;
+  width: 60px;
+  height: auto;
+  top: -3px;
+  left: -3px;
+}
+.dp-tuangou-item .product-info {
+  padding: 20rpx 20rpx;
+  position: relative;
+}
+.dp-tuangou-item .product-info .p1 {
+  color: #323232;
+  font-weight: bold;
+  font-size: 26rpx;
+  line-height: 36rpx;
+  margin-bottom: 10rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  height: 72rpx;
+}
+.dp-tuangou-item .product-info .p2 {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  padding: 2px 0;
+}
+.dp-tuangou-item .product-info .p2-1 {
+  flex-grow: 1;
+  flex-shrink: 1;
+  height: 40rpx;
+  line-height: 40rpx;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.dp-tuangou-item .product-info .p2-1 .t1 {
+  font-size: 36rpx;
+  color: #efbd6f;
+}
+.dp-tuangou-item .product-info .p2-1 .t2 {
+  margin-left: 10rpx;
+  font-size: 24rpx;
+  color: #aaa;
+  text-decoration: line-through; /*letter-spacing:-1px*/
+}
+.dp-tuangou-item .product-info .p2-2 {
+  font-size: 20rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: right;
+  padding-left: 20rpx;
+  color: #999;
+}
+.dp-tuangou-item .product-info .p3 {
+  color: #999999;
+  font-size: 20rpx;
+  margin-top: 10rpx;
+}
+.dp-tuangou-item .product-info .p4 {
+  color: #fff;
+  width: 54rpx;
+  height: 54rpx;
+  border-radius: 50%;
+  position: absolute;
+  display: relative;
+  bottom: 20rpx;
+  right: 20rpx;
+  text-align: center;
+}
+.dp-tuangou-item .product-info .p4 .icon-gouwuche1 {
+  font-size: 36rpx;
+  height: 48rpx;
+  line-height: 44rpx;
+}
+.dp-tuangou-item .product-info .p4 .img {
+  width: 100%;
+  height: 100%;
+}
+.overdue {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, .2);
+	.overdue-img {
+		width: 174rpx;
+		position: absolute;
+		top: 230rpx;
+		right: 2rpx;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-tuangou.vue b/pagesA/themes/chengXinRuYi/components/themes-tuangou.vue
new file mode 100644
index 0000000..ec47bd4
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-tuangou.vue
@@ -0,0 +1,130 @@
+<template>
+	<view class="themes-miao-s bg-color-white">
+		<themes-chunk-title title="团购活动" :iconSrc="event_rul + '/static/images/icon-activity1.svg'" tengtx="group purchase"></themes-chunk-title>
+		<scroll-view :scroll-x="true" class="miao-cont">
+			<block v-for="item in shopTuangou" :key="item.id">
+				<view class="miao-cont__item al-item-center flex-colum j-between" @click="goto"
+				:data-url="'/activity/tuangou/product?id=' + item.proid">
+					<image class="miao-cont__item-img" :src="item.pic" mode="aspectFill"></image>
+					<view class="miao-cont__item-title">{{ item.name }}</view>
+					<view class="miao-cont__item-bottom">
+						<view class="miao-cont__item-price">
+							<view class="miao-cont__item-current"><text class="price-symbol">低至¥</text><text>{{ item.min_price }}</text></view>
+							<view class="miao-cont__item-original"><text class="price-symbol">¥</text><text>{{ item.sell_price }}</text></view>
+						</view>
+						<text class="iconfont icon-jiahao"></text>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	
+	var app = getApp();
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopTuangou: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data(){
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-miao-s {
+		width: 100%;
+		margin-top: 28rpx;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 0 0 30rpx 30rpx;
+		.miao-cont {
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			&__item {
+				width: 220rpx;
+				flex-shrink: 0;
+				margin-right: 40rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				display: inline-flex;
+				&:last-child {
+					margin-right: 30rpx;
+				}
+				&-img {
+					width: 156rpx;
+					height: 156rpx;
+					margin-bottom: 16rpx;
+				}
+				&-title {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 36rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					/* autoprefixer: ignore next */
+					-webkit-box-orient: vertical;
+					text-align: justify;
+					white-space: pre-wrap;
+					word-break: break-all;
+
+				}
+				&-bottom {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					margin-top: 4rpx;
+				}
+				&-price {
+					display: flex;
+					align-items: flex-end;
+				}
+				&-current {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #ED5925;
+					line-height: 50rpx;
+					.price-symbol {
+						font-size: 22rpx;
+						line-height: 32rpx;
+						margin-right: 4rpx;
+					}
+				}
+				&-original {
+					margin: 0 0 6rpx 4rpx;
+					font-size: 20rpx;
+					font-weight: 500;
+					color: #999999;
+					line-height: 28rpx;
+					text-decoration: line-through;
+				}
+				.icon-jiahao {
+					font-size: 44rpx;
+					color: #ff871c;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/components/themes-vip.vue b/pagesA/themes/chengXinRuYi/components/themes-vip.vue
new file mode 100644
index 0000000..c5ae321
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/components/themes-vip.vue
@@ -0,0 +1,85 @@
+<template>
+  <view class="head-new-vu flex al-item-center">
+    <swiper
+      class="swiper-box"
+      vertical="true"
+      autoplay="true"
+      circular="true"
+      :indicator-dots="false"
+      :auto-play="true"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopNotice"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <view class="new-cnt">
+          <image class="notice-icon" :src="noticeIcon ? noticeIcon:event_rul + '/static/theme/note-icon.svg'"></image>
+          <view class="notice-txt">{{ item.title }}</view>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  props: {
+    noticeIcon: {
+      type: String,
+      default: '',
+    },
+    shopNotice: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.head-new-vu {
+  width: 100%;
+  height: 80rpx;
+  margin-top: 16rpx;
+  border-radius: 10rpx;
+  background: #FFF;
+  padding: 0 20rpx;
+  .swiper-box,.swiper-item {
+    width: 100%;
+    height: 100%;
+  }
+
+  .new-cnt {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    .notice-icon {
+      width: 50rpx;
+      height: 50rpx;
+      flex-shrink: 0;
+      margin-right: 12rpx;
+    }
+    .notice-txt {
+      flex: 1;
+      color: #666;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/goods.vue b/pagesA/themes/chengXinRuYi/goods.vue
new file mode 100644
index 0000000..7856950
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/goods.vue
@@ -0,0 +1,119 @@
+<template>
+  <view class="themes-goods position-a"
+        :style="{ height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view :class="{'themes-goods__content' : !nodata}">
+      <view class="nav-list flex j-between al-item-center">
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="!field || field == 'sort' ? 'color:#FB5E00' : ''"
+          data-field="sort"
+          data-order="desc"
+          >推荐</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'sales' ? 'color:#FB5E00' : ''"
+          data-field="sales"
+          data-order="desc"
+          >销量</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'createtime' ? 'color:#FB5E00' : ''"
+          data-field="createtime"
+          data-order="desc"
+          >新品</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          data-field="sell_price"
+          :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+          <text :style="field == 'sell_price' ? 'color:#FB5E00' : ''"
+            >价格</text
+          >
+          <text
+            style="font-size: 26rpx"
+            class="iconfont icon-danbianjiantou1"
+            :style="{
+              color: field == 'sell_price' && order == 'asc' ? '#FB5E00' : '',
+            }"
+          ></text>
+          <text
+            style="font-size: 26rpx; margin-left: -10rpx"
+            class="iconfont icon-danbianjiantou"
+            :style="{
+              color: field == 'sell_price' && order == 'desc' ? '#FB5E00' : '',
+            }"
+          ></text>
+        </view>
+      </view>
+      <scroll-view
+        class="scroll-list"
+        :scroll-y="true"
+        v-if="shopSelPro && shopSelPro.length > 0"
+      >
+        <themes-shop
+          :mgtop="0"
+          :mgright="30"
+          :mgleft="30"
+          :mgbottom="2"
+          :shopProduct="shopSelPro"
+        ></themes-shop>
+        <nomore v-if="nomore"></nomore>
+      </scroll-view>
+    </view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/goods.js";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-goods {
+  background: #FAF8F8;
+  left: 0;
+  right: 0;
+  border-radius: 10rpx 10rpx 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+.themes-goods__content {
+	height: 100%;
+}
+.nav-list {
+  height: 80rpx;
+  padding: 28rpx 30rpx 12rpx;
+
+  .selec {
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  height: calc(100% - 80rpx);
+  padding: 0 28rpx 30rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/index.vue b/pagesA/themes/chengXinRuYi/index.vue
new file mode 100644
index 0000000..143bd93
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/index.vue
@@ -0,0 +1,76 @@
+<template>
+  <view class="themes-default">
+    <image
+      class="themes-default__img"
+      :src="shopData.bgimg
+          ? shopData.bgimg
+          : event_rul + '/static/images/df-bg.png'
+      "
+      mode="widthFix"
+    ></image>
+    <!-- 头部 -->
+    <themes-head
+      :navHeight="navHeight"
+      @navselect="navHeadSelect"
+      :navList="navList"
+      :navIndex="navIndex"
+      :shopData="shopData"
+    ></themes-head>
+    <view class="themes-content position-r">
+      <Choiceness v-if="tabArr.indexOf(0) > -1" v-show="navIndex === 0"></Choiceness>
+      <Goods v-if="tabArr.indexOf(1) > -1" v-show="navIndex === 1" :hearHeight="hearHeight"></Goods>
+      <Activity v-if="tabArr.indexOf(2) > -1" v-show="navIndex === 2" :hearHeight="hearHeight"></Activity>
+      <new-product v-if="tabArr.indexOf(3) > -1" v-show="navIndex === 3" :hearHeight="hearHeight"></new-product>
+    </view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/index.js";
+import themesHead from "./components/themes-head.vue";
+import Choiceness from "./choiceness.vue";
+import Activity from "./activity.vue";
+import newProduct from "./newProduct.vue";
+import Goods from "./goods.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    Choiceness,
+    Activity,
+    newProduct,
+    Goods,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-default {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #FAF8F8;
+  position: relative;
+  z-index: 1;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    height: 622rpx;
+  }
+}
+.themes-content {
+  flex: 1;
+  z-index: 2;
+  padding: 0 28rpx 40rpx;
+  margin-top: 16rpx;
+  position: relative;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/newProduct.vue b/pagesA/themes/chengXinRuYi/newProduct.vue
new file mode 100644
index 0000000..0ca5f14
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/newProduct.vue
@@ -0,0 +1,55 @@
+<template>
+  <view class="themes-newProduct position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <scroll-view
+      class="scroll-list"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopProduct && shopProduct.length > 0"
+    >
+      <themes-shop
+        :mgtop="0"
+        :mgright="30"
+        :mgleft="30"
+        :mgbottom="2"
+        :shopProduct="shopProduct"
+      ></themes-shop>
+      <nomore v-if="nomore"></nomore>
+    </scroll-view>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/newProduct.js";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-newProduct {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #FAF8F8;
+  padding: 0 24rpx;
+  border-radius: 10rpx 10rpx 0;
+  flex: 1;
+  left: 0;
+  right: 0;
+}
+.scroll-list {
+  flex: 1;
+  overflow-y: scroll;
+  padding-bottom: 40rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/chengXinRuYi/shop-detail.vue b/pagesA/themes/chengXinRuYi/shop-detail.vue
new file mode 100644
index 0000000..50a91e6
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/shop-detail.vue
@@ -0,0 +1,351 @@
+<template>
+  <view class="store-detail">
+    <view v-if="!loading">
+		<view class="flex">
+			<image class="img-logo" :src="info.logo" mode="aspectFill"></image>
+		</view>
+		<view class="detail-contetn">
+			<view class="content-h border-btm flex al-item-center">
+				<view class="h-l">
+					<view class="title">{{ info.name }}</view>
+					<view class="text-n fs12">{{ followCount || 0 }}人关注</view>
+				</view>
+				<view class="su"></view>
+				<view class="h-r flex ">
+					<view class="h-r__info flex flex-colum al-item-center" @click="followFn">
+						<!-- <image class="follow-icon" v-if="!shopInfo.isFollow" :src="event_rul + '/static/theme/follow-icon.svg'" mode="widthFix"></image> -->
+						<text class="iconfont" :class="{'isFollow icon-aixin_shixin': info.isFollow, 'icon-aixin': !info.isFollow}" style="font-size: 44rpx;color: #CE0000;"></text>
+						<text class="follow-tx fs12">{{info.isFollow ? "已关注" : "关注"}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.content">
+				<text class="iconfont icon-icon-themes-coupon"></text>
+				<view class="flex flex-colum">
+					<view class="title">店铺简介</view>
+					<view class="text fs12">{{ info.content }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.address">
+				<text class="iconfont icon-icon-location"></text>
+				<view class="flex flex-colum ">
+					<view class="title">店铺地址</view>
+					<view class="text fs12">{{ info.address }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.createtime">
+				<text class="iconfont icon-rilitianchong"></text>
+				<view class="flex flex-colum ">
+					<view class="title">开店时间</view>
+					<view class="text fs12">{{ info.createtime }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.start_hours || info.end_hours">
+				<text class="iconfont icon-icon-clock"></text>
+				<view class="flex flex-colum ">
+					<view class="title">营业时间</view>
+					<view class="text fs12">{{ info.start_hours || "" }}-{{ info.end_hours || "" }}</view>
+				</view>
+			</view>
+			<view class="content-t  flex al-item-center" v-show="info.tel">
+				<text class="iconfont icon-icon-phone"></text>
+				<view class="flex flex-colum ">
+					<view class="title">联系电话</view>
+					<view class="text fs12">{{ info.tel }}</view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" @tap="goback">去看看全部商品</button>
+    </view>
+    <loading v-else></loading>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      info: {},
+      loading: false,
+	  event_rul: app.globalData.event_url,
+	  followCount: 0,
+    shopData: uni.getStorageSync('header_data') || {}, 
+    };
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  created() {
+    this.loading = true;
+  },
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    goback() {
+      uni.navigateBack(1);
+    },
+    followFn() {
+      var that = this;
+
+      // 暂时写死follow_id：27，正确为 follow_id: that.opt.bid
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.opt.bid || "", type: "store" },
+        function (res) {
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo()
+          setTimeout(() => {
+            that.$set(that.shopData,'attention',that.info.fans_count);
+            that.$set(that.shopData,'isFollow',that.info.isFollow);
+            uni.setStorage({
+              key: "header_data",
+              data: that.shopData,
+            });
+          }, 200);
+        }
+      );
+    },
+	// 获取详情信息
+    getInfo() {
+      var that = this;
+      // 暂时写死id: 27,正确为 id: that.opt.bid
+      app.get(
+        "ApiBusiness/newIndex",
+        { id: that.opt.bid || "" },
+        function (res) {
+          that.info = res.business;
+		  that.followCount = res.followCount
+          that.loading = false;
+        }
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.store-detail {
+  letter-spacing: 2rpx;
+  color: #333;
+  
+  .img-logo {
+	  width: 100%;
+	  height: 400rpx;
+  }
+  .detail-contetn {
+	  padding: 0 40rpx;
+	  background-color: #fff;
+	  .content-h {
+		  padding: 28rpx 0;
+		  
+		  .h-l {
+			  width: 452rpx;
+			  padding-right: 10rpx;
+			 .title {
+				 font-weight: 500;
+			 	 font-size: 34rpx;
+			 }
+			 .text-n {
+			 	padding-top: 14rpx;
+				color: #666;
+				font-weight: 400;
+			 } 
+		  }
+		  .su {
+			  width: 2rpx;
+			  height: 56rpx;
+			  background-color: #FF5E5E;
+		  }
+		  .h-r {
+			  width: 180rpx;
+			  justify-content: flex-end;
+        &__info {
+          width: 80rpx;
+        }
+        .icon-aixin {
+          color: #666666;
+          &.isFollow {
+            color: #EB2407;
+          }
+        }
+			  
+			  .follow-icon {
+			    width: 44rpx;
+			  }
+			  .follow-tx {
+				  color: #666;
+			  }
+		  }
+	  }
+	  
+	  .content-t {
+		  padding: 20rpx 0;
+      .iconfont {
+        color: #FF8800;
+        font-size: 44rpx;
+        flex-shrink: 0;
+        margin-right: 26rpx;
+      }
+		  
+		  .title {
+			font-weight: 500;
+		  }
+		  .text {
+			  font-weight: 500;
+			  padding-top: 8rpx;
+			  color: #666;
+		  }
+	  }
+  }
+  .btn {
+    font-size: 36rpx;
+    // font-weight: bold;
+    width: 630rpx;
+    margin: 90rpx auto;
+    border-radius: 400rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-image: linear-gradient(to left, #FF5E07, #FF9F28);
+    color: #fff;
+  }
+  .border-btm {
+	  border-bottom: 2rpx solid #ECECEC;
+  }
+  
+  .attention {
+    padding: 30rpx 20rpx;
+
+    .attention-box {
+      padding: 30rpx 20rpx;
+      background: #fff;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      border-radius: 10rpx;
+
+      .attention-l {
+        display: flex;
+        align-items: center;
+
+        .attention-l-img {
+          width: 120rpx;
+          height: 120rpx;
+          border-radius: 16rpx;
+          flex-shrink: 0;
+        }
+        .attention-l-text {
+          height: 100%;
+          padding-left: 20rpx;
+          display: flex;
+          flex-direction: column;
+          .attention-l-title {
+            font-size: 30rpx;
+            font-weight: bold;
+          }
+          .attention-l-text-s {
+            padding-top: 10rpx;
+            display: flex;
+            align-items: center;
+            font-size: 24rpx;
+            color: #bdbdbd;
+
+            .icon_arrow_right {
+              padding-left: 20rpx;
+            }
+          }
+        }
+      }
+      .attention-r {
+        width: 120rpx;
+        height: 54rpx;
+        line-height: 54rpx;
+        text-align: center;
+        flex-shrink: 0;
+        border-radius: 8rpx;
+        &.isFollow {
+          background-color: #efbd6f;
+          color: #FFF;
+        }
+        &.followed {
+          color: #efbd6f;
+          position: relative;
+          &::before {
+            content: "";
+              position: absolute;
+              left: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #efbd6f;
+              box-sizing: border-box;
+              transform: scale(0.5,0.5);
+              border-radius: 16rpx;
+              transform-origin: 0 0;
+          }
+        }
+      }
+    }
+  }
+
+  .store-detail-conten {
+    padding: 0 20rpx;
+    .detail-conten-b {
+      display: flex;
+      flex-direction: column;
+      border-radius: 10rpx;
+      background-color: #fff;
+
+      .detail-conten-c {
+        min-height: 400rpx;
+        padding: 0 20rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-evenly;
+      }
+      .detail-conten-t {
+        display: flex;
+        // align-items: center;
+        .detail-conten-t-tilt {
+          width: 150rpx;
+          font-weight: bold;
+          font-size: 30rpx;
+        }
+
+        .detail-conten-t-text {
+          flex: 1;
+          // color: #bdbdbd;
+          padding-top: 4rpx;
+          // font-weight: bold;
+          color: #111111;
+        }
+      }
+
+      .btn {
+        font-size: 30rpx;
+        font-weight: bold;
+        width: 650rpx;
+        margin: 30rpx auto;
+        border-radius: 400rpx;
+        height: 70rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-image: linear-gradient(to right, #fbd89e, #eec071);
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/pagesA/themes/chengXinRuYi/themes-search.vue b/pagesA/themes/chengXinRuYi/themes-search.vue
new file mode 100644
index 0000000..28fe199
--- /dev/null
+++ b/pagesA/themes/chengXinRuYi/themes-search.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="themes-search">
+		<view class="search-head">
+			<view class="head-b flex al-item-center border-rius-r">
+				<text class="iconfont icon-search"></text>
+				<input v-model="keyword" placeholder="商品搜索" placeholder-style="font-size:28rpx;" @confirm="searchConfirm" />
+        <text class="iconfont icon-shanchu" @click="delKeywordtex"></text>
+			</view>
+		</view>
+		<view class="search-content">
+			<view class="nav-list flex j-between al-item-center">
+				<view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="!field || field == 'sort' ? 'color: #FB5E00' : ''"
+            data-field="sort"
+            data-order="desc"
+            >推荐</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'sales' ? 'color: #FB5E00' : ''"
+            data-field="sales"
+            data-order="desc"
+            >销量</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'createtime' ? 'color: #FB5E00' : ''"
+            data-field="createtime"
+            data-order="desc"
+            >新品</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            data-field="sell_price"
+            :data-order="order == 'asc' ? 'desc' : 'asc'"
+          >
+            <text :style="field == 'sell_price' ? 'color: #FB5E00' : ''"
+              >价格</text
+            >
+            <text
+              style="font-size: 26rpx"
+              class="iconfont icon-danbianjiantou1"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'asc' ? '#FB5E00' : '',
+              }"
+            ></text>
+            <text
+              style="font-size: 26rpx; margin-left: -10rpx"
+              class="iconfont icon-danbianjiantou"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'desc' ? '#FB5E00' : '',
+              }"
+            ></text>
+          </view>
+			</view>
+		</view>
+		<scroll-view class="scroll-list lise-h" :scroll-y="true" @scrolltolower="getmorecomment" >
+			<themes-shop :shopProduct="shopProduct" :mgtop="0" :mgright="30" :mgleft="30" :mgbottom="2"></themes-shop>
+		<loading v-if="loading"></loading>
+        <nomore v-if="nomore"></nomore>
+        <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+		</scroll-view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+import { myMixin } from '../logic/search.js';
+import themesShop from "../chengXinRuYi/components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss">
+.themes-search {
+  height: 100vh;
+  overflow-y: hidden;
+  display: flex;
+  flex-direction: column;
+  background: #F4F4F4;
+  ::v-deep .classify-shops {
+    .shops-item {
+      padding: 24rpx 40rpx 12rpx 20rpx;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 10rpx;
+      border-bottom: 0;
+      margin-bottom: 20rpx;
+    }
+  }
+  .search-head {
+    width: 100%;
+    height: 74rpx;
+    padding: 10rpx 28rpx 0;
+    flex-shrink: 0;
+    background: #FFF;
+    .head-b {
+      width: 100%;
+      height: 100%;
+      padding: 0 12rpx;
+      background-color: #F7F7F7;
+
+      .icon-search {
+        color: #ABABAB;
+        font-size: 50rpx;
+        flex-shrink: 0;
+      }
+      input {
+        flex: 1;
+        font-size: 28rpx;
+        line-height: 40rpx;
+        margin-left: 14rpx;
+        color: #333333;
+      }
+      .icon-shanchu {
+        font-size: 40rpx;
+        color: #cccccc;
+      }
+    }
+  }
+
+  .search-content {
+    flex-shrink: 0;
+    background: #FFFFFF;
+    .nav-list {
+      height: 100rpx;
+      padding: 34rpx 32rpx 34rpx 40rpx;
+
+      .selec {
+        // font-size: 32rpx;
+        transform: scale(1.2);
+      }
+    }
+  }
+
+  .scroll-list {
+    flex: 1;
+    overflow-y: scroll;
+    padding: 20rpx 28rpx;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/activity.vue b/pagesA/themes/default/activity.vue
new file mode 100644
index 0000000..4841e0e
--- /dev/null
+++ b/pagesA/themes/default/activity.vue
@@ -0,0 +1,352 @@
+<template>
+  <view class="themes-activity position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view class="content" >
+		<view class="title-box flex j-center" >
+			<view class="flex">
+				<image class="t-bg-l" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+				<text class="t-bg-c "  mode="widthFix">团购活动</text>
+				<image class="t-bg-r" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+			</view>
+		</view>
+      
+      <view class="nav-list flex j-between al-item-center">
+      
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="!field || field == 'sort' ? 'color:' + '#0A5D3B' : ''"
+        data-field="sort"
+        data-order="desc"
+        >推荐</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="field == 'sales' ? 'color:' + '#0A5D3B' : ''"
+        data-field="sales"
+        data-order="desc"
+        >销量</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        data-field="sell_price"
+        :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+        <text :style="field == 'sell_price' ? 'color:' + '#0A5D3B' : ''"
+          >价格</text
+        >
+        <text
+          style="font-size: 26rpx"
+          class="iconfont icon-danbianjiantou1"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'asc' ? '#0A5D3B' : '#999',
+          }"
+        ></text>
+        <text
+          style="font-size: 26rpx; margin-left: -10rpx"
+          class="iconfont icon-danbianjiantou"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'desc' ? '#0A5D3B' : '#999',
+          }"
+        ></text>
+        </view>
+        <view @tap="open" >筛选 <text class="iconfont icon-shaixuan" style="font-size: 26rpx; margin-left: 4rpx;color: #999;"></text></view>
+      </view>
+    </view>
+    <scroll-view
+      class="scroll-list lise-t"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopTuangou && shopTuangou.length > 0"
+    >
+      <themes-tuangou-item v-if="isActivity" :data="shopTuangou" :timestamp="timestamp" :menuindex="menuindex"></themes-tuangou-item>
+<!--      <themes-shop
+        :mgtop="0"
+        :mgright="30"
+        :mgleft="30"
+        :mgbottom="2"
+        v-else
+        :shopProduct="shopTuangou"
+      ></themes-shop> -->
+		<view class="flex flex-colum" v-else>
+			<image class="n-thing" :src="event_rul + '/static/images/n-thing.png'" mode="widthFix"></image>
+			<view class="text-center color-gray">暂无活动～</view>
+		</view>
+    </scroll-view>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')"></view>
+		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer,}" :style="{ width: drawerWidth + 'vw' }">
+			<view class="bolting-box">
+			<view class="name">筛选</view>
+			<view class="title">商品分类</view>
+			<view class="content flex flex-w">
+			<view class="content-itm">
+			  <view class="text" :style="{color: boltingListIndex === 0 ? '#0A5D3B' : '',backgroundColor: boltingListIndex === 0 ? '#E2F7EF' : '#F7F7F7 ',}" @tap="bolting(0)">
+				  全部
+			  </view>
+			  <block v-for="(item, idx) in boltingList" :key="idx">
+				<view class="text" v-show="boltingList.length != 0" :style="{color: boltingListIndex === idx + 1 ? '#0A5D3B' : '', backgroundColor: boltingListIndex === idx + 1 ? '#E2F7EF' : '#F7F7F7 ', }" @tap="bolting(idx + 1)">
+					{{ item.name }}
+				</view>
+			  </block>
+			</view>
+	      </view>
+	      <view class="bolting-box-b flex j-between">
+	        <view class="res btn" @tap="boltingAll()">重置</view>
+	        <view class="comf btn " :style="{ 'background-color': 'linear-gradient(to right, #00AE68 , #096742 );' }" @tap="filterConfirm(cpid)" >确定</view>
+		  </view>
+	    </view>
+	  </view>
+	</view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/activity.js';
+import themesHead from "./components/themes-head.vue";
+import themesShop from "./components/themes-shop.vue";
+import themesTuangouItem from "./components/themes-tuangou-item.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesShop,
+    themesTuangouItem
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-activity {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #F4F4F4 ;
+  overflow: hidden;
+  border-radius: 20rpx 20rpx 0 0;
+  
+  left: 0;
+  right: 0;
+}
+.content {
+	
+}
+.title-box {
+	height: 84rpx;
+	align-items: center;
+	background: linear-gradient(180deg, #C2E5D8 0%, rgba(255,255,255,0) 100%);
+	.t-bg-l{
+		width: 40rpx;
+		margin: 6rpx 0rpx 0 0;
+	}
+	.t-bg-c {
+		// font-style: italic;
+		font-size: 36rpx;
+		color: #0A5D3B;
+		// letter-spacing: 2px;
+	}
+	.t-bg-r {
+		width: 40rpx;
+		margin: 6rpx 0 0 8rpx;
+	}
+}
+.nav-list {
+  flex-shrink: 0;
+  height: 80rpx;
+  padding: 34rpx 30rpx 34rpx;
+  .actived {
+    color: #CE0000;
+  }
+  .selec {
+    // font-size: 32rpx;
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  height: calc(100% - 156rpx);
+  overflow-y: scroll;
+  // padding: 14rpx 0 20rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+.n-thing {
+	width: 282rpx;
+	margin: 100rpx auto 0;
+}
+.lise-t {
+  // height: calc(100% - 140rpx);
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+
+.select-box {
+  width: 100%;
+  height: calc(100% - 80rpx);
+  position: absolute;
+  left: 0;
+  top: 80rpx;
+  .select-mxk {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 66;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+
+  .select-box-content {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 68;
+
+    .content-item {
+      border-top: 2rpx solid #f2f2f4;
+    }
+  }
+}
+// 筛选
+.uni-drawer {
+  height: 100%;
+  width: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  // top: 0;
+  // left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+  z-index: 999;
+}
+
+.uni-drawer__content {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  top: 0;
+  width: 220px;
+  bottom: 0;
+  background-color: #ffffff;
+  transition: transform 0.3s ease;
+}
+
+.uni-drawer--left {
+  right: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(-220px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(100%);
+  /* #endif */
+}
+
+.uni-drawer--right {
+  right: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(220px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(-100%);
+  /* #endif */
+}
+
+.uni-drawer__content--visible {
+  transform: translateX(0px);
+}
+
+.uni-drawer__mask {
+  width: 100%;
+  height: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 0;
+  position: absolute;
+  // top: 0;
+  // left: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  transition: opacity 0.3s;
+}
+
+.uni-drawer__mask--visible {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 1;
+}
+
+.bolting-box {
+  padding: 30rpx;
+
+  .name {
+	// padding: 30rpx 28rpx 6rpx;
+    font-size: 32rpx;
+  }
+  .title {
+   padding: 28rpx 0;
+   font-size: 24rpx;
+   color: #999;
+  }
+  .content {
+    width: 100%;
+	min-height: 186rpx;
+	// padding: 0 28rpx;
+	
+	.content-itm {
+		
+	}
+    .text {
+	  width: 150rpx;
+	  height: 60rpx;
+	  line-height: 60rpx;
+	  text-align: center;
+      margin-right: 20rpx;
+      margin-bottom: 30rpx;
+	  font-size: 24rpx;
+      // padding: 8rpx 16rpx;
+      border-radius: 4rpx;
+      // background-color: #FFDCD9;
+    }
+  }
+  .bolting-box-b {
+    width: 100%;
+	// height: 96rpx;
+    padding-top: 60rpx;
+    border-top: 2rpx solid #ECECEC;
+    .btn {
+      width: 214rpx;
+      height: 60rpx;
+      line-height: 60rpx;
+      text-align: center;
+      border-radius: 6rpx;
+    }
+    .res {
+		// width: 200rpx;
+        border: 2rpx solid #ECECEC;
+    }
+    .comf {
+		color: #fff;
+		
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/choiceness.vue b/pagesA/themes/default/choiceness.vue
new file mode 100644
index 0000000..f58b437
--- /dev/null
+++ b/pagesA/themes/default/choiceness.vue
@@ -0,0 +1,95 @@
+<template>
+  <view class="themes-choiceness">
+<!--    <themes-vip
+      v-if="shopNotice.length != 0"
+      :shopNotice="shopNotice"
+      :noticeIcon="shopData.noticeIcon"
+    ></themes-vip> -->
+
+    <!-- 优惠 -->
+    <themes-coupon-one
+      v-if="shopCoupon && shopCoupon.length > 0"
+      :shopCoupon="shopCoupon"
+    ></themes-coupon-one>
+    <!-- 视频 -->
+    <themes-live
+      v-if="shopVideo && shopVideo.length > 0"
+      :shopVideo="shopVideo"
+	  :shopNotice="shopNotice"
+    ></themes-live>
+    <!-- 菜单 -->
+    <themes-hot
+      v-if="shopMenu && shopMenu.length > 0"
+      :shopMenu="shopMenu"
+      :isShowDots="isShowDots"
+    ></themes-hot>
+	<!-- 团购 -->
+	<themes-tuangou
+	  v-if="shopTuangou && shopTuangou.length > 0"
+	  :shopTuangou="shopTuangou"
+	  :top="true"
+	></themes-tuangou>
+    <!-- 笔记 -->
+    <themes-note
+      v-if="shopNote && shopNote.length > 0"
+      :shopNote="shopNote"
+    ></themes-note>
+    <!-- banner -->
+<!--    <themes-banner
+      v-if="shopBanner.length != 0"
+      :shopBanner="shopBanner"
+    ></themes-banner> -->
+    <!-- 精选商品 -->
+	<themes-recommend
+	  v-if="shopProduct && shopProduct.length > 0"
+	  :shopProduct="shopProduct"
+	></themes-recommend>
+	
+	<!-- 推荐商品 -->
+    <themes-shop
+      v-if="shopSelPro && shopSelPro.length > 0"
+      :shopProduct="shopSelPro"
+      :isShowTitle="true"
+    ></themes-shop>
+    
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/choiceness.js";
+import themesHead from "./components/themes-head.vue";
+import themesVip from "./components/themes-vip.vue";
+import themesCouponOne from "./components/themes-coupon-one.vue";
+import themesCimg from "./components/themes-c-img.vue";
+import themesHot from "./components/themes-hot.vue";
+import themesTuangou from "./components/themes-tuangou.vue";
+import themesRecommend from "./components/themes-recommend.vue";
+import themesShop from "./components/themes-shop.vue";
+import themesNote from "./components/themes-note.vue";
+import themesBanner from "./components/themes-banner.vue";
+import themesLive from "./components/themes-live.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesVip,
+    themesCouponOne,
+    themesCimg,
+    themesHot,
+    themesTuangou,
+    themesRecommend,
+    themesShop,
+    themesNote,
+    themesLive,
+    themesBanner,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-choiceness {
+    margin-top: -30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/classify.vue b/pagesA/themes/default/classify.vue
new file mode 100644
index 0000000..f8d0a51
--- /dev/null
+++ b/pagesA/themes/default/classify.vue
@@ -0,0 +1,173 @@
+<template>
+  <view class="themes-classify">
+    <image class="themes-classify__img" :src="shopData.bgimg ? shopData.bgimg : event_rul + '/static/images/df-bg.png'" mode="widthFix"></image>
+    <block v-if="flag">
+      <themes-head
+        :navHeight="navHeight"
+        :shopData="shopData"
+        :isShowNav="false"
+        :navIndex="1"
+      ></themes-head>
+      <view class="themes-content">
+        <view class="themes-content__left">
+          <view
+            class="classify-item"
+            :class="{ actived: currentIndex === '' }"
+            @tap="selectAll()"
+            >全部</view
+          >
+          <view
+            class="classify-item"
+            v-for="(item, index) in shopCategory"
+            :key="index"
+            :class="{ actived: currentIndex === index }"
+            @tap="categoryHandle(item.id, index)"
+          >
+            {{ item.name }}
+          </view>
+        </view>
+        <view class="themes-content__right">
+          <view class="classify-tabs">
+            <view
+              class="classify-tabs__item"
+              :class="{ actived: isSelectAll }"
+              @tap="selectCategoryAll()"
+              >全部</view
+            >
+            <view
+              class="classify-tabs__item"
+              v-for="(item, index) in shopCategorychild"
+              :key="index"
+              :class="{ actived: curidx === index && !isSelectAll }"
+              @tap="categoryChildHandle(item.id, index)"
+              >{{ item.name }}</view
+            >
+          </view>
+          <scroll-view
+            class="themes-content__scroll"
+            :scroll-y="true"
+            @scrolltolower="getmorecomment"
+          >
+            <classifyShop :shopProduct="shopProduct"></classifyShop>
+            <loading v-if="loading"></loading>
+            <nomore v-if="nomore"></nomore>
+            <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+          </scroll-view>
+        </view>
+      </view>
+    </block>
+    <loading v-else></loading>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/classify.js';
+import themesHead from "./components/themes-head.vue";
+import classifyShop from "./components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    classifyShop,
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.themes-classify {
+  height: 100vh;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  z-index: 1;
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    // height: 1020rpx;
+  }
+}
+.themes-content {
+  position: relative;
+  z-index: 2;
+  box-sizing: border-box;
+  overflow: hidden;
+  margin-top: 28rpx;
+  background: #fff;
+  position: relative;
+  border-radius: 12rpx 12rpx 0 0;
+  display: flex;
+  flex: 1;
+  &__left {
+    width: 180rpx;
+    flex-shrink: 0;
+    background: #f8f9fa;
+    overflow-y: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  &__right {
+    flex: 1;
+    box-sizing: border-box;
+    padding: 28rpx 28rpx 0;
+    position: relative;
+    /deep/ .nodata {
+      margin-left: -30rpx;
+    }
+  }
+  &__scroll {
+    height: calc(100% - 86rpx);
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  .classify-item {
+    height: 110rpx;
+    line-height: 110rpx;
+    text-align: center;
+    font-size: 28rpx;
+    color: #666666;
+    &.actived {
+      color: #0A5D3B;
+      background: #fff;
+      font-weight: 500;
+    }
+  }
+  .classify-tabs {
+    display: flex;
+    margin-bottom: 30rpx;
+    overflow-x: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &__item {
+      flex-shrink: 0;
+      min-width: 80rpx;
+      box-sizing: border-box;
+      margin-right: 20rpx;
+      padding: 0 18rpx;
+      font-size: 22rpx;
+      line-height: 42rpx;
+      border-radius: 42rpx;
+      color: #666666;
+      background: #f7f7f7;
+      &.actived {
+        background: #E2F7EF;
+        color: #0A5D3B;
+      }
+    }
+  }
+  /deep/ .nomore {
+    margin-left: 32rpx;
+  }
+  /deep/ .nodata {
+    width: calc(100vw - 180rpx);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/classify-shop.vue b/pagesA/themes/default/components/classify-shop.vue
new file mode 100644
index 0000000..3900771
--- /dev/null
+++ b/pagesA/themes/default/components/classify-shop.vue
@@ -0,0 +1,221 @@
+<template>
+  <view
+    class="classify-shops"
+  >
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-item flex"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-item__hd flex j-center al-item-center">
+              <image
+                class="shops-item__img"
+                :src="item.pic"
+                mode="aspectFill"
+              ></image>
+            </view>
+            <view class="shops-item__bd">
+              <view class="shops-item__title text-overflow-line">{{ item.name }}</view>
+              <view class="shops-item__sale">已售{{ item.sales }}</view>
+              <view class="shops-item__bottom flex al-item-center j-between">
+                <view class="shops-item__price flex">¥<text class="shops-item__num">{{ item.sell_price }}</text></view>
+                <view class="shops-item__icon"
+                    @click.stop="buydialogChange"
+                    :data-proid="item.proid"></view>
+              </view>
+            </view>
+          </view>
+        </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.classify-shops {
+    padding-bottom: 20rpx;
+    box-sizing: border-box;
+    .shops-item {
+      padding: 20rpx 0 14rpx;
+      &:not(:last-child) {
+        border-bottom: 1rpx solid #ECECEC;
+      }
+      &__hd {
+        width: 192rpx;
+        height: 192rpx;
+        flex-shrink: 0;
+      }
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+      &__bd {
+        flex: 1;
+        margin-left: 12rpx;
+      }
+      &__title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: 36rpx;
+        margin-bottom: 36rpx;
+        min-height: 72rpx;
+      }
+      &__sale {
+        font-size: 18rpx;
+        color: #999999;
+        line-height: 22rpx;
+        margin-bottom: 4rpx;
+      }
+      &__price {
+        color: #ED5925;
+        font-weight: 500;
+        font-size: 24rpx;
+        line-height: 34rpx;
+        align-items: baseline;
+      }
+      &__num {
+        margin-left: 4rpx;
+        font-size: 36rpx;
+        line-height: 50rpx;
+      }
+      &__icon {
+					width: 44rpx;
+					height: 44rpx;
+          margin-top: -4rpx;
+					background: linear-gradient(150deg, #00AE68 0%, #096742 100%);
+					border-radius: 20rpx;
+					position: relative;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 8rpx;
+						right: 8rpx;
+						height: 4rpx;
+						top: 50%;
+						transform: translateY(-50%);
+						background: #FFF;
+					}
+					&::after {
+						content: "";
+						position: absolute;
+						top: 8rpx;
+						bottom: 8rpx;
+						width: 4rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						background: #FFF;
+					}
+				}
+    }
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    border: none;
+    // width: 100%;
+    height: auto;
+    display: flex;
+    padding-bottom: 25rpx;
+    &:not(:last-child) {
+      position: relative;
+      &::after {
+        content: "";
+        position: absolute;
+        bottom: 5rpx;
+        left: 0;
+        right: 0;
+        border-bottom: 1rpx solid rgba(0,0,0,0.1);
+        transform: scaleY(0.5);
+      }
+    }
+    &__hd {
+      width: 200rpx;
+      height: 200rpx;
+      border-radius: 12rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+    .shops-img {
+      width: 100%;
+      height: 100%;
+    }
+    .item-info {
+      flex: 1;
+      padding: 0 20rpx;
+    }
+    .shops-c-t {
+      padding-top: 15rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      min-height: 75rpx;
+    }
+    .shops-s-t {
+      padding-top: 10rpx;
+      font-size: 24rpx;
+      color: #999;
+    }
+    .shops-b-t {
+      padding-top: 10rpx;
+
+      .b-t1 {
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 30rpx;
+      }
+      .b-t3 {
+        color: #999;
+      }
+      .car {
+        width: 44rpx;
+        height: 44rpx;
+
+        .icon_gouwuche {
+          color: #fff;
+          font-size: 32rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-banner.vue b/pagesA/themes/default/components/themes-banner.vue
new file mode 100644
index 0000000..7f5fdee
--- /dev/null
+++ b/pagesA/themes/default/components/themes-banner.vue
@@ -0,0 +1,74 @@
+<template>
+  <view class="themes-banner">
+    <swiper
+      class="swiper-container"
+      :indicator-dots="true"
+      :autoplay="true"
+      circular="true"
+      :interval="5000"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopBanner"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <image class="swiper-item__img" :src="item.imgurl"></image>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopBanner: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-banner {
+  .swiper-container {
+    width: 100%;
+    height: 800rpx;
+    margin-top: 28rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+    .wx-swiper-dot {
+      width: 12rpx;
+      height: 8rpx;
+      border-radius: 20rpx;
+    }
+    .wx-swiper-dot::before {
+      content: "";
+      flex-grow: 1;
+      background: #efbd6f;
+    }
+    .wx-swiper-dot-active::before {
+      width: 50rpx;
+      background: #efbd6f;
+    }
+    .swiper-item {
+      width: 100%;
+      height: 100%;
+      border-radius: 10rpx;
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-c-img.vue b/pagesA/themes/default/components/themes-c-img.vue
new file mode 100644
index 0000000..1c986be
--- /dev/null
+++ b/pagesA/themes/default/components/themes-c-img.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="themes-c-img" :class="[top? 'top' : 'top-z',navHeight > 60 ? 'top-m': '']">
+		<image class="kn-img" src="https://img0.baidu.com/it/u=617696644,3314521124&fm=253&fmt=auto&app=138&f=JPEG?w=625&h=500" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			top: {
+				type: Boolean,
+				default: false
+			},
+			navHeight: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+	
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-c-img {
+		display: flex;
+		.kn-img {
+			width: 100%;
+			border-radius: 12rpx
+			// vertical-align: middle;
+		}
+	}
+	.top {margin-top: -190rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -160rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-chunk-title.vue b/pagesA/themes/default/components/themes-chunk-title.vue
new file mode 100644
index 0000000..0ca9d13
--- /dev/null
+++ b/pagesA/themes/default/components/themes-chunk-title.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="shops-til flex al-item-center">
+		<image class="shops-til__icon" :src="iconSrc"></image>
+		<view class="shops-til__title">{{ title }}</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			title: {
+				type: String,
+				default: ''
+			},
+			iconSrc: {
+				type: String,
+				default: ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shops-til {
+		padding: 24rpx 0;
+		&__icon {
+			width: 50rpx;
+			height: 50rpx;
+			flex-shrink: 0;
+			margin-right: 12rpx;
+		}
+		&__title {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 44rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-coupon-one.vue b/pagesA/themes/default/components/themes-coupon-one.vue
new file mode 100644
index 0000000..140fdd3
--- /dev/null
+++ b/pagesA/themes/default/components/themes-coupon-one.vue
@@ -0,0 +1,225 @@
+<template>
+	<view class="themes-coupon">
+		<!-- <themes-chunk-title title="优惠立减" :iconSrc="event_rul + '/static/theme/conpon-icon.svg'"></themes-chunk-title> -->
+		<scroll-view class="scroll-list" :scroll-x="true">
+			<block v-for="(item, idx) in shopCoupon1" :key="idx">
+				<!-- isUse 是按钮为'去使用'的优惠券 -->
+				<view class="scroll-list__item" v-if="!item.isOver" :class="{ 'isUse': item.isUse }" @tap.stop="getcoupon" :data-idx="idx" :data-id="item.couponid" :data-price="item.price" :data-score="item.score">
+					<image class="scroll-list__item-bg" :src="item.isUse ? event_rul + '/static/images/df-cunp1.png' : event_rul + '/static/images/df-cunp2.png'"></image>
+					<view class="conpon-price">
+						<view class="conpon-price-c flex j-center">
+							<text class="price-f">¥</text>
+							<text class="price-num font-w">{{ item.money }}</text>
+						</view>
+						<view class="conpon-price-h">满{{ item.minprice }}元使用</view>
+					</view>
+					<view class="conpon-btn  flex al-item-center flex-colum">
+						<text class="" style="color: #9A521B;">{{ '优惠券' }}</text>
+						<text class=" text-center" style="border-radius: 6rpx;" :class="item.isUse? 'use-b': 'get-b'">{{item.isUse ? '去使用' : '点击领取' }}</text>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopCoupon: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data() {
+			return {
+				shopCoupon1: this.shopCoupon,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		watch: {
+			shopCoupon (newV, oldV) {
+				this.shopCoupon1 = newV;
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+		methods: {
+			// 点击领取
+			getcoupon: function (e) {
+				
+				var that = this;
+				var idx = e.currentTarget.dataset.idx;
+				var id = e.currentTarget.dataset.id;
+				var score = parseInt(e.currentTarget.dataset.score);
+				var price = e.currentTarget.dataset.price;
+				
+				if (price > 0) {
+					app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+						console.log(res)
+						if(res.status == 0) {
+								app.error(res.msg);
+						} else {
+							app.goto('/pages/pay/pay?id=' + res.payorderid);
+						}
+					})
+					return;
+				}
+				if (score > 0) {
+					app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+						app.showLoading('兑换中');
+						app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+							app.showLoading(false);
+							if (data.status == 0) {
+								app.error(data.msg);
+							} else {
+								app.success(data.msg);
+							}
+						});
+					});
+				}
+				that.shopCoupon.map((item,index) => {
+					if(index === idx) {
+						if(item.isUse) {
+							uni.navigateTo({
+								url:'/pages/shop/prolist?cpid='+ id
+							})
+						} else if(item.isOver) {
+							return;
+						} else {
+							app.showLoading('领取中');
+							app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+								app.showLoading(false);
+								if (data.status == 0) {
+									app.error(data.msg);
+								} else {
+									app.success(data.msg);
+									that.$set(item,"msg","去使用");
+									that.$set(item,'isUse',true);
+									that.$set(item,'isOver',false);
+								}
+							});
+						}
+					}
+				})				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-coupon {
+		margin-top: 30rpx;
+		// background: #FFF;
+		border-radius: 20rpx;
+		// padding: 0 0 24rpx 22rpx;
+		.scroll-list {
+			width: 104%;
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			.scroll-list__item {
+				display: inline-flex;
+				// flex-direction: column;
+				padding-bottom: 5px;
+				align-items: flex-end;
+				margin-right: 28rpx;
+				position: relative;
+				width: 232rpx;
+				height: 104rpx;
+				// padding: 14rpx;
+				z-index: 1;
+				&:last-child {
+					margin-right: 22rpx;
+				}
+				&.isUse {
+					// .conpon-price {
+					// 	color: #CE0000;
+					// }
+					// .conpon-btn {
+					// 	color: #CE0000;
+					// }
+				}
+				&-bg {
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 100%;
+					height: 100%;
+					z-index: -1;
+				}
+				.conpon-price {
+					width: 60%;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					color: #7E4019;
+					.conpon-price-c {
+						// align-items: flex-start;
+						align-items: baseline;
+						.price-f {
+							padding: 10rpx 2rpx 0 0;
+							font-size: 24rpx;
+							// line-height: 34rpx;
+						}
+						.price-num {
+							font-size: 44rpx;
+							// line-height: 100rpx;
+							letter-spacing: 2rpx;
+						}
+					}
+					.conpon-price-h {
+						margin-top: -6rpx;
+						font-size: 20rpx;
+						font-weight: 500;
+						line-height: 28rpx;
+					}
+				}
+				.conpon-btn {
+					width: 40%;
+					
+					justify-content: center;
+					// margin-top: 35rpx;
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #333;
+					// line-height: 34rpx;
+					
+					.use-b {			
+						width: 76rpx;
+						height: 26rpx;
+						margin-top: 12rpx;
+						font-size: 16rpx;
+						line-height: 26rpx;
+						border: 2rpx solid #7E4019;
+					}
+					
+					.get-b {
+						width: 76rpx;
+						height: 26rpx;
+						margin-top: 12rpx;
+						font-size: 16rpx;
+						line-height: 26rpx;
+						background-color: #151515;
+						color: #fff;
+					}
+				}
+			}
+		}
+	}
+	
+	.top {margin-top: -70rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -40rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-head.vue b/pagesA/themes/default/components/themes-head.vue
new file mode 100644
index 0000000..c4c6dee
--- /dev/null
+++ b/pagesA/themes/default/components/themes-head.vue
@@ -0,0 +1,432 @@
+<template>
+  <view
+    class="themes-head position-r"
+    :style="{ 'padding-top': navHeight + 'px' }"
+  >
+    <view
+      class="head-bx-h"
+      :style="[
+        {'height': `${navHeight}px`} ,
+        {'background': shopInfo.bgimg ? `url(${shopInfo.bgimg})` : `url(${event_rul}/static/images/df-bg.png)`},
+        {'background-size': '100% auto'}
+      ]"
+    >
+      <view class="head-bx-ct position-a flex al-item-center">
+        <text class="iconfont icon-icon_arrow_left" @tap="goBack"></text>
+        <text
+          class="iconfont icon-shouye"
+          @tap="goto"
+          data-url="/pages/index/index"
+          data-opentype="reLaunch"
+        ></text>
+        <view class="search flex al-item-center j-between border-rius-r">
+          <text class="iconfont icon-search"></text>
+          <input
+            placeholder="请输入搜索内容..."
+            type="text"
+            v-model="searchVlaue"
+            @confirm="search"
+          />
+        </view>
+      </view>
+    </view>
+
+    <view class="head-bx-cont">
+      <view class="head-store flex al-item-center j-between">
+        <view class="store-l flex al-item-center">
+          <image class="store-logo" :src="shopInfo.logo"></image>
+          <view class="store-l-c flex1">
+            <view
+              class="store-l-tlt flex al-item-center"
+              @click="goto"
+              :data-url="
+                '/pagesA/shop/shop-detail?bid=' +
+                shopInfo.id +
+                '&pagestext=' +
+                shopInfo.name
+              "
+            >
+              <text class="head-store__name">{{ shopInfo.name || "" }}</text>
+              <text class="iconfont icon-arrow-right"></text>
+            </view>
+            <!-- <view class="store-l-tx text-center" :style="{'background-color': '#FF8017'}">自营</view> -->
+          </view>
+        </view>
+        <view class="store-r flex flex-colum al-item-center">
+          <view
+            @tap="followFn"
+            class="store-r-tlt text-center"
+            :class="shopInfo.isFollow ? 'followed' : 'isFollow'"
+          >
+            <image
+              class="follow-icon"
+              v-if="!shopInfo.isFollow"
+              :src="event_rul + '/static/theme/follow-icon.svg'"
+            ></image>
+            <text>{{ shopInfo.isFollow ? "已关注" : "关注" }}</text>
+          </view>
+          <!-- <view class="store-r-tlt text-center" :style="{'border-color': '#FF8017', 'color': '#FF8017','border':' 1px solid'}">已关注</view> -->
+          <view class="store-r-tx">{{ shopInfo.attention || 0 }}人关注</view>
+        </view>
+      </view>
+      <view
+        v-if="isShowNav"
+        class="head-nav-list flex j-between"
+        :class="{ 'isFixed': navFixed }"
+        :style="[
+          { 'top': navHeight - 1 + 'px' },
+          { 'background': (navFixed ? shopInfo.bgimg ? `url(${shopInfo.bgimg})` : `url(${event_rul}/static/images/df-bg.png)`: '')},
+          { 'background-position': `top -${navHeight}px left 0`},
+          {'background-size': '100% auto'}
+        ]"
+      >
+        <block v-for="(item, idx) in navBar" :key="idx">
+          <view class="nav-list-itm" @tap="selectNav(idx)">
+            <view class="itm-tx color-white">{{ item }}</view>
+            <view
+              v-show="navIndex == idx"
+              class="itm-select border-rius-r"
+            ></view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState, mapActions } from "vuex";
+var app = getApp();
+export default {
+  props: {
+    navHeight: {
+      type: Number,
+      default: 0,
+    },
+    navList: {
+      typa: Array,
+      default: function() {
+        return [];
+      },
+    },
+    shopData: {
+      typa: Object,
+      default: {},
+    },
+    navIndex: {
+      type: Number,
+      default: 0,
+    },
+    isShowNav: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      bxContHeight: 0,
+      timeout: null,
+      timeouttwo: null,
+      searchVlaue: "",
+      shopInfo: this.shopData,
+      event_rul: app.globalData.event_url,
+      navBar: [],
+    };
+  },
+  computed: {
+    ...mapState(["opt","navFixed","heardHeight"]),
+  },
+  watch: {
+    // 监听shopData变化
+    shopData(newV, oldV) {
+      this.shopInfo = newV;
+    },
+    navList: {
+      handler: function(newV, oldV) {
+        this.navBar = newV;
+      },
+      deep: true,
+    }
+  },
+  mounted() {
+    const vr = uni.getSystemInfoSync();
+    this.styleHeight();
+    this.getData();
+    console.log(this.shopInfo.name,"shopInfo")
+  },
+  beforeDestroy() {
+    clearTimeout(this.timeout);
+	clearTimeout(this.timeouttwo);
+  },
+  methods: {
+    ...mapActions(["acNavHeightTop","acHeardHeight"]),
+    getData() {
+      if (this.navList.length == 0) {
+        this.navBar = ["精选", "商品", "活动", "新品"];
+      } else {
+        this.navBar = this.navList;
+      }
+      const query = uni.createSelectorQuery().in(this);
+      this.timeouttwo = setTimeout(() => {
+        let listTop = 0;
+        query.select(".head-nav-list").boundingClientRect((data) => {
+          listTop = data ? Number(data.top) : 0;
+        }).exec();
+        query.select(".head-bx-cont").boundingClientRect((data) => {
+          const heightTop = listTop - (data ? Number(data.top) : 0);
+          this.acNavHeightTop(heightTop);
+        }).exec();
+      }, 200)
+    },
+    // 关注店铺
+    followFn() {
+      var that = this;
+      console.log("打印店铺信息+++++", this.shopData, this.shopData);
+      // 暂时写死 follow_id：27，正确为 follow_id：that.shopData.id
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.shopData.id || "", type: "store" },
+        function (res) {
+          console.log("点击关注和取消关注addFollow===========", res);
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo();
+        }
+      );
+    },
+
+    getInfo() {
+      var that = this;
+      // 暂时写死 id：27，正确为 id：that.shopData.id
+      app.post(
+        "/ApiBusiness/follow",
+        { bid: that.shopData.id || "" },
+        function (res) {
+          that.$set(that.shopData, "attention", res.data.followCount);
+          that.$set(that.shopData, "isFollow", res.data.isFollow);
+
+          console.log("-----", that.shopData);
+          // 公共头部信息
+          uni.setStorage({
+            key: "header_data",
+            data: that.shopData,
+          });
+        }
+      );
+    },
+
+    styleHeight() {
+      let query = uni.createSelectorQuery().in(this);
+      query.select(".head-bx-cont").boundingClientRect();
+      query.select(".themes-head").boundingClientRect();
+		this.timeout = setTimeout(() => {
+			query.exec((res) => {
+			  if (res[0] != null && res[1] != null) {
+			    this.bxContHeight = res[0].height;
+          if(!this.navFixed) {
+            this.acHeardHeight(res[1].height)
+          }
+			  }
+			});
+		}, 200)
+    },
+    // 返回
+    goBack() {
+      uni.navigateBack();
+    },
+    // 搜索
+    search() {
+      uni.navigateTo({
+        url:
+          "/pagesA/shop/search?keyword=" +
+          this.searchVlaue +
+          "&id=" +
+          this.shopData.id,
+      });
+      return;
+    },
+    selectNav(idx) {
+        this.$emit("navselect", idx, this.bxContHeight, this.heardHeight);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-head {
+  width: 100%;
+  flex-shrink: 0;
+  z-index: 3;
+  
+  .head-bx-h {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 99;
+    background-size: 100% 1020rpx;
+    background-position: top 0 left 0;
+    .head-bx-ct {
+      height: 32px;
+      left: 0;
+      bottom: 4px;
+
+      .icon-icon_arrow_left {
+        padding-left: 30rpx;
+        color: #fff;
+        font-size: 50rpx;
+      }
+      .icon-shouye {
+        font-size: 45rpx;
+        color: #fff;
+        padding: 10rpx 20rpx;
+      }
+      .search {
+        margin-left: 20rpx;
+        width: 60%;
+        height: 100%;
+        padding: 0 20rpx;
+        background-color: #fff;
+
+        .icon-search {
+          font-size: 50rpx;
+          color: #ababab;
+        }
+        input {
+          padding-left: 20rpx;
+        }
+      }
+    }
+  }
+
+  .head-bx-cont {
+    .head-store {
+      color: #fff;
+      padding: 30rpx 28rpx 0;
+      &__name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        /* autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        text-align: justify;
+      }
+      .store-l {
+        width: 80%;
+        .store-logo {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 12rpx;
+        }
+
+        .store-l-c {
+          padding-left: 20rpx;
+          .store-l-tlt {
+            font-size: 32rpx;
+            white-space: pre-wrap;
+            word-break: break-all;
+            padding-right: 45rpx;
+            display: flex;
+            align-items: center;
+
+            .icon-arrow-right {
+              font-size: 40rpx;
+              padding: 6rpx 0 0 0;
+            }
+          }
+          .store-l-tx {
+            min-width: 60rpx;
+            // min-height: 30rpx;
+            padding: 4rpx 10rpx;
+            margin-top: 8rpx;
+            line-height: 30rpx;
+            display: inline-block;
+            font-size: 24rpx;
+            border-radius: 4rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
+
+      .store-r {
+        .store-r-tlt {
+          width: 120rpx;
+          height: 48rpx;
+          line-height: 48rpx;
+          border-radius: 24rpx;
+          font-size: 24rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          &.isFollow {
+              background-image: linear-gradient(
+                152deg,
+                rgba(255, 116, 25, 1) 0,
+                rgba(237, 12, 12, 1) 100%
+              );
+            color: #fff;
+            .follow-icon {
+              width: 28rpx;
+              height: 24rpx;
+              margin-right: 6rpx;
+            }
+          }
+          &.followed {
+            color: #fff;
+            position: relative;
+            &::before {
+              content: "";
+              position: absolute;
+              left: 0;
+              top: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #fff;
+              box-sizing: border-box;
+              transform: scale(0.5, 0.5);
+              border-radius: 48rpx;
+              transform-origin: 0 0;
+            }
+          }
+        }
+
+        .store-r-tx {
+          padding-top: 6rpx;
+          font-size: 22rpx;
+        }
+      }
+    }
+
+    .head-nav-list {
+      padding: 0 28rpx;
+      font-size: 28rpx;
+      align-items: flex-start;
+      background-size: 100% 1020rpx;
+      &.isFixed {
+        position: fixed;
+        left: 0;
+        right: 0;
+		z-index: 36;
+      }
+      .nav-list-itm {
+        padding: 28rpx 32rpx 0;
+        .itm-tx {
+          z-index: 6;
+        }
+        .itm-select {
+          width: 100%;
+          height: 6rpx;
+          margin-top: 6rpx;
+          z-index: 2;
+          background: #fff;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-hot.vue b/pagesA/themes/default/components/themes-hot.vue
new file mode 100644
index 0000000..35e01db
--- /dev/null
+++ b/pagesA/themes/default/components/themes-hot.vue
@@ -0,0 +1,183 @@
+<template>
+  <view class="themes-hot-sale">
+    <scroll-view class="scroll-list" :scroll-x="true" @scroll="scrollHandle($event)">
+      <view class="scroll-list-row" v-for="(items, idx) in shopMenu" :key="idx">
+        <view
+          class="scroll-list-item"
+          v-for="(item, index) in items"
+          :key="index"
+          @tap.stop="goShopCgry(item.hrefurl, item.id)"
+        >
+          <view class="list-item flex flex-w">
+            <view class="list-item-c flex flex-colum al-item-center">
+              <view class="list-item-cnt position-r">
+                <image
+                  class="item-c-img border-rius-r"
+                  :src="item.imgurl"
+                  mode=""
+                ></image>
+                <!-- <text
+                  class="item-c-hot hot-s1 position-a"
+                  :style="{ 'border-color': '#FE7D11', color: '#FE7D11' }"
+                  v-if="index == 0"
+                  >HOT</text
+                > -->
+              </view>
+              <text class="list-item-tl fs12">{{ item.text }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view v-if="isShowDots" class="list-dots">
+      <view class="list-dots__item" :style="'left:' + dotLeft + 'px'"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  props: {
+    shopMenu: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    isShowDots: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      width: 0,  // scroll-list节点宽度
+      dotLeft: 0,  // 圆点滚动的距离
+    }
+  },
+  computed: {
+    ...mapState(["opt"]),
+  },
+  mounted() {
+    const query = uni.createSelectorQuery().in(this);
+    query.select('.scroll-list').boundingClientRect(data => {
+      this.width = data.width;
+      console.log("得到布局位置信息" + this.width);
+    }).exec();
+  },
+  methods: {
+    scrollHandle(e){
+      let scrollLeft = e.detail.scrollLeft;
+      let scrollWidth  = e.detail.scrollWidth;
+      let ratio = scrollLeft / (scrollWidth - this.width);
+      this.dotLeft = 18 * ratio;
+    },
+    goShopCgry(url, id) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-hot-sale {
+  background: #FFF;
+  padding: 16rpx 16rpx;
+  box-shadow: 0rpx 4px 8rpx 0rpx rgba(0,0,0,0.0300);
+  border-radius: 20rpx;
+  margin-top: 28rpx;
+  .swiper-container {
+    height: 450rpx;
+    &.swiper-single {
+      height: 210rpx;
+    }
+  }
+
+  .scroll-list {
+    width: 100%;
+    position: relative;
+    width: calc(100% + 16rpx);
+    right: -16rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &-row:not(:last-child) {
+      margin-bottom: 18rpx;
+    }
+    .scroll-list-item {
+      background: none;
+      display: inline-block;
+      margin-left: 35rpx;
+
+      .list-item-c {
+        width: 106rpx;
+
+        .list-item-cnt {
+          .item-c-img {
+            width: 90rpx;
+            height: 90rpx;
+            vertical-align: middle;
+          }
+
+          .item-c-hot {
+            padding: 2rpx 10rpx;
+            font-size: 20rpx;
+            border: 2rpx solid;
+            border-radius: 50rpx 60rpx 60rpx 0px;
+            background-color: #fff;
+            top: 6rpx;
+            right: -12rpx;
+          }
+
+          .hot-s1 {
+            background-color: #fff;
+          }
+        }
+        .list-item-tl {
+          max-width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          padding-top: 10rpx;
+        }
+      }
+    }
+    .scroll-list-item:first-child {
+      margin-left: 0;
+    }
+  }
+  .list-dots {
+    margin-top: 18rpx;
+    position: relative;
+    width: 72rpx;
+    height: 6rpx;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #EAEAEA;
+    border-radius: 6rpx;
+    &__item {
+      position: absolute;
+      top: 0;
+      width: 50%;
+      height: 100%;
+      background: linear-gradient(150deg, #00AE68 0%, #096742 100%);
+    }
+  }
+}
+
+.top {
+  margin-top: -60rpx;
+}
+.top-z {
+  margin-top: 0rpx;
+}
+.top-m {
+  margin-top: -50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-live.vue b/pagesA/themes/default/components/themes-live.vue
new file mode 100644
index 0000000..680270b
--- /dev/null
+++ b/pagesA/themes/default/components/themes-live.vue
@@ -0,0 +1,297 @@
+<template>
+  <view class="themes-live position-r">
+    <view
+      v-for="(item, index) in shopVideo"
+      :key="index"
+      @click="goto"
+      :data-url="'/activity/shortvideo/detail?id=' + item.videoId"
+    >
+		<image class="bofang" :src="event_rul + '/static/images/bl/bofang-ic.png'" mode="widthFix"></image>
+      
+      <image
+        class="themes-live-bg"
+        :src="item.coverimg"
+        mode="aspectFill"
+      ></image>
+	  <view class="notice position-a">
+	  	<swiper
+	  	  class="swiper-box"
+	  	  vertical="true"
+	  	  autoplay="true"
+	  	  circular="true"
+	  	  :indicator-dots="false"
+	  	  :auto-play="true"
+	  	>
+	  	  <swiper-item
+	  	    class="swiper-item"
+	  	    v-for="(item2, idx) in shopNotice"
+	  	    :key="idx"
+	  	    @click="goto"
+	  	    :data-url="item2.hrefurl"
+	  	  >
+	  	    <view class="new-cnt">
+	  	      <image class="notice-icon" :src="noticeIcon ? noticeIcon:event_rul + '/static/images/df-laba.png'"></image>
+	  	      <view class="notice-txt">{{item2.title}}</view>
+	  	    </view>
+	  	  </swiper-item>
+	  	</swiper>
+	  </view>
+      <view class="live-an-t flex al-item-center j-between position-a">
+		<view class="live-an-t-l-r">
+			{{formatSeconds(Number(item.video_duration)) || "00:00"		  }}	    
+		</view>
+        <view class="live-an-t-l flex j-between">
+          <text class="heng1"></text>
+          <text class="heng2"></text>
+          <text class="heng3"></text>
+        </view>
+      </view>
+      <view class="live-s-t position-a flex al-item-center" v-if="item.hasOwnProperty('goods')">
+        <image
+          class="s-t-img"
+          :src="item.goods.propic"
+          mode="aspectFill"
+        ></image>
+        <view class="tx-bx flex1 overflow-hd flex flex-colum j-between">
+          <text class="tx-tl text-overflow-tx">{{ item.goods.proname }}</text>
+         <view class="tx1 flex al-item-center j-between">
+			<view class="flex" style="align-items: baseline;">
+				<text>¥</text>
+				<text class="tx2 font-w">
+				  {{item.goods.prosell_price}}
+				</text>
+			</view>
+			<view class="r-btn border-rius-r text-center">
+				<text class="iconfont icon-arrow-right"></text>
+			</view>
+		  </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+	var app = getApp();
+export default {
+  props: {
+    shopVideo: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+	shopNotice: {
+	  type: Array,
+	  default: function() {
+        return [];
+      },
+	},
+	noticeIcon: {
+	  type: String,
+	  default: '',
+	},
+  },
+  data() {
+    return {
+		event_rul: app.globalData.event_url,
+	};
+  },
+  mounted() {},
+  methods: {
+    formatSeconds(time){
+				let newTime,hour,minite,seconds;
+				if(time >= 3600){
+				hour = parseInt(time/3600) < 10 ? '0' + parseInt(time/3600) : parseInt(time/3600);
+				minite = parseInt(time%3600/60) < 10 ? '0' + parseInt(time%3600/60):parseInt(time%3600/60);
+				seconds = time%3600%60 < 10 ? '0' + Math.round(time%3600%60) : Math.round(time%3600%60);
+				newTime = hour + ':' + minite + ':' + seconds;
+				}else if(time >= 60 && time < 3600){
+				minite = parseInt(time/60) < 10 ? '0' + parseInt(time/60) : parseInt(time/60);
+				seconds = time%60 < 10 ? '0' + Math.round(time%60) : Math.round(time%60);
+				newTime = minite + ':' + seconds;  
+				}else if(time < 60 ){
+				seconds = time < 10 ? '0' + Math.round(time) : Math.round(time);
+				newTime = '00:'+ seconds;
+				}
+				return newTime;
+			},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-live {
+  margin-top: 30rpx;
+  .bofang {
+    position: absolute;
+    width: 66rpx;
+	height: 66rpx;
+    left: 50%;
+    top: 50%;
+    transform: translateX(-50%) translateY(-70%);
+  }
+
+  .themes-live-bg {
+    width: 100%;
+    height: 400rpx;
+    border-radius: 12rpx;
+    vertical-align: middle;
+  }
+  .notice {
+	  min-width: 250rpx;
+	  height: 48rpx;
+	  padding: 4rpx 2;
+	  left: 16rpx;
+	  top: 20rpx;
+	  background-color: rgba(0, 0, 0, 0.4);
+	  border-radius: 200rpx;
+	  .swiper-box,.swiper-item {
+	    // width: 100%;
+	    height: 100%;
+	  }
+     .swiper-box {
+		 .swiper-item {
+			 
+		 }
+		 .new-cnt {
+		   height: 100%;
+		   display: flex;
+		   align-items: center;
+		   margin: 0 4rpx;
+		   .notice-icon {
+		     width: 40rpx;
+		     height: 40rpx;
+		     flex-shrink: 0;
+		     margin-right: 12rpx;
+		   }
+		   .notice-txt {
+		     flex: 1;
+		     color: #fff;
+			 font-size: 24rpx;
+		     overflow: hidden;
+		     white-space: nowrap;
+		     text-overflow: ellipsis;
+		   }
+		 }
+	 }
+  }
+  .live-an-t {
+    // width: 102rpx;
+    padding: 4rpx 12rpx;
+    background-color: rgba(0, 0, 0, 0.4);
+    border-radius: 8rpx;
+    color: #fff;
+    left: 16rpx;
+    top: 90rpx;
+    z-index: 3;
+
+    .live-an-t-l {
+      width: 20rpx;
+      height: 18rpx;
+      margin-left: 4rpx;
+      align-items: flex-end;
+
+      .heng1,
+      .heng2,
+      .heng3 {
+        width: 4rpx;
+        border-radius: 6rpx;
+        background-color: #fff;
+      }
+      .heng1 {
+        height: 18rpx;
+        animation: hengos 0.8s linear infinite;
+      }
+      .heng2 {
+        height: 6rpx;
+        animation: hengts 0.8s linear infinite;
+      }
+      .heng3 {
+        height: 18rpx;
+        animation: henghs 0.8s linear 0.2s infinite;
+      }
+    }
+    .live-an-t-l-r {
+      font-size: 20rpx;
+    }
+  }
+
+  .live-s-t {
+    width: 360rpx;
+    height: 140rpx;
+    padding: 6rpx 16rpx;
+    border-radius: 12rpx;
+    background-color: #fff;
+    left: 16rpx;
+    bottom: 12rpx;
+    z-index: 3;
+
+    .s-t-img {
+      width: 86rpx;
+      height: 86rpx;
+      border-radius: 12rpx;
+    }
+
+    .tx-bx {
+      min-height: 108rpx;
+      padding-left: 16rpx;
+      .tx-tl {
+        font-size: 24rpx;
+      }
+      .tx1 {
+        padding-top: 6rpx;
+        font-size: 20rpx;
+      }
+      .tx2 {
+        font-size: 28rpx;
+      }
+	  
+	  .r-btn {
+		  width: 30rpx;
+		  height: 30rpx;
+		  line-height: 30rpx;
+		  background: linear-gradient(153deg, #00AE68 0%, #096742 100%);
+		  .icon-arrow-right {
+			  font-size: 30rpx;
+			  color: #fff;
+		  }
+	  }
+    }
+  }
+}
+
+@keyframes hengos {
+  0% {
+    height: 18rpx;
+  }
+  50% {
+    height: 6rpx;
+  }
+  100% {
+    height: 18rpx;
+  }
+}
+@keyframes hengts {
+  0% {
+    height: 6rpx;
+  }
+  50% {
+    height: 18rpx;
+  }
+  100% {
+    height: 6rpx;
+  }
+}
+@keyframes henghs {
+  0% {
+    height: 18rpx;
+  }
+  50% {
+    height: 6rpx;
+  }
+  100% {
+    height: 18rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-note-desc.vue b/pagesA/themes/default/components/themes-note-desc.vue
new file mode 100644
index 0000000..cfbcb2e
--- /dev/null
+++ b/pagesA/themes/default/components/themes-note-desc.vue
@@ -0,0 +1,140 @@
+<template>
+  <view class="themes-note">
+    <view class="note-til flex flex-colum al-item-center">
+      <text class="tex1">热门笔记</text>
+      <view class="flex flex-colum al-item-center">
+        <text class="tex2">POPULAR NOTES</text>
+        <text class="tex-bg"></text>
+      </view>
+    </view>
+    <view class="themes-note__list">
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="themes-note__item"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <image
+            class="themes-note__item-img"
+            :src="item.pic+'?x-oss-process=image/resize,m_fill,w_167,h_245'"
+            mode="aspectFill"
+          ></image>
+          <view class="themes-note__item-txt">{{ item.title }}</view>
+          <view class="note-c-b flex al-item-center j-between">
+            <view class="note-c-b-l flex al-item-center">
+              <image
+                class="note-u-img border-rius-r"
+                :src="item.headimg"
+                mode="aspectFill"
+              ></image>
+              <text class="text-overflow-tx flex1">{{ item.nickname }}</text>
+            </view>
+            <view class="note-c-b-r flex al-item-center">
+              <text class="iconfont icon-aixin"></text>
+              <!-- <text class="iconfont icon-aixin_shixin" :style="{'color':t('color1')}"></text> -->
+              <text class="z-tx">{{ item.zan }}</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+  margin-top: 30rpx;
+  .note-til {
+    padding-bottom: 30rpx;
+    letter-spacing: 4rpx;
+    .tex1 {
+      font-size: 48rpx;
+      padding-bottom: 10rpx;
+    }
+    .tex2 {
+      z-index: 6;
+      color: #efbd6f;
+    }
+    .tex-bg {
+      height: 12rpx;
+      width: 92%;
+      margin-top: -12rpx;
+      z-index: 2;
+      background: rgba(239, 189, 111, 0.3);
+    }
+  }
+  &__list {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    margin-bottom: -28rpx;
+  }
+  &__item {
+    width: 334rpx;
+    height: 490rpx;
+    padding-bottom: 18rpx;
+    box-sizing: border-box;
+    box-shadow: 0 0 4rpx 1rpx rgba(0, 0, 0, 0.1);
+    border-radius: 6rpx 6rpx 6rpx 6rpx;
+    margin-bottom: 28rpx;
+    &-img {
+      width: 100%;
+      height: 320rpx;
+    }
+    &-txt {
+      padding: 16rpx 16rpx 0rpx;
+      min-height: 92rpx;
+      font-size: 28rpx;
+      color: #333;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+    .note-c-b {
+      margin-top: 10rpx;
+      font-size: 20rpx;
+      color: #999;
+      padding: 0 16rpx;
+      .note-c-b-l {
+        width: 60%;
+        .note-u-img {
+          width: 36rpx;
+          height: 36rpx;
+          border-radius: 50%;
+          margin-right: 16rpx;
+        }
+      }
+      .note-c-b-r {
+        .icon-aixin {
+          font-size: 24rpx;
+        }
+        .icon-aixin_shixin {
+          font-size: 24rpx;
+        }
+        .z-tx {
+          padding-left: 10rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-note.vue b/pagesA/themes/default/components/themes-note.vue
new file mode 100644
index 0000000..90331f5
--- /dev/null
+++ b/pagesA/themes/default/components/themes-note.vue
@@ -0,0 +1,179 @@
+<template>
+  <view class="themes-note">
+    <!-- <themes-chunk-title title="热门笔记" :iconSrc="event_rul + '/static/theme/note-icon.svg'"></themes-chunk-title> -->
+	<view class="title flex j-center">
+		<view class="flex">
+			<image class="t-bg-l" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+			<text class="t-bg-c "  mode="widthFix">热门笔记</text>
+			<image class="t-bg-r" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+		</view>
+	</view>
+    <scroll-view
+      class="scroll-list"
+      :scroll-x="true"
+    >
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="scroll-list-item overflow-hd"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <view class="scroll-list-item-ct flex flex-colum overflow-hd">
+            <view class="note-s overflow-hd position-r">
+              <image class="note-img" :src="item.pic+'?x-oss-process=image/resize,m_fill,w_120,h_115'" mode="aspectFill"></image>
+            </view>
+            <view class="note-b-cnt flex flex1 flex-colum j-between">
+              <text class="note-title text-overflow-line font-w">{{
+                item.title
+              }}</text>
+              <view class="note-c-b flex al-item-center j-between">
+                <view class="note-c-b-l flex al-item-center">
+                  <image
+                    class="note-u-img border-rius-r"
+                    :src="item.headimg"
+                    mode="aspectFill"
+                  ></image>
+                  <text class="text-overflow-tx flex1">{{
+                    item.nickname
+                  }}</text>
+                </view>
+                <view class="note-c-b-r flex al-item-center">
+                  <text class="iconfont icon-aixin"></text>
+                  <text class="z-tx">{{ item.zan ? (item.zan >= 10000 ? (item.zan / 10000).toFixed(1) + '万': item.zan) : 0 }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import themesChunkTitle from './themes-chunk-title.vue'
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitle
+  },
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+	
+	.title {
+		padding: 34rpx 0 24rpx;
+		.t-bg-l{
+			width: 40rpx;
+			margin: 6rpx 0 0 0;
+		}
+		.t-bg-c {
+			// font-style: italic;
+			font-size: 36rpx;
+			color: #0A5D3B;
+			// letter-spacing: 2px;
+		}
+		.t-bg-r {
+			width: 40rpx;
+			margin: 6rpx 0 0 8rpx;
+		}
+	}
+  .scroll-list {
+    position: relative;
+    width: calc(100% + 28rpx);
+    right: -28rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+
+    .scroll-list-item {
+      display: inline-block;
+      margin-right: 20rpx;
+      background-color: #fff;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 20rpx;
+      &:last-child {
+        margin-right: 28rpx;
+      }
+
+      .scroll-list-item-ct {
+        width: 320rpx;
+        height: 536rpx;
+
+        .note-s {
+          width: 100%;
+          height: 376rpx;
+
+          .note-img {
+            width: 100%;
+            height: 100%;
+          }
+
+          .note-hot {
+            left: 16rpx;
+            top: 14rpx;
+            line-height: 34rpx;
+
+            .note-hot-img {
+              width: 110rpx;
+              height: 34rpx;
+            }
+            .note-hot-tx {
+              font-size: 20rpx;
+            }
+          }
+        }
+
+        .note-b-cnt {
+          width: 100%;
+          padding: 22rpx 16rpx 20rpx;
+          white-space: normal;
+          .note-title {
+          }
+
+          .note-c-b {
+            font-size: 28rpx;
+            color: #999;
+            .note-c-b-l {
+              width: 60%;
+              .note-u-img {
+                width: 36rpx;
+                height: 36rpx;
+                margin-right: 10rpx;
+              }
+            }
+            .note-c-b-r {
+              .icon-aixin {
+                font-size: 28rpx;
+              }
+              .icon-aixin_shixin {
+                font-size: 28rpx;
+              }
+              .z-tx {
+                padding-left: 6rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-recommend.vue b/pagesA/themes/default/components/themes-recommend.vue
new file mode 100644
index 0000000..31eb7d8
--- /dev/null
+++ b/pagesA/themes/default/components/themes-recommend.vue
@@ -0,0 +1,198 @@
+<template>
+  <view class="themes-recommend">
+	  <view class="title flex j-center">
+	  	<view class="flex">
+	  		<image class="t-bg-l" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+	  		<text class="t-bg-c "  mode="widthFix">精选商品</text>
+	  		<image class="t-bg-r" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+	  	</view>
+	  </view>
+    <block
+      class="themes-recommend__list"
+      v-for="(item, idx) in shopProduct"
+      :key="idx"
+    >
+      <view
+        class="themes-recommend__item"
+        @click="goto"
+        :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+      >
+        <text class="themes-recommend__item-tab">抢鲜价</text>
+        <view class="themes-recommend__item-hd">
+          <image
+            class="themes-recommend__item-img"
+            :src="item.pic"
+            mode="aspectFill"
+          ></image>
+        </view>
+        <view class="themes-recommend__item-bd">
+          <view class="themes-recommend__item-title">{{ item.name }}</view>
+          <view class="themes-recommend__item-price">
+            <text class="themes-recommend__item-symbol">¥</text>
+            <text class="themes-recommend__item-num">{{ item.sell_price }}</text>
+          </view>
+          <view
+            class="themes-recommend__item-btn"
+            @click.stop="buydialogChange"
+            :data-proid="item.proid"
+            >立即抢购</view
+          >
+        </view>
+      </view>
+    </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+	var app = getApp();
+export default {
+  props: {
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    menuindex: {
+      default: -1,
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+	   event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {
+    // console.log(this.shopProduct)
+  },
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-recommend {
+	.title {
+		padding: 34rpx 0 0;
+		.t-bg-l{
+			width: 40rpx;
+			margin: 6rpx 0rpx 0 0;
+		}
+		.t-bg-c {
+			// font-style: italic;
+			font-size: 36rpx;
+			color: #0A5D3B;
+			// letter-spacing: 2px;
+		}
+		.t-bg-r {
+			width: 40rpx;
+			margin: 6rpx 0 0 8rpx;
+		}
+	}
+  &__list {
+    border-radius: 10rpx;
+    overflow: hidden;
+    &:not(last-child) {
+      margin-top: 28rpx;
+    }
+  }
+  &__item {
+    display: flex;
+    position: relative;
+    height: 296rpx;
+    margin-top: 28rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.03);
+    border-radius: 20rpx;
+    padding: 40rpx 28rpx 0 30rpx;
+    &-tab {
+      width: 106rpx;
+      height: 40rpx;
+      line-height: 40rpx;
+      position: absolute;
+      top: 0;
+      left: 0rpx;
+      background: #FFE832;
+      border-radius: 20rpx 0 20rpx 0rpx;
+      font-size: 24rpx;
+      text-align: center;
+      z-index: 1;
+
+    }
+    &-hd {
+      width: 242rpx;
+      height: 242rpx;
+      flex-shrink: 0;
+    }
+    &-img {
+      width: 100%;
+      height: 100%;
+    }
+    &-bd {
+      flex: 1;
+      padding: 0 0 40rpx 36rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+    &-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 3;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+
+    }
+    &-price {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #ED5925;
+      line-height: 50rpx;
+    }
+    &-symbol {
+      font-size: 24rpx;
+      line-height: 34rpx;
+      margin-right: 6rpx;
+    }
+    &-btn {
+      position: absolute;
+      bottom: 40rpx;
+      right: 28rpx;
+      background: linear-gradient(150deg, #00AE68 0%, #096742 100%);
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 50rpx;
+      border-radius: 25rpx;
+      padding: 0 22rpx;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-shop.vue b/pagesA/themes/default/components/themes-shop.vue
new file mode 100644
index 0000000..cba961e
--- /dev/null
+++ b/pagesA/themes/default/components/themes-shop.vue
@@ -0,0 +1,168 @@
+<template>
+  <view class="themes-shops">
+		<!-- <themes-chunk-title v-if="isShowTitle" title="精选商品" :iconSrc="event_rul + '/static/theme/choiceness-icon.svg'" tengtx="group purchase"></themes-chunk-title> -->
+    <view class="shops-box">
+      <view class="flex flex-w shop-item">
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-cont bg-color-white overflow-hd"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-cont__hd flex j-center al-item-center">
+              <image
+                class="shops-img"
+                :src="item.pic"
+                mode="widthFix"
+              ></image>
+            </view>
+            <view class="item-info">
+              <view class="shops-c-t text-overflow-line">{{ item.name }}</view>
+              <view class="shops-b-t flex al-item-center j-between">
+                <view class="item-info__price">
+                  <text class="b-t1 flex al-item-center"
+                    >¥<text class="b-t2 font-w">{{ item.sell_price }}</text>
+                  </text>
+                  <view class="shops-s-t">已售 {{ item.sales ? (item.sales >= 10000 ? (item.sales / 10000).toFixed(1) + '万': item.sales) : 0 }}</view>
+                </view>
+                <view
+                  class="car flex border-rius-r al-item-center j-center"
+                  @click.stop="buydialogChange"
+                  :data-proid="item.proid"
+                >
+                  <text class="iconfont icon-gouwuche1"></text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+import themesChunkTitle from './themes-chunk-title.vue';
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitle
+  },
+  props: {
+    isShowTitle: { type: Boolean, default: false },
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-shops {
+  padding: 22rpx 0 20rpx;
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    width: 49%;
+    border-radius: 12rpx;
+    box-sizing: border-box;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+    border-radius: 20rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &__hd {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+    }
+
+    .shops-img {
+      width: 100%rpx;
+      height: 260rpx;
+    }
+    .item-info {
+      padding: 24rpx 20rpx;
+      width: 100%;
+    }
+    .shops-c-t {
+      min-height: 72rpx;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+    }
+    .shops-s-t {
+      display: flex;
+      align-items: center;
+      margin-top: 2rpx;
+      font-size: 18rpx;
+      color: #999999;
+      line-height: 22rpx;
+    }
+    .shops-b-t {
+      padding-top: 28rpx;
+
+      .b-t1 {
+        color: #ED5925;
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 36rpx;
+        margin-left: 6rpx;
+      }
+      .car {
+        width: 54rpx;
+        height: 54rpx;
+        background: linear-gradient(150deg, #00AE68 0%, #096742 100%);
+
+        .icon-gouwuche1 {
+          color: #fff;
+          font-size: 36rpx;
+          line-height: 44rpx;
+          height: 48rpx;
+        }
+      }
+    }
+  }
+  .shops-cont:nth-child(2n) {
+    // margin-left: calc(100% - 680rpx);
+    margin-left: 2%;
+  }
+  .shops-cont:nth-child(n + 3) {
+    margin-top: 20rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-tuangou-item.vue b/pagesA/themes/default/components/themes-tuangou-item.vue
new file mode 100644
index 0000000..ef6eb65
--- /dev/null
+++ b/pagesA/themes/default/components/themes-tuangou-item.vue
@@ -0,0 +1,216 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:48%;margin-right:'+(index%2==0?'4%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" >
+			<view class="" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+				<view class="product-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+					<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+				</view>
+				<view class="product-info">
+					<view class="p1" v-if="showname == 1">{{item.name}}</view>
+					<view class="p2">
+						<view class="p2-1" v-if="showprice != '0'">
+							<text class="t1" :style="{color:'#ED5925'}"><text style="font-size:22rpx">低至￥</text>{{item.min_price}}</text>
+							<!-- <text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text> -->
+						</view>
+					</view>
+					<view class="p3" v-if="showsales=='1' && item.sales>0">已售{{item.sales}}件</view>
+					<view class="p4 flex border-rius-r al-item-center j-center" :style="{background:'linear-gradient(150deg, #00AE68 0%, #096742 100%)'}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon-gouwuche1"></text></view>
+					<view class="p4" :style="{background:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+				</view>
+			</view>
+			<view class="overdue" v-if="item.endtime < timestamp">
+				<view class="overdue-box position-a">
+					<image class="overdue-img" :src="event_rul + '/static/images/bl/矩形@2x.png'" mode="widthFix"></image>
+					<text class="tex">活动已结束</text>
+				</view>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 0,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  props: {
+    showstyle: { default: 2 },
+    menuindex: { default: -1 },
+    saleimg: { default: "" },
+    showname: { default: 1 },
+    namecolor: { default: "#333" },
+    showprice: { default: "1" },
+    showsales: { default: "1" },
+    showcart: { default: "1" },
+	timestamp:{ default: 0 },
+    cartimg: {
+      default: app.globalData.event_url + "/static/img/static/imgsrc/cart.svg",
+    },
+    data: {},
+    idfield: { default: "id" },
+  },
+  methods: {
+    buydialogChange: function (e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+      console.log(this.buydialogShow);
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.dp-tuangou-item {
+  height: auto;
+  position: relative;
+  overflow: hidden;
+  padding: 0rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 30rpx;
+}
+.dp-tuangou-item .item {
+  display: inline-block;
+  position: relative;
+  margin-bottom: 12rpx;
+  background: #fff;
+  border-radius: 10rpx;
+  overflow: hidden;
+  // border: 1rpx solid rgba(0, 0, 0, 0.08);
+  box-shadow: 0rpx 4rpx 4rpx 0rpx rgba(0,0,0,0.0300);
+}
+.dp-tuangou-item .product-pic {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  background: #ffffff;
+  padding-bottom: 100%;
+  position: relative;
+}
+.dp-tuangou-item .product-pic .image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: auto;
+}
+.dp-tuangou-item .product-pic .saleimg {
+  position: absolute;
+  width: 60px;
+  height: auto;
+  top: -3px;
+  left: -3px;
+}
+.dp-tuangou-item .product-info {
+  padding: 20rpx 20rpx;
+  position: relative;
+}
+.dp-tuangou-item .product-info .p1 {
+  color: #323232;
+  font-weight: bold;
+  font-size: 26rpx;
+  line-height: 36rpx;
+  margin-bottom: 10rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  height: 72rpx;
+}
+.dp-tuangou-item .product-info .p2 {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  padding: 2px 0;
+}
+.dp-tuangou-item .product-info .p2-1 {
+  flex-grow: 1;
+  flex-shrink: 1;
+  height: 40rpx;
+  line-height: 40rpx;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.dp-tuangou-item .product-info .p2-1 .t1 {
+  font-size: 36rpx;
+  color: #efbd6f;
+}
+.dp-tuangou-item .product-info .p2-1 .t2 {
+  margin-left: 10rpx;
+  font-size: 24rpx;
+  color: #aaa;
+  text-decoration: line-through; /*letter-spacing:-1px*/
+}
+.dp-tuangou-item .product-info .p2-2 {
+  font-size: 20rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: right;
+  padding-left: 20rpx;
+  color: #999;
+}
+.dp-tuangou-item .product-info .p3 {
+  color: #999999;
+  font-size: 20rpx;
+  margin-top: 10rpx;
+}
+.dp-tuangou-item .product-info .p4 {
+  color: #fff;
+  width: 54rpx;
+  height: 54rpx;
+  border-radius: 50%;
+  position: absolute;
+  display: relative;
+  bottom: 20rpx;
+  right: 20rpx;
+  text-align: center;
+}
+.dp-tuangou-item .product-info .p4 .icon-gouwuche1 {
+  font-size: 36rpx;
+  height: 48rpx;
+  line-height: 44rpx;
+}
+.dp-tuangou-item .product-info .p4 .img {
+  width: 100%;
+  height: 100%;
+}
+.overdue {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, .2);
+	.overdue-box {
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.overdue-img {
+		width: 202rpx;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.tex {
+		transform: rotate(-15deg);
+		display: block;
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #A4150B;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-tuangou.vue b/pagesA/themes/default/components/themes-tuangou.vue
new file mode 100644
index 0000000..22dc38b
--- /dev/null
+++ b/pagesA/themes/default/components/themes-tuangou.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="themes-miao-s bg-color-white position-r" :class="top ? 'mg-top': 'mg-top'">
+		<!-- <themes-chunk-title title="团购活动" :iconSrc="event_rul + '/static/theme/avtivity-icon.svg'" tengtx="group purchase"></themes-chunk-title> -->
+		<view class="con-title position-a flex j-center">
+			<image class="t-bg" style="margin-top: 6rpx;" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+			<text class="t-tex ">团购活动</text>
+			<image class="t-bg" style="margin: 6rpx 0 0 8rpx;" :src="event_rul + '/static/images/df-title.png'" mode="widthFix"></image>
+		</view>
+		<scroll-view :scroll-x="true" class="miao-cont">
+			<block v-for="(item, idx) in shopTuangou" :key="idx">
+				<view class="miao-cont__item al-item-center flex-colum j-between" @click="goto"
+				:data-url="'/activity/tuangou/product?id=' + item.proid">
+					<image class="miao-cont__item-img" :src="item.pic" mode="aspectFill"></image>
+					<view class="miao-cont__item-title">{{ item.name }}</view>
+					<view class="miao-cont__item-bottom">
+						<view class="miao-cont__item-price">
+							<view class="miao-cont__item-current"><text class="price-symbol">低至¥</text><text>{{ item.min_price }}</text></view>
+							<view class="miao-cont__item-original"><text class="price-symbol">¥</text><text>{{ item.sell_price }}</text></view>
+						</view>
+						<text class="iconfont icon-jiahao"></text>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	
+	var app = getApp();
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopTuangou: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+			top: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data(){
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+
+	.themes-miao-s {
+		width: 100%;
+		margin-top: 28rpx;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 20rpx 0 30rpx 30rpx;
+		
+		.con-title {
+			top: -72rpx;
+			left: 50%;
+			transform:  translateX(-50%);
+			z-index: 3;
+			.t-bg {
+				width: 40rpx;
+				vertical-align: middle;
+			}
+			.t-tex {
+				font-size: 36rpx;
+				color: #0A5D3B ;
+			}
+		}
+		.miao-cont {
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			&__item {
+				width: 220rpx;
+				flex-shrink: 0;
+				margin-right: 40rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				display: inline-flex;
+				&:last-child {
+					margin-right: 22rpx;
+				}
+				&-img {
+					width: 156rpx;
+					height: 156rpx;
+					margin-bottom: 16rpx;
+				}
+				&-title {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 36rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					/* autoprefixer: ignore next */
+					-webkit-box-orient: vertical;
+					text-align: justify;
+					white-space: pre-wrap;
+					word-break: break-all;
+
+				}
+				&-bottom {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-top: 4rpx;
+				}
+				&-price {
+					display: flex;
+					align-items: flex-end;
+				}
+				&-current {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #ED5925;
+					line-height: 50rpx;
+					.price-symbol {
+						font-size: 22rpx;
+						line-height: 32rpx;
+						margin-right: 4rpx;
+					}
+				}
+				&-original {
+					margin: 0 0 6rpx 4rpx;
+					font-size: 20rpx;
+					font-weight: 500;
+					color: #999999;
+					line-height: 28rpx;
+					text-decoration: line-through;
+				}
+				.icon-jiahao {
+					font-size: 46rpx;
+					color: #029A5D;
+				}
+			}
+		}
+	}
+	.mg-top {
+		margin-top: 110rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/components/themes-vip.vue b/pagesA/themes/default/components/themes-vip.vue
new file mode 100644
index 0000000..42ef9fd
--- /dev/null
+++ b/pagesA/themes/default/components/themes-vip.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="head-new-vu flex al-item-center">
+    <swiper
+      class="swiper-box"
+      vertical="true"
+      autoplay="true"
+      circular="true"
+      :indicator-dots="false"
+      :auto-play="true"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopNotice"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <view class="new-cnt">
+          <image class="notice-icon" :src="noticeIcon ? noticeIcon:event_rul + '/static/theme/note-icon.svg'"></image>
+          <view class="notice-txt">{{ item.title }}</view>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  props: {
+    noticeIcon: {
+      type: String,
+      default: '',
+    },
+    shopNotice: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.head-new-vu {
+  width: 100%;
+  height: 90rpx;
+  margin-top: 30rpx;
+  border-radius: 12rpx;
+  background: rgba(255,255,255,0.3);
+  border: 1rpx solid #FFF;
+  .swiper-box,.swiper-item {
+    width: 100%;
+    height: 100%;
+  }
+
+  .new-cnt {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    margin: 0 20rpx;
+    .notice-icon {
+      width: 50rpx;
+      height: 50rpx;
+      flex-shrink: 0;
+      margin-right: 12rpx;
+    }
+    .notice-txt {
+      flex: 1;
+      color: #333;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/goods.vue b/pagesA/themes/default/goods.vue
new file mode 100644
index 0000000..c51cbe7
--- /dev/null
+++ b/pagesA/themes/default/goods.vue
@@ -0,0 +1,120 @@
+<template>
+  <view class="themes-goods position-a"
+        :style="{ height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view :class="{'themes-goods__content' : !nodata}">
+      <view class="nav-list flex j-between al-item-center">
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="!field || field == 'sort' ? 'color:#D11800' : ''"
+          data-field="sort"
+          data-order="desc"
+          >推荐</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'sales' ? 'color:#D11800' : ''"
+          data-field="sales"
+          data-order="desc"
+          >销量</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'createtime' ? 'color:#D11800' : ''"
+          data-field="createtime"
+          data-order="desc"
+          >新品</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          data-field="sell_price"
+          :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+          <text :style="field == 'sell_price' ? 'color:#D11800' : ''"
+            >价格</text
+          >
+          <text
+            style="font-size: 26rpx"
+            class="iconfont icon-danbianjiantou1"
+            :style="{
+              color: field == 'sell_price' && order == 'asc' ? '#D11800' : '',
+            }"
+          ></text>
+          <text
+            style="font-size: 26rpx; margin-left: -10rpx"
+            class="iconfont icon-danbianjiantou"
+            :style="{
+              color: field == 'sell_price' && order == 'desc' ? '#D11800' : '',
+            }"
+          ></text>
+        </view>
+      </view>
+      <scroll-view
+        class="scroll-list"
+        :scroll-y="true"
+        v-if="shopSelPro && shopSelPro.length > 0"
+      >
+        <themes-shop
+          :mgtop="0"
+          :mgright="30"
+          :mgleft="30"
+          :mgbottom="2"
+          :shopProduct="shopSelPro"
+        ></themes-shop>
+        <nomore v-if="nomore"></nomore>
+      </scroll-view>
+    </view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/goods.js";
+import themesHead from "./components/themes-head.vue";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-goods {
+  background: #F4F4F4;
+  left: 0;
+  right: 0;
+  border-radius: 20rpx 20rpx 0 0;
+  display: flex;
+  flex-direction: column;
+}
+.themes-goods__content {
+	height: 100%;
+}
+.nav-list {
+  height: 80rpx;
+  padding: 28rpx 30rpx 12rpx;
+
+  .selec {
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  height: calc(100% - 80rpx);
+  padding: 0 28rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/index.vue b/pagesA/themes/default/index.vue
new file mode 100644
index 0000000..ba1a0ca
--- /dev/null
+++ b/pagesA/themes/default/index.vue
@@ -0,0 +1,78 @@
+<template>
+  <view class="themes-default" >
+    <image
+      class="themes-default__img"
+      :src="shopData.bgimg
+          ? shopData.bgimg
+          : event_rul + '/static/images/df-bg.png'
+      "
+	  mode="widthFix"
+    ></image>
+    <!-- 头部 -->
+    <themes-head
+      :navHeight="navHeight"
+      @navselect="navHeadSelect"
+      :navList="navList"
+      :navIndex="navIndex"
+      :shopData="shopData"
+    ></themes-head>
+    <view class="themes-content position-r" >
+			<Choiceness v-if="tabArr.indexOf(0) > -1" v-show="navIndex === 0"></Choiceness>
+      <Goods v-if="tabArr.indexOf(1) > -1" v-show="navIndex === 1" :hearHeight="hearHeight"></Goods>
+      <Activity v-if="tabArr.indexOf(2) > -1" v-show="navIndex === 2" :hearHeight="hearHeight"></Activity>
+      <new-product v-if="tabArr.indexOf(3) > -1" v-show="navIndex === 3" :hearHeight="hearHeight"></new-product>
+    </view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/index.js";
+import themesHead from "./components/themes-head.vue";
+import Choiceness from "./choiceness.vue";
+import Activity from "./activity.vue";
+import newProduct from "./newProduct.vue";
+import Goods from "./goods.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    Choiceness,
+    Activity,
+    newProduct,
+    Goods,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-default {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #FAF8F8;
+  position: relative;
+  z-index: 1;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+  }
+}
+.themes-content {
+  flex: 1;
+  z-index: 2;
+  padding: 0 28rpx 0;
+  margin-top: 16rpx;
+}
+
+.bgthem {
+	background-color: #E9E7C7;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/newProduct.vue b/pagesA/themes/default/newProduct.vue
new file mode 100644
index 0000000..c8ae570
--- /dev/null
+++ b/pagesA/themes/default/newProduct.vue
@@ -0,0 +1,56 @@
+<template>
+  <view class="themes-newProduct position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <scroll-view
+      class="scroll-list"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopProduct && shopProduct.length > 0"
+    >
+      <themes-shop
+        :mgtop="0"
+        :mgright="30"
+        :mgleft="30"
+        :mgbottom="2"
+        :shopProduct="shopProduct"
+      ></themes-shop>
+      <nomore v-if="nomore"></nomore>
+    </scroll-view>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/newProduct.js";
+import themesHead from "./components/themes-head.vue";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    themesShop,
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-newProduct {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #F4F4F4;
+  padding: 0 28rpx 0;
+  border-radius: 20rpx 20rpx 0 0;
+  left: 0;
+  right: 0;
+}
+.scroll-list {
+  height: 100%;
+  overflow-y: scroll;
+  // padding-bottom: 40rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/default/shop-detail.vue b/pagesA/themes/default/shop-detail.vue
new file mode 100644
index 0000000..65339d0
--- /dev/null
+++ b/pagesA/themes/default/shop-detail.vue
@@ -0,0 +1,353 @@
+<template>
+  <view class="store-detail">
+    <view v-if="!loading">
+		<view class="flex">
+			<image class="img-logo" :src="info.logo" mode="aspectFill"></image>
+		</view>
+		<view class="detail-contetn">
+			<view class="content-h border-btm flex al-item-center">
+				<view class="h-l">
+					<view class="title">{{ info.name }}</view>
+					<view class="text-n fs12">{{ followCount || 0 }}人关注</view>
+				</view>
+				<view class="su"></view>
+				<view class="h-r flex ">
+					<view class="h-r__info flex flex-colum al-item-center" @click="followFn">
+						<!-- <image class="follow-icon" v-if="!shopInfo.isFollow" :src="event_rul + '/static/theme/follow-icon.svg'" mode="widthFix"></image> -->
+						<text class="iconfont" :class="{'isFollow icon-aixin_shixin': info.isFollow, 'icon-aixin': !info.isFollow}" style="font-size: 44rpx;color: #CE0000;"></text>
+						<text class="follow-tx fs12">{{info.isFollow ? "已关注" : "关注"}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.content">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-themes-coupon"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">店铺简介</view>
+					<view class="text fs12">{{ info.content }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.address">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-location"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">店铺地址</view>
+					<view class="text fs12">{{ info.address }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.createtime">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-rilitianchong"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">开店时间</view>
+					<view class="text fs12">{{ info.createtime }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.start_hours || info.end_hours">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-clock"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">营业时间</view>
+					<view class="text fs12">{{ info.start_hours || "" }}-{{ info.end_hours || "" }}</view>
+				</view>
+			</view>
+			<view class="content-t  flex al-item-center" v-show="info.tel">
+				<view class="flex" style="width: 64rpx;"><text class="iocns iconfont icon-icon-phone"></text></view>
+				<view class="flex flex-colum ">
+					<view class="title">联系电话</view>
+					<view class="text fs12">{{ info.tel }}</view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" @tap="goback">去看看全部商品</button>
+    </view>
+    <loading v-else></loading>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      info: {},
+      loading: false,
+	  event_rul: app.globalData.event_url,
+	  followCount: 0,
+    shopData: uni.getStorageSync('header_data') || {}, 
+    };
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  created() {
+    this.loading = true;
+  },
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    goback() {
+      uni.navigateBack(1);
+    },
+    followFn() {
+      var that = this;
+
+      // 暂时写死follow_id：27，正确为 follow_id: that.opt.bid
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.opt.bid || "", type: "store" },
+        function (res) {
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo()
+          setTimeout(() => {
+            that.$set(that.shopData,'attention',that.info.fans_count);
+            that.$set(that.shopData,'isFollow',that.info.isFollow);
+            uni.setStorage({
+              key: "header_data",
+              data: that.shopData,
+            });
+          }, 200);
+        }
+      );
+    },
+	// 获取详情信息
+    getInfo() {
+      var that = this;
+      // 暂时写死id: 27,正确为 id: that.opt.bid
+      app.get(
+        "ApiBusiness/newIndex",
+        { id: that.opt.bid || "" },
+        function (res) {
+          that.info = res.business;
+		  that.followCount = res.followCount
+          that.loading = false;
+        }
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.store-detail {
+  letter-spacing: 2rpx;
+  color: #333;
+  
+  .img-logo {
+	  width: 100%;
+	  height: 400rpx;
+  }
+  .detail-contetn {
+	  padding: 0 40rpx;
+	  background-color: #fff;
+	  .content-h {
+		  padding: 28rpx 0;
+		  
+		  .h-l {
+			  width: 452rpx;
+			  padding-right: 10rpx;
+			 .title {
+				 font-weight: 500;
+			 	 font-size: 34rpx;
+			 }
+			 .text-n {
+			 	padding-top: 14rpx;
+				color: #666;
+				font-weight: 400;
+			 } 
+		  }
+		  .su {
+			  width: 2rpx;
+			  height: 56rpx;
+			  background-color: #CE0000;
+		  }
+		  .h-r {
+			  width: 180rpx;
+			  justify-content: flex-end;
+        &__info {
+          width: 80rpx;
+        }
+        .icon-aixin {
+          // color: #CE0000;
+          &.isFollow {
+            // color: #CE0000;
+          }
+        }
+			  
+			  .follow-icon {
+			    width: 44rpx;
+			  }
+			  .follow-tx {
+				  color: #666;
+			  }
+		  }
+	  }
+	  
+	  .content-t {
+		  padding: 20rpx 0;
+		  
+		  .iocns {
+			  font-size: 40rpx;
+			  color: #0A5D3B;
+		  }
+		  .t-img {
+			  width: 40rpx;
+		  }
+		  
+		  .title {
+			font-weight: 500;
+		  }
+		  .text {
+			  font-weight: 500;
+			  padding-top: 8rpx;
+			  color: #666;
+		  }
+	  }
+  }
+  .btn {
+    font-size: 36rpx;
+    // font-weight: bold;
+    width: 630rpx;
+    margin: 90rpx auto;
+    border-radius: 400rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-image: linear-gradient(to right, #00AE68, #096742);
+    color: #fff;
+  }
+  .border-btm {
+	  border-bottom: 2rpx solid #ECECEC;
+  }
+  
+  // .attention {
+  //   padding: 30rpx 20rpx;
+
+  //   .attention-box {
+  //     padding: 30rpx 20rpx;
+  //     background: #fff;
+  //     display: flex;
+  //     align-items: center;
+  //     justify-content: space-between;
+  //     box-sizing: border-box;
+  //     border-radius: 10rpx;
+
+  //     .attention-l {
+  //       display: flex;
+  //       align-items: center;
+
+  //       .attention-l-img {
+  //         width: 120rpx;
+  //         height: 120rpx;
+  //         border-radius: 16rpx;
+  //         flex-shrink: 0;
+  //       }
+  //       .attention-l-text {
+  //         height: 100%;
+  //         padding-left: 20rpx;
+  //         display: flex;
+  //         flex-direction: column;
+  //         .attention-l-title {
+  //           font-size: 30rpx;
+  //           font-weight: bold;
+  //         }
+  //         .attention-l-text-s {
+  //           padding-top: 10rpx;
+  //           display: flex;
+  //           align-items: center;
+  //           font-size: 24rpx;
+  //           color: #bdbdbd;
+
+  //           .icon_arrow_right {
+  //             padding-left: 20rpx;
+  //           }
+  //         }
+  //       }
+  //     }
+  //     .attention-r {
+  //       width: 120rpx;
+  //       height: 54rpx;
+  //       line-height: 54rpx;
+  //       text-align: center;
+  //       flex-shrink: 0;
+  //       border-radius: 8rpx;
+  //       &.isFollow {
+  //         background-color: #efbd6f;
+  //         color: #FFF;
+  //       }
+  //       &.followed {
+  //         color: #efbd6f;
+  //         position: relative;
+  //         &::before {
+  //           content: "";
+  //             position: absolute;
+  //             left: 0;
+  //             width: 200%;
+  //             height: 200%;
+  //             border: 2rpx solid #efbd6f;
+  //             box-sizing: border-box;
+  //             transform: scale(0.5,0.5);
+  //             border-radius: 16rpx;
+  //             transform-origin: 0 0;
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
+
+  // .store-detail-conten {
+  //   padding: 0 20rpx;
+  //   .detail-conten-b {
+  //     display: flex;
+  //     flex-direction: column;
+  //     border-radius: 10rpx;
+  //     background-color: #fff;
+
+  //     .detail-conten-c {
+  //       min-height: 400rpx;
+  //       padding: 0 20rpx;
+  //       display: flex;
+  //       flex-direction: column;
+  //       justify-content: space-evenly;
+  //     }
+  //     .detail-conten-t {
+  //       display: flex;
+  //       // align-items: center;
+  //       .detail-conten-t-tilt {
+  //         width: 150rpx;
+  //         font-weight: bold;
+  //         font-size: 30rpx;
+  //       }
+
+  //       .detail-conten-t-text {
+  //         flex: 1;
+  //         // color: #bdbdbd;
+  //         padding-top: 4rpx;
+  //         // font-weight: bold;
+  //         color: #111111;
+  //       }
+  //     }
+
+  //     .btn {
+  //       font-size: 30rpx;
+  //       font-weight: bold;
+  //       width: 650rpx;
+  //       margin: 30rpx auto;
+  //       border-radius: 400rpx;
+  //       height: 70rpx;
+  //       display: flex;
+  //       justify-content: center;
+  //       align-items: center;
+  //       background-image: linear-gradient(to right, #fbd89e, #eec071);
+  //       color: #fff;
+  //     }
+  //   }
+  // }
+}
+</style>
diff --git a/pagesA/themes/default/themes-search.vue b/pagesA/themes/default/themes-search.vue
new file mode 100644
index 0000000..858a46b
--- /dev/null
+++ b/pagesA/themes/default/themes-search.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="themes-search">
+		<view class="search-head">
+			<view class="head-b flex al-item-center border-rius-r">
+				<text class="iconfont icon-search"></text>
+				<input v-model="keyword" placeholder="商品搜索" placeholder-style="font-size:28rpx;" @confirm="searchConfirm" />
+        <text class="iconfont icon-shanchu" @click="delKeywordtex"></text>
+			</view>
+		</view>
+		<view class="search-content">
+			<view class="nav-list flex j-between al-item-center">
+				<view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="!field || field == 'sort' ? 'color: #D11800' : ''"
+            data-field="sort"
+            data-order="desc"
+            >推荐</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'sales' ? 'color: #D11800' : ''"
+            data-field="sales"
+            data-order="desc"
+            >销量</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'createtime' ? 'color: #D11800' : ''"
+            data-field="createtime"
+            data-order="desc"
+            >新品</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            data-field="sell_price"
+            :data-order="order == 'asc' ? 'desc' : 'asc'"
+          >
+            <text :style="field == 'sell_price' ? 'color: #D11800' : ''"
+              >价格</text
+            >
+            <text
+              style="font-size: 26rpx"
+              class="iconfont icon-danbianjiantou1"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'asc' ? '#D11800' : '',
+              }"
+            ></text>
+            <text
+              style="font-size: 26rpx; margin-left: -10rpx"
+              class="iconfont icon-danbianjiantou"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'desc' ? '#D11800' : '',
+              }"
+            ></text>
+          </view>
+			</view>
+		</view>
+		<scroll-view class="scroll-list lise-h" :scroll-y="true" @scrolltolower="getmorecomment" >
+			<themes-shop :shopProduct="shopProduct" :mgtop="0" :mgright="30" :mgleft="30" :mgbottom="2"></themes-shop>
+		<loading v-if="loading"></loading>
+        <nomore v-if="nomore"></nomore>
+        <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+		</scroll-view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+import { myMixin } from '../logic/search.js';
+import themesShop from "../default/components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss">
+.themes-search {
+  height: 100vh;
+  overflow-y: hidden;
+  display: flex;
+  flex-direction: column;
+  background: #F4F4F4;
+  ::v-deep .classify-shops {
+    .shops-item {
+      padding: 24rpx 40rpx 12rpx 20rpx;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 10rpx;
+      border-bottom: 0;
+      margin-bottom: 20rpx;
+    }
+  }
+  .search-head {
+    width: 100%;
+    height: 74rpx;
+    padding: 10rpx 28rpx 0;
+    flex-shrink: 0;
+    background: #FFF;
+    .head-b {
+      width: 100%;
+      height: 100%;
+      padding: 0 12rpx;
+      background-color: #F7F7F7;
+
+      .icon-search {
+        color: #ABABAB;
+        font-size: 50rpx;
+        flex-shrink: 0;
+      }
+      input {
+        flex: 1;
+        font-size: 28rpx;
+        line-height: 40rpx;
+        margin-left: 14rpx;
+        color: #333333;
+      }
+      .icon-shanchu {
+        font-size: 40rpx;
+        color: #cccccc;
+      }
+    }
+  }
+
+  .search-content {
+    flex-shrink: 0;
+    background: #FFFFFF;
+    .nav-list {
+      height: 100rpx;
+      padding: 34rpx 32rpx 34rpx 40rpx;
+
+      .selec {
+        // font-size: 32rpx;
+        transform: scale(1.2);
+      }
+    }
+  }
+
+  .scroll-list {
+    flex: 1;
+    overflow-y: scroll;
+    padding: 20rpx 28rpx;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/activity.vue b/pagesA/themes/haiNaBaiXian/activity.vue
new file mode 100644
index 0000000..662c7f1
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/activity.vue
@@ -0,0 +1,381 @@
+<template>
+  <view class="themes-activity position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view class="activity-con__top" >
+      <view class="title-box flex al-item-center j-center">
+        <text class="iconfont icon-title-desc dot-left"></text>
+        <view class="title-txt">团购活动</view>
+        <text class="iconfont icon-title-desc"></text>
+      </view>
+      <view class="nav-list flex j-between al-item-center">
+      
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="!field || field == 'sort' ? 'color:' + '#1870C5' : ''"
+        data-field="sort"
+        data-order="desc"
+        >推荐</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="field == 'sales' ? 'color:' + '#1870C5' : ''"
+        data-field="sales"
+        data-order="desc"
+        >销量</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        data-field="sell_price"
+        :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+        <text :style="field == 'sell_price' ? 'color:' + '#1870C5' : ''"
+          >价格</text
+        >
+        <text
+          style="font-size: 26rpx"
+          class="iconfont icon-danbianjiantou1"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'asc' ? '#1870C5' : '#999',
+          }"
+        ></text>
+        <text
+          style="font-size: 26rpx; margin-left: -10rpx"
+          class="iconfont icon-danbianjiantou"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'desc' ? '#1870C5' : '#999',
+          }"
+        ></text>
+        </view>
+        <view @tap="open" >筛选 <text class="iconfont icon-shaixuan" style="font-size: 26rpx; margin-left: 4rpx;color: #999;"></text></view>
+      </view>
+    </view>
+    <scroll-view
+      class="scroll-list lise-t"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopTuangou && shopTuangou.length > 0"
+    >
+      <themes-tuangou-item v-if="isActivity" :data="shopTuangou" :timestamp="timestamp" :menuindex="menuindex"></themes-tuangou-item>
+      <view class="flex flex-colum" v-else>
+        <image class="n-thing" :src="event_rul + '/static/images/n-thing.png'" mode="widthFix"></image>
+        <view class="text-center color-gray">暂无活动～</view>
+      </view>
+    </scroll-view>
+    <view
+      v-if="visibleSync"
+      :class="{ 'uni-drawer--visible': showDrawer }"
+      class="uni-drawer"
+      @touchmove.stop.prevent="clear"
+    >
+      <view
+        class="uni-drawer__mask"
+        :class="{ 'uni-drawer__mask--visible': showDrawer && mask }"
+        @tap="close('mask')"
+      />
+      <view
+        class="uni-drawer__content"
+        :class="{
+          'uni-drawer--right': !rightMode,
+          'uni-drawer--left': rightMode,
+          'uni-drawer__content--visible': showDrawer,
+        }"
+      >
+        <view class="bolting-box">
+          <view class="name">筛选</view>
+          <view class="title">商品分类</view>
+          <view class="content flex flex-w">
+            <view
+              class="text"
+              :style="{
+                color: boltingListIndex === 0 ? '#1870C5' : '#333333',
+                backgroundColor: boltingListIndex === 0 ? '#E6EFFF' : '#F7F7F7 ',
+              }"
+              @tap="bolting(0)"
+              >全部</view
+            >
+            <block v-for="(item, idx) in boltingList" :key="idx">
+              <view
+                class="text"
+                v-show="boltingList.length != 0"
+                :style="{
+                  color: boltingListIndex === idx + 1 ? '#1870C5' : '#333333',
+                  backgroundColor: boltingListIndex === idx + 1 ? '#E6EFFF' : '#F7F7F7 ',
+                }"
+                @tap="bolting(idx + 1)"
+                >{{ item.name }}</view
+              >
+            </block>
+          </view>
+          <view class="bolting-box-b flex j-between">
+            <view class="res btn" @tap="boltingAll()">重置</view>
+            <view
+              class="comf btn"
+              :style="{ 'background-color': '' }"
+              @tap="filterConfirm(cpid)"
+              >确定</view
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/activity.js';
+import themesShop from "./components/themes-shop.vue";
+import themesTuangouItem from "./components/themes-tuangou-item.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+    themesTuangouItem
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-activity {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  border-radius: 20rpx 20rpx 0;
+  flex: 1;
+  left: 0;
+  right: 0;
+  background: #f4f4f4;
+  padding-top: 18rpx;
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 80rpx;
+    background: linear-gradient(180deg, #D2E2FF 0, #f4f4f4 100%);
+    border-radius: 10rpx 10rpx 0 0;
+  }
+}
+.activity-con__top {
+  position: relative;
+}
+.icon-title-desc {
+  color: rgba(24, 112, 197, 0.2000);
+  font-size: 14rpx;
+  &.dot-left {
+    transform: rotate(180deg);
+  }
+}
+.title-txt {
+  position: relative;
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #333333;
+  line-height: 50rpx;
+  letter-spacing: 2rpx;
+  padding: 0 8rpx;
+  &::before,&::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 12rpx;
+    height: 12rpx;
+    border-radius: 50%;
+    background: rgba(24, 112, 197, 0.4000);;
+  }
+  &::before {
+    left: -12rpx;
+  }
+  &::after {
+    right: -12rpx;
+  }
+}
+.nav-list {
+  padding: 36rpx 30rpx 30rpx;
+  .actived {
+    color: #FB5E00;
+  }
+  .selec {
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  flex: 1;
+  overflow-y: scroll;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.n-thing {
+	width: 282rpx;
+	margin: 100rpx auto 0;
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+
+.select-box {
+  width: 100%;
+  height: calc(100% - 80rpx);
+  position: absolute;
+  left: 0;
+  top: 80rpx;
+  .select-mxk {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 66;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+
+  .select-box-content {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 68;
+
+    .content-item {
+      border-top: 2rpx solid #f2f2f4;
+    }
+  }
+}
+// 筛选
+.uni-drawer {
+  height: 100%;
+  width: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+  z-index: 999;
+  top: 0;
+}
+
+.uni-drawer__content {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  top: 0;
+  width: 250px;
+  bottom: 0;
+  background-color: #ffffff;
+  transition: transform 0.3s ease;
+}
+
+.uni-drawer--left {
+  left: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(-251px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(-100%);
+  /* #endif */
+}
+
+.uni-drawer--right {
+  right: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateX(251px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateX(100%);
+  /* #endif */
+}
+
+.uni-drawer__content--visible {
+  transform: translateY(0px);
+}
+
+.uni-drawer__mask {
+  width: 100%;
+  height: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 0;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  transition: opacity 0.3s;
+}
+
+.uni-drawer__mask--visible {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 1;
+}
+
+.bolting-box {
+  padding: 30rpx 0 30rpx 28rpx;
+
+  .name {
+    font-size: 32rpx;
+    color: #333333;
+  }
+  .title {
+    font-size: 24rpx;
+    color: #666666;
+    margin-top: 34rpx;
+  }
+  .content {
+    width: 100%;
+    padding: 28rpx 0 10rpx;
+    margin: 0 -8rpx;
+	
+    .text {
+      width: 140rpx;
+      height: 60rpx;
+      padding: 0 10rpx;
+      box-sizing: border-box;
+      line-height: 60rpx;
+      text-align: center;
+      margin: 0 8rpx 18rpx;
+      font-size: 24rpx;
+      border-radius: 4rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+  .bolting-box-b {
+    margin-right: 28rpx;
+    padding-top: 58rpx;
+    border-top: 1rpx solid #ECECEC;
+    .btn {
+      width: 214rpx;
+      font-size: 28rpx;
+      line-height: 60rpx;
+      text-align: center;
+      border-radius: 6rpx;
+    }
+    .res {
+      color: #333333;
+      border: 1rpx solid #ECECEC;
+    }
+    .comf {
+      color: #FFFFFF;
+      background: linear-gradient(to right, #269DD1 0, #5487D7 100%);
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/choiceness.vue b/pagesA/themes/haiNaBaiXian/choiceness.vue
new file mode 100644
index 0000000..83bd106
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/choiceness.vue
@@ -0,0 +1,73 @@
+<template>
+  <view class="themes-choiceness">
+    <!-- 优惠 -->
+    <themes-coupon-one
+      v-if="shopCoupon.length != 0"
+      :shopCoupon="shopCoupon"
+    ></themes-coupon-one>
+    <!-- 视频 -->
+    <themes-live
+      v-if="shopVideo.length != 0"
+      :shopVideo="shopVideo"
+      :shopNotice="shopNotice"
+      :noticeIcon="shopData.noticeIcon"
+    ></themes-live>
+    <!-- 菜单 -->
+    <themes-hot
+      v-if="shopMenu.length != 0"
+      :shopMenu="shopMenu"
+      :isShowDots="isShowDots"
+    ></themes-hot>
+    <!-- 团购 -->
+    <themes-tuangou
+      v-if="shopTuangou.length != 0"
+      :shopTuangou="shopTuangou"
+    ></themes-tuangou>
+    <!-- 笔记 -->
+    <themes-note
+      v-if="shopNote.length != 0"
+      :shopNote="shopNote"
+    ></themes-note>
+    <!-- 推荐商品 -->
+    <themes-recommend
+      v-if="shopProduct.length != 0"
+      :shopProduct="shopProduct"
+    ></themes-recommend>
+    <!-- 精选商品 -->
+    <themes-shop
+      v-if="shopSelPro.length != 0"
+      :shopProduct="shopSelPro"
+    ></themes-shop>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/choiceness.js";
+import themesCouponOne from "./components/themes-coupon-one.vue";
+import themesHot from "./components/themes-hot.vue";
+import themesTuangou from "./components/themes-tuangou.vue";
+import themesRecommend from "./components/themes-recommend.vue";
+import themesShop from "./components/themes-shop.vue";
+import themesNote from "./components/themes-note.vue";
+import themesLive from "./components/themes-live.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesCouponOne,
+    themesHot,
+    themesTuangou,
+    themesRecommend,
+    themesShop,
+    themesNote,
+    themesLive,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-choiceness {
+    margin-top: -30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/classify.vue b/pagesA/themes/haiNaBaiXian/classify.vue
new file mode 100644
index 0000000..f7abd27
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/classify.vue
@@ -0,0 +1,173 @@
+<template>
+  <view class="themes-classify">
+    <image class="themes-classify__img" :src="shopData.bgimg" mode="widthFix"></image>
+    <block v-if="flag">
+      <themes-head
+        :navHeight="navHeight"
+        :shopData="shopData"
+        :isShowNav="false"
+        :navIndex="1"
+      ></themes-head>
+      <view class="themes-content">
+        <view class="themes-content__left">
+          <view
+            class="classify-item"
+            :class="{ actived: currentIndex === '' }"
+            @tap="selectAll()"
+            >全部</view
+          >
+          <view
+            class="classify-item"
+            v-for="(item, index) in shopCategory"
+            :key="index"
+            :class="{ actived: currentIndex === index }"
+            @tap="categoryHandle(item.id, index)"
+          >
+            {{ item.name }}
+          </view>
+        </view>
+        <view class="themes-content__right">
+          <view class="classify-tabs">
+            <view
+              class="classify-tabs__item"
+              :class="{ actived: isSelectAll }"
+              @tap="selectCategoryAll()"
+              >全部</view
+            >
+            <view
+              class="classify-tabs__item"
+              v-for="(item, index) in shopCategorychild"
+              :key="index"
+              :class="{ actived: curidx === index && !isSelectAll }"
+              @tap="categoryChildHandle(item.id, index)"
+              >{{ item.name }}</view
+            >
+          </view>
+          <scroll-view
+            class="themes-content__scroll"
+            :scroll-y="true"
+            @scrolltolower="getmorecomment"
+          >
+            <classifyShop :shopProduct="shopProduct"></classifyShop>
+            <loading v-if="loading"></loading>
+            <nomore v-if="nomore"></nomore>
+            <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+          </scroll-view>
+        </view>
+      </view>
+    </block>
+    <loading v-else></loading>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/classify.js';
+import themesHead from "./components/themes-head.vue";
+import classifyShop from "./components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    classifyShop,
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.themes-classify {
+  height: 100vh;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  z-index: 1;
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    height: 1020rpx;
+  }
+}
+.themes-content {
+  position: relative;
+  z-index: 2;
+  box-sizing: border-box;
+  overflow: hidden;
+  margin-top: 28rpx;
+  background: #fff;
+  position: relative;
+  border-radius: 12rpx 12rpx 0 0;
+  display: flex;
+  flex: 1;
+  &__left {
+    width: 180rpx;
+    flex-shrink: 0;
+    background: #f8f9fa;
+    overflow-y: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  &__right {
+    flex: 1;
+    box-sizing: border-box;
+    padding: 28rpx 28rpx 0;
+    position: relative;
+    /deep/ .nodata {
+      margin-left: -30rpx;
+    }
+  }
+  &__scroll {
+    height: calc(100% - 86rpx);
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  .classify-item {
+    height: 110rpx;
+    line-height: 110rpx;
+    text-align: center;
+    font-size: 28rpx;
+    color: #666666;
+    &.actived {
+      color: #1870C5;
+      background: #fff;
+      font-weight: 500;
+    }
+  }
+  .classify-tabs {
+    display: flex;
+    margin-bottom: 30rpx;
+    overflow-x: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &__item {
+      flex-shrink: 0;
+      min-width: 80rpx;
+      box-sizing: border-box;
+      margin-right: 20rpx;
+      padding: 0 18rpx;
+      font-size: 22rpx;
+      line-height: 42rpx;
+      border-radius: 42rpx;
+      color: #666666;
+      background: #f7f7f7;
+      &.actived {
+        background: #E6EFFF;
+        color: #1870C5;
+      }
+    }
+  }
+  /deep/ .nomore {
+    margin-left: 32rpx;
+  }
+  /deep/ .nodata {
+    width: calc(100vw - 180rpx);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/classify-shop.vue b/pagesA/themes/haiNaBaiXian/components/classify-shop.vue
new file mode 100644
index 0000000..ba70269
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/classify-shop.vue
@@ -0,0 +1,221 @@
+<template>
+  <view
+    class="classify-shops"
+  >
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-item flex"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-item__hd flex j-center al-item-center">
+              <image
+                class="shops-item__img"
+                :src="item.pic"
+                mode="aspectFill"
+              ></image>
+            </view>
+            <view class="shops-item__bd">
+              <view class="shops-item__title text-overflow-line">{{ item.name }}</view>
+              <view class="shops-item__sale">已售{{ item.sales }}</view>
+              <view class="shops-item__bottom flex al-item-center j-between">
+                <view class="shops-item__price flex">¥<text class="shops-item__num">{{ item.sell_price }}</text></view>
+                <view class="shops-item__icon"
+                    @click.stop="buydialogChange"
+                    :data-proid="item.proid"></view>
+              </view>
+            </view>
+          </view>
+        </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.classify-shops {
+    padding-bottom: 20rpx;
+    box-sizing: border-box;
+    .shops-item {
+      padding: 20rpx 0 14rpx;
+      &:not(:last-child) {
+        border-bottom: 1rpx solid #ECECEC;
+      }
+      &__hd {
+        width: 192rpx;
+        height: 192rpx;
+        flex-shrink: 0;
+      }
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+      &__bd {
+        flex: 1;
+        margin-left: 12rpx;
+      }
+      &__title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: 36rpx;
+        margin-bottom: 36rpx;
+        min-height: 72rpx;
+      }
+      &__sale {
+        font-size: 18rpx;
+        color: #999999;
+        line-height: 22rpx;
+        margin-bottom: 4rpx;
+      }
+      &__price {
+        color: #FF4800;
+        font-weight: 500;
+        font-size: 24rpx;
+        line-height: 34rpx;
+        align-items: baseline;
+      }
+      &__num {
+        margin-left: 4rpx;
+        font-size: 36rpx;
+        line-height: 50rpx;
+      }
+      &__icon {
+					width: 44rpx;
+					height: 44rpx;
+          margin-top: -4rpx;
+					background: linear-gradient(180deg,#3098d2 0%, #4d8ad6 100%);
+					border-radius: 20rpx;
+					position: relative;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 8rpx;
+						right: 8rpx;
+						height: 4rpx;
+						top: 50%;
+						transform: translateY(-50%);
+						background: #FFF;
+					}
+					&::after {
+						content: "";
+						position: absolute;
+						top: 8rpx;
+						bottom: 8rpx;
+						width: 4rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						background: #FFF;
+					}
+				}
+    }
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    border: none;
+    // width: 100%;
+    height: auto;
+    display: flex;
+    padding-bottom: 25rpx;
+    &:not(:last-child) {
+      position: relative;
+      &::after {
+        content: "";
+        position: absolute;
+        bottom: 5rpx;
+        left: 0;
+        right: 0;
+        border-bottom: 1rpx solid rgba(0,0,0,0.1);
+        transform: scaleY(0.5);
+      }
+    }
+    &__hd {
+      width: 200rpx;
+      height: 200rpx;
+      border-radius: 12rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+    .shops-img {
+      width: 100%;
+      height: 100%;
+    }
+    .item-info {
+      flex: 1;
+      padding: 0 20rpx;
+    }
+    .shops-c-t {
+      padding-top: 15rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      min-height: 75rpx;
+    }
+    .shops-s-t {
+      padding-top: 10rpx;
+      font-size: 24rpx;
+      color: #999;
+    }
+    .shops-b-t {
+      padding-top: 10rpx;
+
+      .b-t1 {
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 30rpx;
+      }
+      .b-t3 {
+        color: #999;
+      }
+      .car {
+        width: 44rpx;
+        height: 44rpx;
+
+        .icon_gouwuche {
+          color: #fff;
+          font-size: 32rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-banner.vue b/pagesA/themes/haiNaBaiXian/components/themes-banner.vue
new file mode 100644
index 0000000..131eeff
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-banner.vue
@@ -0,0 +1,74 @@
+<template>
+  <view class="themes-banner">
+    <swiper
+      class="swiper-container"
+      :indicator-dots="true"
+      :autoplay="true"
+      circular="true"
+      :interval="5000"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopBanner"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <image class="swiper-item__img" :src="item.imgurl"></image>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopBanner: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    }
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+}
+</script>
+
+<style lang="scss" scoped>
+.themes-banner {
+  .swiper-container {
+    width: 100%;
+    height: 800rpx;
+    margin-top: 28rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+    .wx-swiper-dot {
+      width: 12rpx;
+      height: 8rpx;
+      border-radius: 20rpx;
+    }
+    .wx-swiper-dot::before {
+      content: "";
+      flex-grow: 1;
+      background: #efbd6f;
+    }
+    .wx-swiper-dot-active::before {
+      width: 50rpx;
+      background: #efbd6f;
+    }
+    .swiper-item {
+      width: 100%;
+      height: 100%;
+      border-radius: 10rpx;
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-c-img.vue b/pagesA/themes/haiNaBaiXian/components/themes-c-img.vue
new file mode 100644
index 0000000..1c986be
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-c-img.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="themes-c-img" :class="[top? 'top' : 'top-z',navHeight > 60 ? 'top-m': '']">
+		<image class="kn-img" src="https://img0.baidu.com/it/u=617696644,3314521124&fm=253&fmt=auto&app=138&f=JPEG?w=625&h=500" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			top: {
+				type: Boolean,
+				default: false
+			},
+			navHeight: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+	
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-c-img {
+		display: flex;
+		.kn-img {
+			width: 100%;
+			border-radius: 12rpx
+			// vertical-align: middle;
+		}
+	}
+	.top {margin-top: -190rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -160rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-chunk-title-two.vue b/pagesA/themes/haiNaBaiXian/components/themes-chunk-title-two.vue
new file mode 100644
index 0000000..4fd66a5
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-chunk-title-two.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="shops-til flex al-item-center">
+		<image class="shops-til__icon" :src="event_rul + '/static/images/img/title-bg1.svg'"></image>
+		<view class="shops-til__title">{{ title }}</view>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default{
+		data() {
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props:{
+			title: {
+				type: String,
+				default: ''
+			},
+			titleBg: {
+				type: String,
+				default: ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shops-til {
+        position: relative;
+        justify-content: center;
+        height: 76rpx;
+		margin: 28rpx 0 24rpx;
+		&__icon {
+            position: absolute;
+            z-index: -1;
+            left: 50%;
+            top: 0;
+            transform: translateX(-50%);
+			width: 354rpx;
+			height: 100%;
+			flex-shrink: 0;
+		}
+		&__title {
+			font-size: 36rpx;
+            font-weight: 500;
+            color: #FFFFFF;
+            line-height: 50rpx;
+            letter-spacing: 2rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-chunk-title.vue b/pagesA/themes/haiNaBaiXian/components/themes-chunk-title.vue
new file mode 100644
index 0000000..0845bfe
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-chunk-title.vue
@@ -0,0 +1,50 @@
+<template>
+	<view class="shops-til flex al-item-center j-center">
+		<image class="shops-til__dot-left" :src="event_rul + '/static/images/title-desc.svg'"></image>
+		<view class="shops-til__title">{{ title }}</view>
+		<image class="shops-til__dot-right" :src="event_rul + '/static/images/title-desc.svg'"></image>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default{
+		data(){
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		props:{
+			title: {
+				type: String,
+				default: ''
+			},
+			iconSrc: {
+				type: String,
+				default: ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shops-til {
+		height: 70rpx;
+		background: linear-gradient(270deg, rgba(41,139,201,0.7000) 0%, #0072B1 100%);
+		border-radius: 10rpx 10rpx 0 0;
+		&__dot-left,&__dot-right {
+			width: 28rpx;
+			height: 12rpx;
+		}
+		&__dot-left {
+			transform: rotate(180deg);
+		}
+		&__title {
+			padding: 0 20rpx;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 44rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-coupon-one.vue b/pagesA/themes/haiNaBaiXian/components/themes-coupon-one.vue
new file mode 100644
index 0000000..a31f8af
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-coupon-one.vue
@@ -0,0 +1,198 @@
+<template>
+	<view class="themes-coupon">
+		<scroll-view class="scroll-list" :scroll-x="true">
+			<block v-for="(item, idx) in shopCoupon1" :key="idx">
+				<!-- isUse 是按钮为'去使用'的优惠券 -->
+				<view class="scroll-list__item" v-if="!item.isOver" :class="{ 'isUse': item.isUse }" @tap.stop="getcoupon" :data-idx="idx" :data-id="item.couponid" :data-price="item.price" :data-score="item.score">
+					<image class="scroll-list__item-bg" :src="item.isUse ? event_rul + '/static/images/img/selected1.svg' : event_rul + '/static/images/img/isSelect1.svg'"></image>
+					<view class="conpon-price">
+						<view class="conpon-price-c flex j-center">
+							<text class="price-f">¥</text>
+							<text class="price-num font-w">{{ item.money }}</text>
+						</view>
+						<view class="conpon-price-h">满{{ item.minprice }}元使用</view>
+					</view>
+					<view class="conpon-ft">
+						<view class="conpon-txt">优惠券</view>
+						<view class="conpon-btn border-rius-r flex al-item-center">{{ item.msg || '点击领取' }}</view>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	import { mapState } from "vuex";
+	export default{
+		props:{
+			shopCoupon: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data() {
+			return {
+				shopCoupon1: this.shopCoupon,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		watch: {
+			shopCoupon (newV, oldV) {
+				this.shopCoupon1 = newV;
+			
+				console.log("shopCoupon1",this.shopCoupon1)
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+		methods: {
+			// 点击领取优惠券
+			getcoupon: function (e) {
+				
+				var that = this;
+				var idx = e.currentTarget.dataset.idx;
+				var id = e.currentTarget.dataset.id;
+				var score = parseInt(e.currentTarget.dataset.score);
+				var price = e.currentTarget.dataset.price;
+				
+				if (price > 0) {
+					app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+						console.log(res)
+						if(res.status == 0) {
+								app.error(res.msg);
+						} else {
+							app.goto('/pages/pay/pay?id=' + res.payorderid);
+						}
+					})
+					return;
+				}
+				if (score > 0) {
+					app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+						app.showLoading('兑换中');
+						app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+							app.showLoading(false);
+							if (data.status == 0) {
+								app.error(data.msg);
+							} else {
+								app.success(data.msg);
+							}
+						});
+					});
+				}
+				that.shopCoupon.map((item,index) => {
+					console.log(index,idx)
+					if(index === idx) {
+						if(item.isUse) {
+							uni.navigateTo({
+								url:'/pages/shop/prolist?cpid='+ id
+							})
+						} else if(item.isOver) {
+							return;
+						} else {
+							app.showLoading('领取中');
+							app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+								app.showLoading(false);
+								if (data.status == 0) {
+									app.error(data.msg);
+								} else {
+									app.success(data.msg);
+									that.$set(item,"msg","去使用");
+									that.$set(item,'isUse',true);
+									that.$set(item,'isOver',false);
+								}
+							});
+						}
+					}
+				})				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-coupon {
+		margin-top: 24rpx;
+		position: relative;
+		right: -28rpx;
+		left: 0;
+		width: calc(100% + 28rpx);
+		.scroll-list {
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			.scroll-list__item {
+				// background: pink;
+				display: inline-flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-right: 28rpx;
+				position: relative;
+				width: 234rpx;
+				height: 106rpx;
+				padding: 8rpx 12rpx 16rpx 16rpx;
+				z-index: 1;
+				&.isUse {
+					.conpon-btn {
+						border: 1rpx solid #4A93DA;
+						color: #4A93DA;
+					}
+				}
+				&-bg {
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 100%;
+					height: 100%;
+					z-index: -1;
+				}
+				.conpon-price {
+					color: #FFF;
+					.conpon-price-c {
+						align-items: flex-start;
+						.price-f {
+							padding: 20rpx 2rpx 0 0;
+							font-size: 24rpx;
+							line-height: 34rpx;
+						}
+						.price-num {
+							font-size: 44rpx;
+							line-height: 60rpx;
+							letter-spacing: 2rpx;
+						}
+					}
+					.conpon-price-h {
+						margin-top: -6rpx;
+						font-size: 20rpx;
+						line-height: 28rpx;
+					}
+				}
+				.conpon-txt {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #4E96DC;
+					line-height: 34rpx;
+					padding-top: 10rpx;
+				}
+				.conpon-btn {
+					width: 76rpx;
+					justify-content: center;
+					margin-top: 14rpx;
+					font-size: 16rpx;
+					line-height: 22rpx;
+					color: #FFF;
+					background: #4A93DA;
+				}
+			}
+		}
+	}
+	
+	.top {margin-top: -70rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -40rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-head.vue b/pagesA/themes/haiNaBaiXian/components/themes-head.vue
new file mode 100644
index 0000000..8177151
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-head.vue
@@ -0,0 +1,418 @@
+<template>
+  <view
+    class="themes-head position-r"
+    :style="{ 'padding-top': navHeight + 'px' }"
+  >
+    <view
+      class="head-bx-h"
+      :style="'height:'+ navHeight+'px;background:'+(shopInfo.bgimg ?'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top 0 left 0':'')"
+    >
+      <view class="head-bx-ct position-a flex al-item-center">
+        <text class="iconfont icon-icon_arrow_left" @tap="goBack"></text>
+        <text
+          class="iconfont icon-shouye"
+          @tap="goto"
+          data-url="/pages/index/index"
+          data-opentype="reLaunch"
+        ></text>
+        <view class="search flex al-item-center j-between border-rius-r">
+          <text class="iconfont icon-search"></text>
+          <input
+            placeholder="请输入搜索内容..."
+            type="text"
+            v-model="searchVlaue"
+            @confirm="search"
+          />
+        </view>
+      </view>
+    </view>
+
+    <view class="head-bx-cont">
+      <view class="head-store flex al-item-center j-between">
+        <view class="store-l flex al-item-center">
+          <image class="store-logo" :src="shopInfo.logo"></image>
+          <view class="store-l-c flex1">
+            <view
+              class="store-l-tlt flex al-item-center"
+              @click="goto"
+              :data-url="
+                '/pagesA/shop/shop-detail?bid=' +
+                shopInfo.id +
+                '&pagestext=' +
+                shopInfo.name
+              "
+            >
+              <text class="head-store__name">{{ shopInfo.name || "" }}</text>
+              <text class="iconfont icon-arrow-right"></text>
+            </view>
+            <!-- <view class="store-l-tx text-center" :style="{'background-color': '#FF8017'}">自营</view> -->
+          </view>
+        </view>
+        <view class="store-r flex flex-colum al-item-center">
+          <view
+            @tap="followFn"
+            class="store-r-tlt text-center"
+            :class="shopInfo.isFollow ? 'followed' : 'isFollow'"
+          >
+            <image
+              class="follow-icon"
+              v-if="!shopInfo.isFollow"
+              :src="event_rul + '/static/theme/follow-icon.svg'"
+            ></image>
+            <text>{{ shopInfo.isFollow ? "已关注" : "关注" }}</text>
+          </view>
+          <!-- <view class="store-r-tlt text-center" :style="{'border-color': '#FF8017', 'color': '#FF8017','border':' 1px solid'}">已关注</view> -->
+          <view class="store-r-tx">{{ shopInfo.attention || 0 }}人关注</view>
+        </view>
+      </view>
+      <view
+        v-if="isShowNav"
+        class="head-nav-list flex j-between"
+        :class="{ 'isFixed': navFixed }"
+        :style="'top:'+ (navHeight - 1) + 'px;background:'+(navFixed ? (shopInfo.bgimg ? 'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top -60px left 0':''):'')"
+      >
+        <block v-for="(item, idx) in navBar" :key="idx">
+          <view class="nav-list-itm" @tap="selectNav(idx)">
+            <view class="itm-tx color-white">{{ item }}</view>
+            <view
+              v-show="navIndex == idx"
+              class="itm-select border-rius-r"
+            ></view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState, mapActions } from "vuex";
+var app = getApp();
+export default {
+  props: {
+    navHeight: {
+      type: Number,
+      default: 0,
+    },
+    navList: {
+      typa: Array,
+      default: function() {
+        return [];
+      },
+    },
+    shopData: {
+      typa: Object,
+      default: {},
+    },
+    navIndex: {
+      type: Number,
+      default: 0,
+    },
+    isShowNav: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      bxContHeight: 0,
+      timeout: null,
+      timeouttwo: null,
+      searchVlaue: "",
+      shopInfo: this.shopData,
+      event_rul: app.globalData.event_url,
+      navBar: [],
+    };
+  },
+  computed: {
+    ...mapState(["opt","navFixed","heardHeight"]),
+  },
+  watch: {
+    // 监听shopData变化
+    shopData(newV, oldV) {
+      this.shopInfo = newV;
+    },
+    navList: {
+      handler: function(newV, oldV) {
+        this.navBar = newV;
+      },
+      deep: true,
+    }
+  },
+  mounted() {
+    const vr = uni.getSystemInfoSync();
+    this.styleHeight();
+    this.getData();
+  },
+  beforeDestroy() {
+    clearTimeout(this.timeout);
+    clearTimeout(this.timeouttwo);
+  },
+  methods: {
+    ...mapActions(["acNavHeightTop","acHeardHeight"]),
+    getData() {
+      if (this.navList.length == 0) {
+        this.navBar = ["精选", "商品", "活动", "新品"];
+      } else {
+        this.navBar = this.navList;
+      }
+      const query = uni.createSelectorQuery().in(this);
+      this.timeouttwo = setTimeout(() => {
+        let listTop = 0;
+        query.select(".head-nav-list").boundingClientRect((data) => {
+          listTop = data ? Number(data.top) : 0;
+        }).exec();
+        query.select(".head-bx-cont").boundingClientRect((data) => {
+          const heightTop = listTop - (data ? Number(data.top) : 0);
+          this.acNavHeightTop(heightTop);
+        }).exec();
+      }, 200)
+    },
+    // 关注店铺
+    followFn() {
+      var that = this;
+      console.log("打印店铺信息+++++", this.shopData, this.shopData);
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.shopData.id || "", type: "store" },
+        function (res) {
+          console.log("点击关注和取消关注addFollow===========", res);
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo();
+        }
+      );
+    },
+
+    getInfo() {
+      var that = this;
+      // 暂时写死 id：27，正确为 id：that.shopData.id
+      app.post(
+        "/ApiBusiness/follow",
+        { bid: that.shopData.id || "" },
+        function (res) {
+          that.$set(that.shopData, "attention", res.data.followCount);
+          that.$set(that.shopData, "isFollow", res.data.isFollow);
+
+          console.log("-----", that.shopData);
+          // 公共头部信息
+          uni.setStorage({
+            key: "header_data",
+            data: that.shopData,
+          });
+        }
+      );
+    },
+
+    styleHeight() {
+      let query = uni.createSelectorQuery().in(this);
+      query.select(".head-bx-cont").boundingClientRect();
+      query.select(".themes-head").boundingClientRect();
+      this.timeout = setTimeout(() => {
+        query.exec((res) => {
+          if (res[0] != null && res[1] != null) {
+            this.bxContHeight = res[0].height;
+            console.log(this.navFixed)
+            if(!this.navFixed) {
+              this.acHeardHeight(res[1].height)
+            }
+          }
+        });
+      }, 200)
+    },
+    // 返回
+    goBack() {
+      uni.navigateBack();
+    },
+    // 搜索
+    search() {
+      uni.navigateTo({
+        url:
+          "/pagesA/shop/search?keyword=" +
+          this.searchVlaue +
+          "&id=" +
+          this.shopData.id,
+      });
+      return;
+    },
+    selectNav(idx) {
+      this.$emit("navselect", idx, this.bxContHeight, this.heardHeight);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-head {
+  width: 100%;
+  flex-shrink: 0;
+  z-index: 3;
+  .head-bx-h {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 99;
+    background-size: 100% 1020rpx;
+    background-position: top 0 left 0;
+    .head-bx-ct {
+      height: 32px;
+      left: 0;
+      bottom: 4px;
+
+      .icon-icon_arrow_left {
+        padding-left: 30rpx;
+        color: #fff;
+        font-size: 50rpx;
+      }
+      .icon-shouye {
+        font-size: 45rpx;
+        color: #fff;
+        padding: 10rpx 20rpx;
+      }
+      .search {
+        margin-left: 20rpx;
+        width: 60%;
+        height: 100%;
+        padding: 0 20rpx;
+        background-color: #fff;
+
+        .icon-search {
+          font-size: 50rpx;
+          color: #ababab;
+        }
+        input {
+          padding-left: 10rpx;
+        }
+      }
+    }
+  }
+
+  .head-bx-cont {
+    padding-top: 30rpx;
+
+    .head-store {
+      color: #fff;
+      padding: 0 28rpx;
+      &__name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        /* autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        text-align: justify;
+      }
+      .store-l {
+        width: 80%;
+        .store-logo {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 12rpx;
+        }
+
+        .store-l-c {
+          padding-left: 20rpx;
+          .store-l-tlt {
+            font-size: 32rpx;
+            white-space: pre-wrap;
+            word-break: break-all;
+            padding-right: 45rpx;
+            display: flex;
+            align-items: center;
+
+            .icon-arrow-right {
+              font-size: 40rpx;
+              padding: 6rpx 0 0 0;
+            }
+          }
+          .store-l-tx {
+            min-width: 60rpx;
+            // min-height: 30rpx;
+            padding: 4rpx 10rpx;
+            margin-top: 8rpx;
+            line-height: 30rpx;
+            display: inline-block;
+            font-size: 24rpx;
+            border-radius: 4rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
+
+      .store-r {
+        .store-r-tlt {
+          width: 120rpx;
+          height: 48rpx;
+          line-height: 48rpx;
+          border-radius: 24rpx;
+          font-size: 24rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          &.isFollow {
+            background: linear-gradient(150deg, #EA1F05 0%, #F54617 100%);
+            color: #fff;
+            .follow-icon {
+              width: 28rpx;
+              height: 24rpx;
+              margin-right: 6rpx;
+            }
+          }
+          &.followed {
+            color: #fff;
+            position: relative;
+            &::before {
+              content: "";
+              position: absolute;
+              left: 0;
+              top: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #fff;
+              box-sizing: border-box;
+              transform: scale(0.5, 0.5);
+              border-radius: 48rpx;
+              transform-origin: 0 0;
+            }
+          }
+        }
+
+        .store-r-tx {
+          padding-top: 6rpx;
+          font-size: 22rpx;
+        }
+      }
+    }
+
+    .head-nav-list {
+      padding: 0 28rpx;
+      font-size: 28rpx;
+      align-items: flex-start;
+      background-size: 100% 1020rpx;
+      &.isFixed {
+        position: fixed;
+        left: 0;
+        right: 0;
+      }
+      .nav-list-itm {
+        padding: 28rpx 32rpx 0;
+        .itm-tx {
+          z-index: 6;
+        }
+        .itm-select {
+          width: 100%;
+          height: 6rpx;
+          margin-top: 6rpx;
+          z-index: 2;
+          background: #fff;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-hot.vue b/pagesA/themes/haiNaBaiXian/components/themes-hot.vue
new file mode 100644
index 0000000..c9bf9a6
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-hot.vue
@@ -0,0 +1,183 @@
+<template>
+  <view class="themes-hot-sale">
+    <scroll-view class="scroll-list" :scroll-x="true" @scroll="scrollHandle($event)">
+      <view class="scroll-list-row" v-for="(items, idx) in shopMenu" :key="idx">
+        <view
+          class="scroll-list-item"
+          v-for="(item, index) in items"
+          :key="index"
+          @tap.stop="goShopCgry(item.hrefurl, item.id)"
+        >
+          <view class="list-item flex flex-w">
+            <view class="list-item-c flex flex-colum al-item-center">
+              <view class="list-item-cnt position-r">
+                <image
+                  class="item-c-img border-rius-r"
+                  :src="item.imgurl"
+                  mode=""
+                ></image>
+                <!-- <text
+                  class="item-c-hot hot-s1 position-a"
+                  :style="{ 'border-color': '#FE7D11', color: '#FE7D11' }"
+                  v-if="index == 0"
+                  >HOT</text
+                > -->
+              </view>
+              <text class="list-item-tl fs12">{{ item.text }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view v-if="isShowDots" class="list-dots">
+      <view class="list-dots__item" :style="'left:' + dotLeft + 'px'"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  props: {
+    shopMenu: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    isShowDots: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      width: 0,  // scroll-list节点宽度
+      dotLeft: 0,  // 圆点滚动的距离
+    }
+  },
+  computed: {
+    ...mapState(["opt"]),
+  },
+  mounted() {
+    const query = uni.createSelectorQuery().in(this);
+    query.select('.scroll-list').boundingClientRect(data => {
+      this.width = data.width;
+      console.log("得到布局位置信息" + this.width);
+    }).exec();
+  },
+  methods: {
+    scrollHandle(e){
+      let scrollLeft = e.detail.scrollLeft;
+      let scrollWidth  = e.detail.scrollWidth;
+      let ratio = scrollLeft / (scrollWidth - this.width);
+      this.dotLeft = 18 * ratio;
+    },
+    goShopCgry(url, id) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-hot-sale {
+  background: #FFF;
+  padding: 16rpx 16rpx;
+  box-shadow: 0rpx 4px 8rpx 0rpx rgba(0,0,0,0.0300);
+  border-radius: 20rpx;
+  margin-top: 28rpx;
+  .swiper-container {
+    height: 450rpx;
+    &.swiper-single {
+      height: 210rpx;
+    }
+  }
+
+  .scroll-list {
+    width: 100%;
+    position: relative;
+    width: calc(100% + 16rpx);
+    right: -16rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &-row:not(:last-child) {
+      margin-bottom: 18rpx;
+    }
+    .scroll-list-item {
+      background: none;
+      display: inline-block;
+      margin-left: 35rpx;
+
+      .list-item-c {
+        width: 106rpx;
+
+        .list-item-cnt {
+          .item-c-img {
+            width: 90rpx;
+            height: 90rpx;
+            vertical-align: middle;
+          }
+
+          .item-c-hot {
+            padding: 2rpx 10rpx;
+            font-size: 20rpx;
+            border: 2rpx solid;
+            border-radius: 50rpx 60rpx 60rpx 0px;
+            background-color: #fff;
+            top: 6rpx;
+            right: -12rpx;
+          }
+
+          .hot-s1 {
+            background-color: #fff;
+          }
+        }
+        .list-item-tl {
+          max-width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          padding-top: 10rpx;
+        }
+      }
+    }
+    .scroll-list-item:first-child {
+      margin-left: 0;
+    }
+  }
+  .list-dots {
+    margin-top: 18rpx;
+    position: relative;
+    width: 72rpx;
+    height: 6rpx;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #EAEAEA;
+    border-radius: 6rpx;
+    &__item {
+      position: absolute;
+      top: 0;
+      width: 50%;
+      height: 100%;
+      background: #269DD1;
+    }
+  }
+}
+
+.top {
+  margin-top: -60rpx;
+}
+.top-z {
+  margin-top: 0rpx;
+}
+.top-m {
+  margin-top: -50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-live.vue b/pagesA/themes/haiNaBaiXian/components/themes-live.vue
new file mode 100644
index 0000000..4bbea38
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-live.vue
@@ -0,0 +1,271 @@
+<template>
+  <view class="themes-live position-r">
+    <view
+      v-for="(item, index) in shopVideo"
+      :key="index"
+      @click="goto"
+      :data-url="'/activity/shortvideo/detail?id=' + item.videoId"
+    >
+      <view class="bofang-box">
+        <text class="iconfont icon-bofang"></text>
+      </view>
+      <image
+        class="themes-live-bg"
+        :src="item.coverimg"
+        mode="aspectFill"
+      ></image>
+      <view class="themes-live__content position-a">
+        <view class="themes-live__note">
+          <themes-vip
+            v-if="shopNotice.length != 0"
+            :shopNotice="shopNotice"
+            :noticeIcon="shopData.noticeIcon"
+          ></themes-vip>
+        </view>
+        <view class="live-an-t flex al-item-center j-between">
+          <view class="live-an-t-l-r">{{
+            formatSeconds(Number(item.video_duration)) || "00:00"
+          }}</view>
+          <view class="live-an-t-l flex j-between">
+            <text class="heng1"></text>
+            <text class="heng2"></text>
+            <text class="heng3"></text>
+          </view>
+        </view>
+        <view class="goods flex al-item-center position-a" v-if="item.hasOwnProperty('goods')">
+          <image
+            class="goods-img"
+            :src="item.goods.propic"
+            mode="aspectFill"
+          ></image>
+          <view class="goods-bd flex1 overflow-hd flex flex-colum j-between">
+            <text class="goods-title text-overflow-line">{{ item.goods.proname }}</text>
+            <view class="goods-bot flex al-item-center">
+              <view class="goods-price">
+                ¥<text class="goods-price__num font-w">{{
+                item.goods.prosell_price
+              }}</text>
+              </view>
+              <view class="goods-more"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import themesVip from "./themes-vip.vue";
+export default {
+  components: {
+    themesVip
+  },
+  props: {
+    shopVideo: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    noticeIcon: {
+      type: String,
+      default: '',
+    },
+    shopNotice: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      shopData:{},
+    };
+  },
+  mounted() {
+    uni.getStorage({
+      key: "header_data",
+      success: function(res){
+          this.shopData = res.data;
+      },
+    })
+  },
+  methods: {
+    formatSeconds(time){
+				let newTime,hour,minite,seconds;
+				if(time >= 3600){
+				hour = parseInt(time/3600) < 10 ? '0' + parseInt(time/3600) : parseInt(time/3600);
+				minite = parseInt(time%3600/60) < 10 ? '0' + parseInt(time%3600/60):parseInt(time%3600/60);
+				seconds = time%3600%60 < 10 ? '0' + Math.round(time%3600%60) : Math.round(time%3600%60);
+				newTime = hour + ':' + minite + ':' + seconds;
+				}else if(time >= 60 && time < 3600){
+				minite = parseInt(time/60) < 10 ? '0' + parseInt(time/60) : parseInt(time/60);
+				seconds = time%60 < 10 ? '0' + Math.round(time%60) : Math.round(time%60);
+				newTime = minite + ':' + seconds;  
+				}else if(time < 60 ){
+				seconds = time < 10 ? '0' + Math.round(time) : Math.round(time);
+				newTime = '00:'+ seconds;
+				}
+				return newTime;
+			},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-live {
+  margin-top: 30rpx;
+  .bofang-box {
+    top: 50%;
+    left: 50%;
+    width: 66rpx;
+    height: 66rpx;
+    position: absolute;
+    background: rgba($color: #000000, $alpha: 0.5);
+    transform: translateX(-50%) translateY(-70%);
+    border-radius: 50%;
+  }
+  .icon-bofang {
+    position: absolute;
+    color: #FFF;
+    font-size: 30rpx;
+    left: 50%;
+    top: 50%;
+    transform: translateX(-45%) translateY(-50%);
+  }
+
+  .themes-live-bg {
+    width: 100%;
+    height: 400rpx;
+    border-radius: 12rpx;
+    vertical-align: middle;
+  }
+  .themes-live__content {
+    top: 22rpx;
+    left: 16rpx;
+    bottom: 16rpx;
+  }
+  .live-an-t {
+    margin-top: 10rpx;
+    display: inline-flex;
+    align-items: center;
+    background: linear-gradient(to right, #ff841a 0%, #ff640a 100%);
+    padding: 0 6rpx;
+    border-radius: 4rpx;
+
+    .live-an-t-l {
+     align-items: flex-end;
+      height: 30rpx;
+      padding: 6rpx 0;
+
+      .heng1,
+      .heng2,
+      .heng3 {
+        display: block;
+        width: 4rpx;
+        border-radius: 4rpx;
+        margin-right: 3rpx;
+        background-color: #fff;
+      }
+      .heng1 {
+        height: 18rpx;
+        animation: hengos .8s linear infinite;
+      }
+      .heng2 {
+        height: 8rpx;
+        animation: hengts .8s linear  infinite;
+      }
+      .heng3 {
+        height: 18rpx;
+        animation: henghs .8s linear .2s infinite;
+        margin-right: 0;
+      }
+    }
+    .live-an-t-l-r {
+      font-size: 20rpx;
+      color: #FFFFFF;
+      line-height: 30rpx;
+      margin-right: 4rpx;
+    }
+  }
+
+  .goods {
+    width: 360rpx;
+    height: 138rpx;
+    padding: 12rpx 12rpx 8rpx 12rpx;
+    box-sizing: border-box;
+    border-radius: 12rpx;
+    background-color: #fff;
+    left: 0;
+    bottom: 0;
+
+    &-img {
+      width: 118rpx;
+      height: 118rpx;
+      flex-shrink: 0;
+      border-radius: 10rpx;
+    }
+
+    &-bd {
+      padding-left: 12rpx;
+      color: #333333;
+    }
+    &-title {
+      font-size: 26rpx;
+      line-height: 36rpx;
+      min-height: 72rpx;
+    }
+  
+    &-bot {
+      justify-content: space-between;
+    }
+    &-price {
+      font-size: 22rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 32rpx;
+      &__num {
+        margin-left: 4rpx;
+        font-size: 30rpx;
+        line-height: 44rpx;
+      }
+    }
+    &-more {
+      width: 30rpx;
+      height: 30rpx;
+      border-radius: 50%;
+      background: linear-gradient(323deg, #5487D7 0%, #269DD1 100%);
+      position: relative;
+      &::before {
+        content: "";
+        position: absolute;
+        left: 0;
+        top: 50%;
+        width: 12rpx;
+        height: 12rpx;
+        border-top: 1rpx solid #FFFFFF;
+        border-right: 1rpx solid #FFFFFF;
+        transform: rotate(45deg) translateY(-72%);
+      }
+    }
+  }
+}
+
+@keyframes hengos {
+  0%   {height: 18rpx;}
+  50%  {height: 8rpx;}
+  100% {height: 18rpx;}
+}
+@keyframes hengts {
+  0%   {height: 8rpx;}
+  50%  {height: 18rpx;}
+  100% {height: 8rpx;}
+}
+@keyframes henghs {
+  0%   {height: 18rpx;}
+  50%  {height: 8rpx;}
+  100% {height: 18rpx;}
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-note.vue b/pagesA/themes/haiNaBaiXian/components/themes-note.vue
new file mode 100644
index 0000000..ee6dcf3
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-note.vue
@@ -0,0 +1,155 @@
+<template>
+  <view class="themes-note">
+    <themes-chunk-title-two title="热门笔记"></themes-chunk-title-two>
+    <scroll-view
+      class="scroll-list"
+      :scroll-x="true"
+    >
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="scroll-list-item overflow-hd"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <view class="scroll-list-item-ct flex flex-colum overflow-hd">
+            <view class="note-s overflow-hd position-r">
+              <image class="note-img" :src="item.pic+'?x-oss-process=image/resize,m_fill,w_120,h_115'" mode="aspectFill"></image>
+            </view>
+            <view class="note-b-cnt flex flex1 flex-colum j-between">
+              <text class="note-title text-overflow-line font-w">{{
+                item.title
+              }}</text>
+              <view class="note-c-b flex al-item-center j-between">
+                <view class="note-c-b-l flex al-item-center">
+                  <image
+                    class="note-u-img border-rius-r"
+                    :src="item.headimg"
+                    mode="aspectFill"
+                  ></image>
+                  <text class="text-overflow-tx flex1">{{
+                    item.nickname
+                  }}</text>
+                </view>
+                <view class="note-c-b-r flex al-item-center">
+                  <text class="iconfont icon-aixin"></text>
+                  <text class="z-tx">{{ item.zan ? (item.zan >= 10000 ? (item.zan / 10000).toFixed(1) + '万': item.zan) : 0 }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import themesChunkTitleTwo from './themes-chunk-title-two.vue'
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitleTwo
+  },
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+  .scroll-list {
+    position: relative;
+    width: calc(100% + 28rpx);
+    right: -28rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+
+    .scroll-list-item {
+      display: inline-block;
+      margin-right: 20rpx;
+      background-color: #fff;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 20rpx;
+      &:last-child {
+        margin-right: 28rpx;
+      }
+
+      .scroll-list-item-ct {
+        width: 320rpx;
+        height: 536rpx;
+
+        .note-s {
+          width: 100%;
+          height: 376rpx;
+
+          .note-img {
+            width: 100%;
+            height: 100%;
+          }
+
+          .note-hot {
+            left: 16rpx;
+            top: 14rpx;
+            line-height: 34rpx;
+
+            .note-hot-img {
+              width: 110rpx;
+              height: 34rpx;
+            }
+            .note-hot-tx {
+              font-size: 20rpx;
+            }
+          }
+        }
+
+        .note-b-cnt {
+          width: 100%;
+          padding: 22rpx 16rpx 20rpx;
+          white-space: normal;
+          .note-title {
+          }
+
+          .note-c-b {
+            font-size: 28rpx;
+            color: #999;
+            margin-top: 18rpx;
+            .note-c-b-l {
+              width: 60%;
+              .note-u-img {
+                width: 36rpx;
+                height: 36rpx;
+                margin-right: 10rpx;
+              }
+            }
+            .note-c-b-r {
+              .icon-aixin {
+                font-size: 28rpx;
+              }
+              .icon-aixin_shixin {
+                font-size: 28rpx;
+              }
+              .z-tx {
+                padding-left: 6rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-recommend.vue b/pagesA/themes/haiNaBaiXian/components/themes-recommend.vue
new file mode 100644
index 0000000..ef7a38e
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-recommend.vue
@@ -0,0 +1,179 @@
+<template>
+  <view class="themes-recommend">
+    <themes-chunk-title-two title="精选商品"></themes-chunk-title-two>
+    <block
+      class="themes-recommend__list"
+      v-for="(item, idx) in shopProduct"
+      :key="idx"
+    >
+      <view
+        class="themes-recommend__item"
+        @click="goto"
+        :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+      >
+        <view class="themes-recommend__item-tab" :style="'background: url(' + event_rul + '/static/images/img/tag-bg1.svg);background-size: contain;background-repeat:no-repeat;'">抢鲜价</view>
+        <view class="themes-recommend__item-hd">
+          <image
+            class="themes-recommend__item-img"
+            :src="item.pic"
+            mode="aspectFill"
+          ></image>
+        </view>
+        <view class="themes-recommend__item-bd">
+          <view class="themes-recommend__item-title">{{ item.name }}</view>
+          <view class="themes-recommend__item-price">
+            <text class="themes-recommend__item-symbol">¥</text>
+            <text class="themes-recommend__item-num">{{ item.sell_price }}</text>
+          </view>
+          <view
+            class="themes-recommend__item-btn"
+            @click.stop="buydialogChange"
+            :data-proid="item.proid"
+            >立即抢购</view
+          >
+        </view>
+      </view>
+    </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+import themesChunkTitleTwo from './themes-chunk-title-two.vue'
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitleTwo
+  },
+  props: {
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    menuindex: {
+      default: -1,
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {
+    // console.log(this.shopProduct)
+  },
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-recommend {
+  &__list {
+    border-radius: 10rpx;
+    overflow: hidden;
+    &:not(last-child) {
+      margin-top: 28rpx;
+    }
+  }
+  &__item {
+    display: flex;
+    position: relative;
+    height: 296rpx;
+    margin-top: 6rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.03);
+    border-radius: 10rpx;
+    padding: 40rpx 28rpx 0 30rpx;
+    overflow: hidden;
+    &-tab {
+      position: absolute;
+      top: 24rpx;
+      left: 0;
+      width: 128rpx;
+      height: 34rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 26rpx;
+      padding: 4rpx 10rpx;
+      z-index: 1;
+    }
+    &-hd {
+      width: 242rpx;
+      height: 242rpx;
+      flex-shrink: 0;
+    }
+    &-img {
+      width: 100%;
+      height: 100%;
+    }
+    &-bd {
+      flex: 1;
+      padding: 0 0 40rpx 36rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+    &-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 3;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+
+    }
+    &-price {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #FF6400;
+      line-height: 50rpx;
+    }
+    &-symbol {
+      font-size: 24rpx;
+      line-height: 34rpx;
+      margin-right: 6rpx;
+    }
+    &-btn {
+      position: absolute;
+      bottom: 28rpx;
+      right: 28rpx;
+      background: linear-gradient(to right, #269DD1 0%, #5487D7 100%);
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 50rpx;
+      border-radius: 25rpx;
+      padding: 0 22rpx;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-shop.vue b/pagesA/themes/haiNaBaiXian/components/themes-shop.vue
new file mode 100644
index 0000000..52481d6
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-shop.vue
@@ -0,0 +1,162 @@
+<template>
+  <view class="themes-shops">
+    <view class="shops-box">
+      <view class="flex flex-w shop-item">
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-cont bg-color-white overflow-hd"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-cont__hd flex j-center al-item-center">
+              <image
+                class="shops-img"
+                :src="item.pic"
+                mode="widthFix"
+              ></image>
+            </view>
+            <view class="item-info">
+              <view class="shops-c-t text-overflow-line">{{ item.name }}</view>
+              <view class="shops-b-t flex al-item-center j-between">
+                <view class="item-info__price">
+                  <text class="b-t1 flex al-item-center"
+                    >¥<text class="b-t2 font-w">{{ item.sell_price }}</text>
+                  </text>
+                  <view class="shops-s-t">已售 {{ item.sales ? (item.sales >= 10000 ? (item.sales / 10000).toFixed(1) + '万': item.sales) : 0 }}</view>
+                </view>
+                <view
+                  class="car flex border-rius-r al-item-center j-center"
+                  @click.stop="buydialogChange"
+                  :data-proid="item.proid"
+                >
+                  <text class="iconfont icon-gouwuche1"></text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  props: {
+    isShowTitle: { type: Boolean, default: false },
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-shops {
+  padding: 22rpx 0 20rpx;
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    width: 49%;
+    box-sizing: border-box;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+    border-radius: 10rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &__hd {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+    }
+
+    .shops-img {
+      width: 100%rpx;
+      height: 260rpx;
+    }
+    .item-info {
+      padding: 24rpx 20rpx;
+      width: 100%;
+    }
+    .shops-c-t {
+      min-height: 72rpx;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+    }
+    .shops-s-t {
+      display: flex;
+      align-items: center;
+      margin-top: 2rpx;
+      font-size: 18rpx;
+      color: #999999;
+      line-height: 22rpx;
+    }
+    .shops-b-t {
+      padding-top: 28rpx;
+
+      .b-t1 {
+        color: #FF4800;
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 36rpx;
+        margin-left: 6rpx;
+      }
+      .car {
+        width: 54rpx;
+        height: 54rpx;
+        background: #4e96dc;
+
+        .icon-gouwuche1 {
+          color: #fff;
+          font-size: 36rpx;
+          line-height: 44rpx;
+          height: 48rpx;
+        }
+      }
+    }
+  }
+  .shops-cont:nth-child(2n) {
+    // margin-left: calc(100% - 680rpx);
+    margin-left: 2%;
+  }
+  .shops-cont:nth-child(n + 3) {
+    margin-top: 20rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-tuangou-item.vue b/pagesA/themes/haiNaBaiXian/components/themes-tuangou-item.vue
new file mode 100644
index 0000000..6122b0e
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-tuangou-item.vue
@@ -0,0 +1,201 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:48%;margin-right:'+(index%2==0?'4%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" >
+			<view class="" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+				<view class="product-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+					<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+				</view>
+				<view class="product-info">
+					<view class="p1" v-if="showname == 1">{{item.name}}</view>
+					<view class="p2">
+						<view class="p2-1" v-if="showprice != '0'">
+							<text class="t1"><text style="font-size:24rpx">低至￥</text>{{item.min_price}}</text>
+							<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+						</view>
+					</view>
+					<view class="p3" v-if="showsales=='1' && item.sales>0">已售{{item.sales}}件</view>
+					<view class="p4 flex border-rius-r al-item-center j-center" :style="{background:'#4e96dc'}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon-gouwuche1"></text></view>
+					<view class="p4" :style="{background:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+				</view>
+			</view>
+			<view class="overdue" v-if="item.endtime < timestamp">
+				<image class="overdue-img" :src="event_rul + '/static/images/activity-isover1.png'" mode="widthFix"></image>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 0,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  props: {
+    showstyle: { default: 2 },
+    menuindex: { default: -1 },
+    saleimg: { default: "" },
+    showname: { default: 1 },
+    namecolor: { default: "#333" },
+    showprice: { default: "1" },
+    showsales: { default: "1" },
+    showcart: { default: "1" },
+	timestamp:{ default: 0 },
+    cartimg: {
+      default: app.globalData.event_url + "/static/img/static/imgsrc/cart.svg",
+    },
+    data: {},
+    idfield: { default: "id" },
+  },
+  methods: {
+    buydialogChange: function (e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+      console.log(this.buydialogShow);
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.dp-tuangou-item {
+  height: auto;
+  position: relative;
+  overflow: hidden;
+  padding: 0rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 24rpx;
+}
+.dp-tuangou-item .item {
+  display: inline-block;
+  position: relative;
+  margin-bottom: 12rpx;
+  background: #fff;
+  border-radius: 10rpx;
+  overflow: hidden;
+  // border: 1rpx solid rgba(0, 0, 0, 0.08);
+  box-shadow: 0rpx 4rpx 4rpx 0rpx rgba(0,0,0,0.0300);
+}
+.dp-tuangou-item .product-pic {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  background: #ffffff;
+  padding-bottom: 100%;
+  position: relative;
+}
+.dp-tuangou-item .product-pic .image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: auto;
+}
+.dp-tuangou-item .product-pic .saleimg {
+  position: absolute;
+  width: 60px;
+  height: auto;
+  top: -3px;
+  left: -3px;
+}
+.dp-tuangou-item .product-info {
+  padding: 20rpx 20rpx;
+  position: relative;
+}
+.dp-tuangou-item .product-info .p1 {
+  color: #323232;
+  font-weight: bold;
+  font-size: 26rpx;
+  line-height: 36rpx;
+  margin-bottom: 10rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  height: 72rpx;
+}
+.dp-tuangou-item .product-info .p2 {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  padding: 2px 0;
+}
+.dp-tuangou-item .product-info .p2-1 {
+  flex-grow: 1;
+  flex-shrink: 1;
+  height: 40rpx;
+  line-height: 40rpx;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.dp-tuangou-item .product-info .p2-1 .t1 {
+  font-size: 36rpx;
+  color: #FF4800;
+}
+.dp-tuangou-item .product-info .p2-1 .t2 {
+  margin-left: 10rpx;
+  font-size: 24rpx;
+  color: #aaa;
+  text-decoration: line-through; /*letter-spacing:-1px*/
+}
+.dp-tuangou-item .product-info .p2-2 {
+  font-size: 20rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: right;
+  padding-left: 20rpx;
+  color: #999;
+}
+.dp-tuangou-item .product-info .p3 {
+  color: #999999;
+  font-size: 20rpx;
+  margin-top: 10rpx;
+}
+.dp-tuangou-item .product-info .p4 {
+  color: #fff;
+  width: 54rpx;
+  height: 54rpx;
+  border-radius: 50%;
+  position: absolute;
+  display: relative;
+  bottom: 20rpx;
+  right: 20rpx;
+  text-align: center;
+}
+.dp-tuangou-item .product-info .p4 .icon-gouwuche1 {
+  font-size: 36rpx;
+  height: 48rpx;
+  line-height: 44rpx;
+}
+.dp-tuangou-item .product-info .p4 .img {
+  width: 100%;
+  height: 100%;
+}
+.overdue {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, .2);
+	.overdue-img {
+		width: 240rpx;
+		position: absolute;
+		top: 50%;
+    left: 50%;
+    transform: translateX(-50%) translateY(-50%);
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-tuangou.vue b/pagesA/themes/haiNaBaiXian/components/themes-tuangou.vue
new file mode 100644
index 0000000..069c97c
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-tuangou.vue
@@ -0,0 +1,131 @@
+<template>
+	<view class="themes-miao-s bg-color-white">
+		<themes-chunk-title title="团购活动" :iconSrc="event_rul + '/static/images/icon-activity1.svg'" tengtx="group purchase"></themes-chunk-title>
+		<scroll-view :scroll-x="true" class="miao-cont">
+			<block v-for="item in shopTuangou" :key="item.id">
+				<view class="miao-cont__item al-item-center flex-colum j-between" @click="goto"
+				:data-url="'/activity/tuangou/product?id=' + item.proid">
+					<image class="miao-cont__item-img" :src="item.pic" mode="aspectFill"></image>
+					<view class="miao-cont__item-title">{{ item.name }}</view>
+					<view class="miao-cont__item-bottom">
+						<view class="miao-cont__item-price">
+							<view class="miao-cont__item-current"><text class="price-symbol">低至¥</text><text>{{ item.min_price }}</text></view>
+							<view class="miao-cont__item-original"><text class="price-symbol">¥</text><text>{{ item.sell_price }}</text></view>
+						</view>
+						<text class="iconfont icon-jiahao"></text>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	
+	var app = getApp();
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopTuangou: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data(){
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-miao-s {
+		width: 100%;
+		margin-top: 24rpx;
+		border-radius: 10rpx;
+		box-sizing: border-box;
+		padding-bottom: 30rpx;
+		.miao-cont {
+			padding-left: 28rpx;
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			&__item {
+				width: 220rpx;
+				flex-shrink: 0;
+				margin-right: 40rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				display: inline-flex;
+				&:last-child {
+					margin-right: 28rpx;
+				}
+				&-img {
+					width: 156rpx;
+					height: 156rpx;
+					margin-bottom: 16rpx;
+				}
+				&-title {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 36rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					/* autoprefixer: ignore next */
+					-webkit-box-orient: vertical;
+					text-align: justify;
+					white-space: pre-wrap;
+					word-break: break-all;
+
+				}
+				&-bottom {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					margin-top: 4rpx;
+				}
+				&-price {
+					display: flex;
+					align-items: flex-end;
+				}
+				&-current {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #ED5925;
+					line-height: 50rpx;
+					.price-symbol {
+						font-size: 22rpx;
+						line-height: 32rpx;
+						margin-right: 4rpx;
+					}
+				}
+				&-original {
+					margin: 0 0 6rpx 4rpx;
+					font-size: 20rpx;
+					font-weight: 500;
+					color: #999999;
+					line-height: 28rpx;
+					text-decoration: line-through;
+				}
+				.icon-jiahao {
+					font-size: 44rpx;
+					color: #4e96dc;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/components/themes-vip.vue b/pagesA/themes/haiNaBaiXian/components/themes-vip.vue
new file mode 100644
index 0000000..0359364
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/components/themes-vip.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="head-new-vu flex al-item-center">
+    <swiper
+      class="swiper-box"
+      vertical="true"
+      autoplay="true"
+      circular="true"
+      :indicator-dots="false"
+      :auto-play="true"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopNotice"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <view class="new-cnt">
+          <image class="notice-icon" :src="noticeIcon ? noticeIcon:event_rul + '/static/theme/note-icon.svg'"></image>
+          <view class="notice-txt">{{ item.title }}</view>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  props: {
+    noticeIcon: {
+      type: String,
+      default: '',
+    },
+    shopNotice: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.head-new-vu {
+  min-width: 260rpx;
+  height: 48rpx;
+  border-radius: 24rpx;
+  background: rgba($color: #000000, $alpha: 0.4);
+  padding: 4rpx 10rpx 4rpx 4rpx;
+  .swiper-box,.swiper-item {
+    width: 100%;
+    height: 100%;
+  }
+
+  .new-cnt {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    .notice-icon {
+      width: 40rpx;
+      height: 40rpx;
+      flex-shrink: 0;
+      border-radius: 20rpx;
+    }
+    .notice-txt {
+      flex: 1;
+      font-size: 22rpx;
+      color: #FFFFFF;
+      margin-left: 6rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/goods.vue b/pagesA/themes/haiNaBaiXian/goods.vue
new file mode 100644
index 0000000..403ea2e
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/goods.vue
@@ -0,0 +1,125 @@
+<template>
+  <view class="themes-goods position-a"
+        :style="{ height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view :class="{'themes-goods__content' : !nodata}">
+      <view class="nav-list flex j-between al-item-center">
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="!field || field == 'sort' ? 'color:#1870C5' : ''"
+          data-field="sort"
+          data-order="desc"
+          >推荐</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'sales' ? 'color:#1870C5' : ''"
+          data-field="sales"
+          data-order="desc"
+          >销量</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'createtime' ? 'color:#1870C5' : ''"
+          data-field="createtime"
+          data-order="desc"
+          >新品</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          data-field="sell_price"
+          :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+          <text :style="field == 'sell_price' ? 'color:#1870C5' : ''"
+            >价格</text
+          >
+          <text
+            style="font-size: 26rpx"
+            class="iconfont icon-danbianjiantou1"
+            :style="{
+              color: field == 'sell_price' && order == 'asc' ? '#1870C5' : '',
+            }"
+          ></text>
+          <text
+            style="font-size: 26rpx; margin-left: -10rpx"
+            class="iconfont icon-danbianjiantou"
+            :style="{
+              color: field == 'sell_price' && order == 'desc' ? '#1870C5' : '',
+            }"
+          ></text>
+        </view>
+      </view>
+      <scroll-view
+        class="scroll-list"
+        :scroll-y="true"
+        v-if="shopSelPro && shopSelPro.length > 0"
+      >
+        <themes-shop
+          :mgtop="0"
+          :mgright="30"
+          :mgleft="30"
+          :mgbottom="2"
+          :shopProduct="shopSelPro"
+        ></themes-shop>
+        <themes-shop
+          :mgtop="0"
+          :mgright="30"
+          :mgleft="30"
+          :mgbottom="2"
+          :shopProduct="shopSelPro"
+        ></themes-shop>
+        <nomore v-if="nomore"></nomore>
+      </scroll-view>
+    </view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/goods.js";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-goods {
+  background: #FAF8F8;
+  left: 0;
+  right: 0;
+  border-radius: 10rpx 10rpx 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+.themes-goods__content {
+	height: 100%;
+}
+.nav-list {
+  padding: 28rpx 30rpx 12rpx;
+
+  .selec {
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  height: calc(100% - 80rpx);
+  padding: 0 28rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/index.vue b/pagesA/themes/haiNaBaiXian/index.vue
new file mode 100644
index 0000000..4bdd02f
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/index.vue
@@ -0,0 +1,85 @@
+<template>
+  <view class="themes-default">
+    <image
+      class="themes-default__img"
+      :src="shopData.bgimg
+          ? shopData.bgimg
+          : event_rul + '/static/images/df-bg.png'
+      "
+      mode="widthFix"
+    ></image>
+    <!-- 头部 -->
+    <themes-head
+      :navHeight="navHeight"
+      @navselect="navHeadSelect"
+      :navList="navList"
+      :navIndex="navIndex"
+      :shopData="shopData"
+    ></themes-head>
+    <view class="themes-content position-r">
+      <Choiceness v-if="tabArr.indexOf(0) > -1" v-show="navIndex === 0"></Choiceness>
+      <Goods v-if="tabArr.indexOf(1) > -1" v-show="navIndex === 1" :hearHeight="hearHeight"></Goods>
+      <Activity v-if="tabArr.indexOf(2) > -1" v-show="navIndex === 2" :hearHeight="hearHeight"></Activity>
+      <new-product v-if="tabArr.indexOf(3) > -1" v-show="navIndex === 3" :hearHeight="hearHeight"></new-product>
+    </view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/index.js";
+import themesHead from "./components/themes-head.vue";
+import Choiceness from "./choiceness.vue";
+import Activity from "./activity.vue";
+import newProduct from "./newProduct.vue";
+import Goods from "./goods.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    Choiceness,
+    Activity,
+    newProduct,
+    Goods,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-default {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #FAF8F8;
+  position: relative;
+  z-index: 1;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    height: 622rpx;
+  }
+}
+.themes-content {
+  flex: 1;
+  z-index: 2;
+  padding: 0 28rpx 40rpx;
+  margin-top: 16rpx;
+  position: relative;
+  &::before {
+    content: "";
+    position: absolute;
+    top: 12rpx;
+    left: 0;
+    width: 100%;
+    height: 270rpx;
+    background: linear-gradient(to bottom, rgba(255,255,255,0) 0%, #FFFFFF 80rpx, #FFFFFF 100%);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/newProduct.vue b/pagesA/themes/haiNaBaiXian/newProduct.vue
new file mode 100644
index 0000000..0ca5f14
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/newProduct.vue
@@ -0,0 +1,55 @@
+<template>
+  <view class="themes-newProduct position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <scroll-view
+      class="scroll-list"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopProduct && shopProduct.length > 0"
+    >
+      <themes-shop
+        :mgtop="0"
+        :mgright="30"
+        :mgleft="30"
+        :mgbottom="2"
+        :shopProduct="shopProduct"
+      ></themes-shop>
+      <nomore v-if="nomore"></nomore>
+    </scroll-view>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/newProduct.js";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-newProduct {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #FAF8F8;
+  padding: 0 24rpx;
+  border-radius: 10rpx 10rpx 0;
+  flex: 1;
+  left: 0;
+  right: 0;
+}
+.scroll-list {
+  flex: 1;
+  overflow-y: scroll;
+  padding-bottom: 40rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/haiNaBaiXian/shop-detail.vue b/pagesA/themes/haiNaBaiXian/shop-detail.vue
new file mode 100644
index 0000000..8f2b5e7
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/shop-detail.vue
@@ -0,0 +1,351 @@
+<template>
+  <view class="store-detail">
+    <view v-if="!loading">
+		<view class="flex">
+			<image class="img-logo" :src="info.logo" mode="aspectFill"></image>
+		</view>
+		<view class="detail-contetn">
+			<view class="content-h border-btm flex al-item-center">
+				<view class="h-l">
+					<view class="title">{{ info.name }}</view>
+					<view class="text-n fs12">{{ followCount || 0 }}人关注</view>
+				</view>
+				<view class="su"></view>
+				<view class="h-r flex ">
+					<view class="h-r__info flex flex-colum al-item-center" @click="followFn">
+						<!-- <image class="follow-icon" v-if="!shopInfo.isFollow" :src="event_rul + '/static/theme/follow-icon.svg'" mode="widthFix"></image> -->
+						<text class="iconfont" :class="{'isFollow icon-aixin_shixin': info.isFollow, 'icon-aixin': !info.isFollow}" style="font-size: 44rpx;color: #CE0000;"></text>
+						<text class="follow-tx fs12">{{info.isFollow ? "已关注" : "关注"}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.content">
+				<text class="iconfont icon-icon-themes-coupon"></text>
+				<view class="flex flex-colum">
+					<view class="title">店铺简介</view>
+					<view class="text fs12">{{ info.content }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.address">
+				<text class="iconfont icon-icon-location"></text>
+				<view class="flex flex-colum ">
+					<view class="title">店铺地址</view>
+					<view class="text fs12">{{ info.address }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.createtime">
+				<text class="iconfont icon-rilitianchong"></text>
+				<view class="flex flex-colum ">
+					<view class="title">开店时间</view>
+					<view class="text fs12">{{ info.createtime }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.start_hours || info.end_hours">
+				<text class="iconfont icon-icon-clock"></text>
+				<view class="flex flex-colum ">
+					<view class="title">营业时间</view>
+					<view class="text fs12">{{ info.start_hours || "" }}-{{ info.end_hours || "" }}</view>
+				</view>
+			</view>
+			<view class="content-t  flex al-item-center" v-show="info.tel">
+				<text class="iconfont icon-icon-phone"></text>
+				<view class="flex flex-colum ">
+					<view class="title">联系电话</view>
+					<view class="text fs12">{{ info.tel }}</view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" @tap="goback">去看看全部商品</button>
+    </view>
+    <loading v-else></loading>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      info: {},
+      loading: false,
+	  event_rul: app.globalData.event_url,
+	  followCount: 0,
+    shopData: uni.getStorageSync('header_data') || {}, 
+    };
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  created() {
+    this.loading = true;
+  },
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    goback() {
+      uni.navigateBack(1);
+    },
+    followFn() {
+      var that = this;
+
+      // 暂时写死follow_id：27，正确为 follow_id: that.opt.bid
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.opt.bid || "", type: "store" },
+        function (res) {
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo()
+          setTimeout(() => {
+            that.$set(that.shopData,'attention',that.info.fans_count);
+            that.$set(that.shopData,'isFollow',that.info.isFollow);
+            uni.setStorage({
+              key: "header_data",
+              data: that.shopData,
+            });
+          }, 200);
+        }
+      );
+    },
+	// 获取详情信息
+    getInfo() {
+      var that = this;
+      // 暂时写死id: 27,正确为 id: that.opt.bid
+      app.get(
+        "ApiBusiness/newIndex",
+        { id: that.opt.bid || "" },
+        function (res) {
+          that.info = res.business;
+		  that.followCount = res.followCount
+          that.loading = false;
+        }
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.store-detail {
+  letter-spacing: 2rpx;
+  color: #333;
+  
+  .img-logo {
+	  width: 100%;
+	  height: 400rpx;
+  }
+  .detail-contetn {
+	  padding: 0 40rpx;
+	  background-color: #fff;
+	  .content-h {
+		  padding: 28rpx 0;
+		  
+		  .h-l {
+			  width: 452rpx;
+			  padding-right: 10rpx;
+			 .title {
+				 font-weight: 500;
+			 	 font-size: 34rpx;
+			 }
+			 .text-n {
+			 	padding-top: 14rpx;
+				color: #666;
+				font-weight: 400;
+			 } 
+		  }
+		  .su {
+			  width: 2rpx;
+			  height: 56rpx;
+			  background-color: #FF5E5E;
+		  }
+		  .h-r {
+			  width: 180rpx;
+			  justify-content: flex-end;
+        &__info {
+          width: 80rpx;
+        }
+        .icon-aixin {
+          color: #666666;
+          &.isFollow {
+            color: #EB2407;
+          }
+        }
+			  
+			  .follow-icon {
+			    width: 44rpx;
+			  }
+			  .follow-tx {
+				  color: #666;
+			  }
+		  }
+	  }
+	  
+	  .content-t {
+		  padding: 20rpx 0;
+      .iconfont {
+        color: #4e96dc;
+        font-size: 44rpx;
+        flex-shrink: 0;
+        margin-right: 26rpx;
+      }
+		  
+		  .title {
+			font-weight: 500;
+		  }
+		  .text {
+			  font-weight: 500;
+			  padding-top: 8rpx;
+			  color: #666;
+		  }
+	  }
+  }
+  .btn {
+    font-size: 36rpx;
+    // font-weight: bold;
+    width: 630rpx;
+    margin: 90rpx auto;
+    border-radius: 400rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-image: linear-gradient(to left, #5487D7, #269DD1);
+    color: #fff;
+  }
+  .border-btm {
+	  border-bottom: 2rpx solid #ECECEC;
+  }
+  
+  .attention {
+    padding: 30rpx 20rpx;
+
+    .attention-box {
+      padding: 30rpx 20rpx;
+      background: #fff;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      border-radius: 10rpx;
+
+      .attention-l {
+        display: flex;
+        align-items: center;
+
+        .attention-l-img {
+          width: 120rpx;
+          height: 120rpx;
+          border-radius: 16rpx;
+          flex-shrink: 0;
+        }
+        .attention-l-text {
+          height: 100%;
+          padding-left: 20rpx;
+          display: flex;
+          flex-direction: column;
+          .attention-l-title {
+            font-size: 30rpx;
+            font-weight: bold;
+          }
+          .attention-l-text-s {
+            padding-top: 10rpx;
+            display: flex;
+            align-items: center;
+            font-size: 24rpx;
+            color: #bdbdbd;
+
+            .icon_arrow_right {
+              padding-left: 20rpx;
+            }
+          }
+        }
+      }
+      .attention-r {
+        width: 120rpx;
+        height: 54rpx;
+        line-height: 54rpx;
+        text-align: center;
+        flex-shrink: 0;
+        border-radius: 8rpx;
+        &.isFollow {
+          background-color: #efbd6f;
+          color: #FFF;
+        }
+        &.followed {
+          color: #efbd6f;
+          position: relative;
+          &::before {
+            content: "";
+              position: absolute;
+              left: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #efbd6f;
+              box-sizing: border-box;
+              transform: scale(0.5,0.5);
+              border-radius: 16rpx;
+              transform-origin: 0 0;
+          }
+        }
+      }
+    }
+  }
+
+  .store-detail-conten {
+    padding: 0 20rpx;
+    .detail-conten-b {
+      display: flex;
+      flex-direction: column;
+      border-radius: 10rpx;
+      background-color: #fff;
+
+      .detail-conten-c {
+        min-height: 400rpx;
+        padding: 0 20rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-evenly;
+      }
+      .detail-conten-t {
+        display: flex;
+        // align-items: center;
+        .detail-conten-t-tilt {
+          width: 150rpx;
+          font-weight: bold;
+          font-size: 30rpx;
+        }
+
+        .detail-conten-t-text {
+          flex: 1;
+          // color: #bdbdbd;
+          padding-top: 4rpx;
+          // font-weight: bold;
+          color: #111111;
+        }
+      }
+
+      .btn {
+        font-size: 30rpx;
+        font-weight: bold;
+        width: 650rpx;
+        margin: 30rpx auto;
+        border-radius: 400rpx;
+        height: 70rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-image: linear-gradient(to right, #fbd89e, #eec071);
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/pagesA/themes/haiNaBaiXian/themes-search.vue b/pagesA/themes/haiNaBaiXian/themes-search.vue
new file mode 100644
index 0000000..cb70414
--- /dev/null
+++ b/pagesA/themes/haiNaBaiXian/themes-search.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="themes-search">
+		<view class="search-head">
+			<view class="head-b flex al-item-center border-rius-r">
+				<text class="iconfont icon-search"></text>
+				<input v-model="keyword" placeholder="商品搜索" placeholder-style="font-size:28rpx;" @confirm="searchConfirm" />
+        <text class="iconfont icon-shanchu" @click="delKeywordtex"></text>
+			</view>
+		</view>
+		<view class="search-content">
+			<view class="nav-list flex j-between al-item-center">
+				<view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="!field || field == 'sort' ? 'color: #1870C5' : ''"
+            data-field="sort"
+            data-order="desc"
+            >推荐</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'sales' ? 'color: #1870C5' : ''"
+            data-field="sales"
+            data-order="desc"
+            >销量</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'createtime' ? 'color: #1870C5' : ''"
+            data-field="createtime"
+            data-order="desc"
+            >新品</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            data-field="sell_price"
+            :data-order="order == 'asc' ? 'desc' : 'asc'"
+          >
+            <text :style="field == 'sell_price' ? 'color: #1870C5' : ''"
+              >价格</text
+            >
+            <text
+              style="font-size: 26rpx"
+              class="iconfont icon-danbianjiantou1"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'asc' ? '#1870C5' : '',
+              }"
+            ></text>
+            <text
+              style="font-size: 26rpx; margin-left: -10rpx"
+              class="iconfont icon-danbianjiantou"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'desc' ? '#1870C5' : '',
+              }"
+            ></text>
+          </view>
+			</view>
+		</view>
+		<scroll-view class="scroll-list lise-h" :scroll-y="true" @scrolltolower="getmorecomment" >
+			<themes-shop :shopProduct="shopProduct" :mgtop="0" :mgright="30" :mgleft="30" :mgbottom="2"></themes-shop>
+		<loading v-if="loading"></loading>
+        <nomore v-if="nomore"></nomore>
+        <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+		</scroll-view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+import { myMixin } from '../logic/search.js';
+import themesShop from "../haiNaBaiXian/components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss">
+.themes-search {
+  height: 100vh;
+  overflow-y: hidden;
+  display: flex;
+  flex-direction: column;
+  background: #F4F4F4;
+  ::v-deep .classify-shops {
+    .shops-item {
+      padding: 24rpx 40rpx 12rpx 20rpx;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 10rpx;
+      border-bottom: 0;
+      margin-bottom: 20rpx;
+    }
+  }
+  .search-head {
+    width: 100%;
+    height: 74rpx;
+    padding: 10rpx 28rpx 0;
+    flex-shrink: 0;
+    background: #FFF;
+    .head-b {
+      width: 100%;
+      height: 100%;
+      padding: 0 12rpx;
+      background-color: #F7F7F7;
+
+      .icon-search {
+        color: #ABABAB;
+        font-size: 50rpx;
+        flex-shrink: 0;
+      }
+      input {
+        flex: 1;
+        font-size: 28rpx;
+        line-height: 40rpx;
+        margin-left: 14rpx;
+        color: #333333;
+      }
+      .icon-shanchu {
+        font-size: 40rpx;
+        color: #cccccc;
+      }
+    }
+  }
+
+  .search-content {
+    flex-shrink: 0;
+    background: #FFFFFF;
+    .nav-list {
+      height: 100rpx;
+      padding: 34rpx 32rpx 34rpx 40rpx;
+
+      .selec {
+        // font-size: 32rpx;
+        transform: scale(1.2);
+      }
+    }
+  }
+
+  .scroll-list {
+    flex: 1;
+    overflow-y: scroll;
+    padding: 20rpx 28rpx;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/activity.vue b/pagesA/themes/hongFuQiTian/activity.vue
new file mode 100644
index 0000000..d093af3
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/activity.vue
@@ -0,0 +1,367 @@
+<template>
+  <view class="themes-activity position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view class="" >
+      <view class="title-box flex al-item-center j-center" style="background: linear-gradient(180deg, #FFF2D4 0%, rgba(255,255,255,0) 100%);">
+        <image
+        :src="event_rul + '/static/theme/tuangou-title.png'"
+        class="img-n"
+        mode="widthFix"
+        />
+
+      </view>
+      
+      <view class="nav-list flex j-between al-item-center">
+      
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="!field || field == 'sort' ? 'color:' + '#ED5925' : ''"
+        data-field="sort"
+        data-order="desc"
+        >推荐</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        :style="field == 'sales' ? 'color:' + '#ED5925' : ''"
+        data-field="sales"
+        data-order="desc"
+        >销量</view
+        >
+        <view
+        @tap.stop="sortClick"
+        class="search-navbar-item"
+        data-field="sell_price"
+        :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+        <text :style="field == 'sell_price' ? 'color:' + '#ED5925' : ''"
+          >价格</text
+        >
+        <text
+          style="font-size: 26rpx"
+          class="iconfont icon-danbianjiantou1"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'asc' ? '#ED5925' : '#999',
+          }"
+        ></text>
+        <text
+          style="font-size: 26rpx; margin-left: -10rpx"
+          class="iconfont icon-danbianjiantou"
+          :style="{
+          color:
+            field == 'sell_price' && order == 'desc' ? '#ED5925' : '#999',
+          }"
+        ></text>
+        </view>
+        <view @tap="open" >筛选 <text class="iconfont icon-shaixuan" style="font-size: 26rpx; margin-left: 4rpx;color: #999;"></text></view>
+      </view>
+    </view>
+    <scroll-view
+      class="scroll-list lise-t"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopTuangou && shopTuangou.length > 0"
+    >
+      <themes-tuangou-item v-if="isActivity" :data="shopTuangou" :timestamp="timestamp" :menuindex="menuindex"></themes-tuangou-item>
+      <view class="flex flex-colum" v-else>
+        <image class="n-thing" :src="event_rul + '/static/images/n-thing.png'" mode="widthFix"></image>
+        <view class="text-center color-gray">暂无活动～</view>
+      </view>
+    <view
+      v-if="visibleSync"
+      :class="{ 'uni-drawer--visible': showDrawer }"
+      class="uni-drawer"
+      @touchmove.stop.prevent="clear"
+    >
+      <view
+        class="uni-drawer__mask"
+        :class="{ 'uni-drawer__mask--visible': showDrawer && mask }"
+        @tap="close('mask')"
+      />
+      <view
+        class="uni-drawer__content"
+        :class="{
+          'uni-drawer--right': rightMode,
+          'uni-drawer--left': !rightMode,
+          'uni-drawer__content--visible': showDrawer,
+        }"
+        style="width: 100vw"
+      >
+        <view class="bolting-box">
+          <!-- <view class="name">筛选</view> -->
+          <view class="title">商品分类</view>
+          <view class="content flex flex-w">
+        <view class="content-itm">
+          <view
+            class="text"
+            :style="{
+              color: boltingListIndex === 0 ? '#EA4E34' : '',
+            backgroundColor: boltingListIndex === 0 ? '#FFDCD9' : '#F7F7F7 ',
+            }"
+            @tap="bolting(0)"
+            >全部</view
+          >
+          <block v-for="(item, idx) in boltingList" :key="idx">
+            <view
+              class="text"
+              v-show="boltingList.length != 0"
+              :style="{
+                color: boltingListIndex === idx + 1 ? '#EA4E34' : '',
+              backgroundColor: boltingListIndex === idx + 1 ? '#FFDCD9' : '#F7F7F7 ',
+              }"
+              @tap="bolting(idx + 1)"
+              >{{ item.name }}</view
+            >
+          </block>
+        </view>
+          </view>
+          <view class="bolting-box-b flex">
+            <view class="res btn" @tap="boltingAll()">重置</view>
+            <view
+              class="comf btn flex1"
+              :style="{ 'background-color': '' }"
+              @tap="filterConfirm(cpid)"
+              >确定</view
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+    </scroll-view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/activity.js';
+import themesShop from "./components/themes-shop.vue";
+import themesTuangouItem from "./components/themes-tuangou-item.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+    themesTuangouItem
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-activity {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #FAF8F8;
+  overflow: hidden;
+  border-radius: 20rpx 20rpx 0;
+  flex: 1;
+  left: 0;
+  right: 0;
+}
+.title-box {
+  flex-shrink: 0;
+  padding-top: 20rpx;
+  height: 60rpx;
+
+  .img-n {
+    width: 256rpx;
+    // height: 36rpx;
+  }
+
+  .txt {
+    padding: 0 30rpx;
+  }
+}
+.nav-list {
+  flex-shrink: 0;
+  // height: 80rpx;
+  padding: 34rpx 30rpx 34rpx;
+  .actived {
+    color: #efbd6f;
+  }
+  .selec {
+    // font-size: 32rpx;
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  flex: 1;
+  overflow-y: scroll;
+  // padding: 14rpx 0 20rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.n-thing {
+	width: 282rpx;
+	margin: 100rpx auto 0;
+}
+.lise-t {
+  // height: calc(100% - 140rpx);
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+
+.select-box {
+  width: 100%;
+  height: calc(100% - 80rpx);
+  position: absolute;
+  left: 0;
+  top: 80rpx;
+  .select-mxk {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 66;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+
+  .select-box-content {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 68;
+
+    .content-item {
+      border-top: 2rpx solid #f2f2f4;
+    }
+  }
+}
+// 筛选
+.uni-drawer {
+  height: 100%;
+  width: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  // top: 0;
+  // left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+  z-index: 999;
+}
+
+.uni-drawer__content {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+  top: 0;
+  width: 220px;
+  // bottom: 0;
+  background-color: #ffffff;
+  transition: transform 0.3s ease;
+}
+
+.uni-drawer--left {
+  left: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateY(-220px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateY(-100%);
+  /* #endif */
+}
+
+.uni-drawer--right {
+  right: 0;
+  /* #ifdef APP-NVUE */
+  transform: translateY(220px);
+  /* #endif */
+  /* #ifndef APP-NVUE */
+  transform: translateY(300%);
+  /* #endif */
+}
+
+.uni-drawer__content--visible {
+  transform: translateY(0px);
+}
+
+.uni-drawer__mask {
+  width: 100%;
+  height: 100%;
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 0;
+  position: absolute;
+  // top: 0;
+  // left: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  transition: opacity 0.3s;
+}
+
+.uni-drawer__mask--visible {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  opacity: 1;
+}
+
+.bolting-box {
+  // padding: 30rpx;
+
+  .name {
+    font-size: 32rpx;
+  }
+  .title {
+   padding: 28rpx;
+   font-size: 24rpx;
+   color: #999;
+  }
+  .content {
+    width: 100%;
+	min-height: 186rpx;
+	padding: 0 28rpx;
+	
+	.content-itm {
+		padding-left: 12rpx;
+	}
+    .text {
+	  width: 150rpx;
+	  height: 60rpx;
+	  line-height: 60rpx;
+	  text-align: center;
+      margin-right: 20rpx;
+      margin-bottom: 30rpx;
+	  font-size: 24rpx;
+      // padding: 8rpx 16rpx;
+      border-radius: 4rpx;
+      // background-color: #FFDCD9;
+    }
+  }
+  .bolting-box-b {
+    width: 100%;
+	height: 96rpx;
+    // padding-top: 60rpx;
+    border-top: 2rpx solid #ECECEC;
+    .btn {
+      // width: 220rpx;
+      height: 100%;
+      line-height: 96rpx;
+      text-align: center;
+      // border-radius: 12rpx;
+    }
+    .res {
+		width: 200rpx;
+        border-right: 2rpx solid #ECECEC;
+    }
+    .comf {
+		color: #EA4E34;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/choiceness.vue b/pagesA/themes/hongFuQiTian/choiceness.vue
new file mode 100644
index 0000000..8202d8f
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/choiceness.vue
@@ -0,0 +1,87 @@
+<template>
+  <view class="themes-choiceness">
+    <themes-vip
+      v-if="shopNotice.length != 0"
+      :shopNotice="shopNotice"
+      :noticeIcon="shopData.noticeIcon"
+    ></themes-vip>
+    <!-- 菜单 -->
+    <themes-hot
+      v-if="shopMenu.length != 0"
+      :shopMenu="shopMenu"
+      :isShowDots="isShowDots"
+    ></themes-hot>
+    <!-- 优惠 -->
+    <themes-coupon-one
+      v-if="shopCoupon.length != 0"
+      :shopCoupon="shopCoupon"
+    ></themes-coupon-one>
+    <!-- 视频 -->
+    <themes-live
+      v-if="shopVideo.length != 0"
+      :shopVideo="shopVideo"
+    ></themes-live>
+
+    <!-- 笔记 -->
+    <themes-note
+      v-if="shopNote.length != 0"
+      :shopNote="shopNote"
+    ></themes-note>
+    <!-- banner -->
+    <themes-banner
+      v-if="shopBanner.length != 0"
+      :shopBanner="shopBanner"
+    ></themes-banner>
+    <!-- 团购 -->
+    <themes-tuangou
+      v-if="shopTuangou.length != 0"
+      :shopTuangou="shopTuangou"
+    ></themes-tuangou>
+    <!-- 推荐商品 -->
+    <themes-recommend
+      v-if="shopProduct.length != 0"
+      :shopProduct="shopProduct"
+    ></themes-recommend>
+    <!-- 精选商品 -->
+    <themes-shop
+      v-if="shopSelPro.length != 0"
+      :shopProduct="shopSelPro"
+      :isShowTitle="true"
+    ></themes-shop>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/choiceness.js";
+import themesVip from "./components/themes-vip.vue";
+import themesCouponOne from "./components/themes-coupon-one.vue";
+import themesHot from "./components/themes-hot.vue";
+import themesTuangou from "./components/themes-tuangou.vue";
+import themesRecommend from "./components/themes-recommend.vue";
+import themesShop from "./components/themes-shop.vue";
+import themesNote from "./components/themes-note.vue";
+import themesBanner from "./components/themes-banner.vue";
+import themesLive from "./components/themes-live.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesVip,
+    themesCouponOne,
+    themesHot,
+    themesTuangou,
+    themesRecommend,
+    themesShop,
+    themesNote,
+    themesLive,
+    themesBanner,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-choiceness {
+    margin-top: -30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/classify.vue b/pagesA/themes/hongFuQiTian/classify.vue
new file mode 100644
index 0000000..28a506b
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/classify.vue
@@ -0,0 +1,173 @@
+<template>
+  <view class="themes-classify">
+    <image class="themes-classify__img" :src="shopData.bgimg" mode="widthFix"></image>
+    <block v-if="flag">
+      <themes-head
+        :navHeight="navHeight"
+        :shopData="shopData"
+        :isShowNav="false"
+        :navIndex="1"
+      ></themes-head>
+      <view class="themes-content">
+        <view class="themes-content__left">
+          <view
+            class="classify-item"
+            :class="{ actived: currentIndex === '' }"
+            @tap="selectAll()"
+            >全部</view
+          >
+          <view
+            class="classify-item"
+            v-for="(item, index) in shopCategory"
+            :key="index"
+            :class="{ actived: currentIndex === index }"
+            @tap="categoryHandle(item.id, index)"
+          >
+            {{ item.name }}
+          </view>
+        </view>
+        <view class="themes-content__right">
+          <view class="classify-tabs">
+            <view
+              class="classify-tabs__item"
+              :class="{ actived: isSelectAll }"
+              @tap="selectCategoryAll()"
+              >全部</view
+            >
+            <view
+              class="classify-tabs__item"
+              v-for="(item, index) in shopCategorychild"
+              :key="index"
+              :class="{ actived: curidx === index && !isSelectAll }"
+              @tap="categoryChildHandle(item.id, index)"
+              >{{ item.name }}</view
+            >
+          </view>
+          <scroll-view
+            class="themes-content__scroll"
+            :scroll-y="true"
+            @scrolltolower="getmorecomment"
+          >
+            <classifyShop :shopProduct="shopProduct"></classifyShop>
+            <loading v-if="loading"></loading>
+            <nomore v-if="nomore"></nomore>
+            <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+          </scroll-view>
+        </view>
+      </view>
+    </block>
+    <loading v-else></loading>
+		<!-- 悬浮按钮 -->
+		<drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from '../logic/classify.js';
+import themesHead from "./components/themes-head.vue";
+import classifyShop from "./components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    classifyShop,
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.themes-classify {
+  height: 100vh;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  z-index: 1;
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+    height: 1020rpx;
+  }
+}
+.themes-content {
+  position: relative;
+  z-index: 2;
+  box-sizing: border-box;
+  overflow: hidden;
+  margin-top: 28rpx;
+  background: #fff;
+  position: relative;
+  border-radius: 12rpx 12rpx 0 0;
+  display: flex;
+  flex: 1;
+  &__left {
+    width: 180rpx;
+    flex-shrink: 0;
+    background: #f8f9fa;
+    overflow-y: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  &__right {
+    flex: 1;
+    box-sizing: border-box;
+    padding: 28rpx 28rpx 0;
+    position: relative;
+    /deep/ .nodata {
+      margin-left: -30rpx;
+    }
+  }
+  &__scroll {
+    height: calc(100% - 86rpx);
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+  .classify-item {
+    height: 110rpx;
+    line-height: 110rpx;
+    text-align: center;
+    font-size: 28rpx;
+    color: #666666;
+    &.actived {
+      color: #D11800;
+      background: #fff;
+      font-weight: 500;
+    }
+  }
+  .classify-tabs {
+    display: flex;
+    margin-bottom: 30rpx;
+    overflow-x: scroll;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &__item {
+      flex-shrink: 0;
+      min-width: 80rpx;
+      box-sizing: border-box;
+      margin-right: 20rpx;
+      padding: 0 18rpx;
+      font-size: 22rpx;
+      line-height: 42rpx;
+      border-radius: 42rpx;
+      color: #666666;
+      background: #f7f7f7;
+      &.actived {
+        background: linear-gradient(150deg, #FFF4F4 0%, #FFE0E1 100%);
+        color: #D11800;
+      }
+    }
+  }
+  /deep/ .nomore {
+    margin-left: 32rpx;
+  }
+  /deep/ .nodata {
+    width: calc(100vw - 180rpx);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/classify-shop.vue b/pagesA/themes/hongFuQiTian/components/classify-shop.vue
new file mode 100644
index 0000000..ee7ed01
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/classify-shop.vue
@@ -0,0 +1,221 @@
+<template>
+  <view
+    class="classify-shops"
+  >
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-item flex"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-item__hd flex j-center al-item-center">
+              <image
+                class="shops-item__img"
+                :src="item.pic"
+                mode="aspectFill"
+              ></image>
+            </view>
+            <view class="shops-item__bd">
+              <view class="shops-item__title text-overflow-line">{{ item.name }}</view>
+              <view class="shops-item__sale">已售{{ item.sales }}</view>
+              <view class="shops-item__bottom flex al-item-center j-between">
+                <view class="shops-item__price flex">¥<text class="shops-item__num">{{ item.sell_price }}</text></view>
+                <view class="shops-item__icon"
+                    @click.stop="buydialogChange"
+                    :data-proid="item.proid"></view>
+              </view>
+            </view>
+          </view>
+        </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.classify-shops {
+    padding-bottom: 20rpx;
+    box-sizing: border-box;
+    .shops-item {
+      padding: 20rpx 0 14rpx;
+      &:not(:last-child) {
+        border-bottom: 1rpx solid #ECECEC;
+      }
+      &__hd {
+        width: 192rpx;
+        height: 192rpx;
+        flex-shrink: 0;
+      }
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+      &__bd {
+        flex: 1;
+        margin-left: 12rpx;
+      }
+      &__title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: 36rpx;
+        margin-bottom: 36rpx;
+        min-height: 72rpx;
+      }
+      &__sale {
+        font-size: 18rpx;
+        color: #999999;
+        line-height: 22rpx;
+        margin-bottom: 4rpx;
+      }
+      &__price {
+        color: #ED5925;
+        font-weight: 500;
+        font-size: 24rpx;
+        line-height: 34rpx;
+        align-items: baseline;
+      }
+      &__num {
+        margin-left: 4rpx;
+        font-size: 36rpx;
+        line-height: 50rpx;
+      }
+      &__icon {
+					width: 44rpx;
+					height: 44rpx;
+          margin-top: -4rpx;
+					background: linear-gradient(180deg, #F96849 0%, #FD4440 100%);
+					border-radius: 20rpx;
+					position: relative;
+					&::before {
+						content: "";
+						position: absolute;
+						left: 8rpx;
+						right: 8rpx;
+						height: 4rpx;
+						top: 50%;
+						transform: translateY(-50%);
+						background: #FFF;
+					}
+					&::after {
+						content: "";
+						position: absolute;
+						top: 8rpx;
+						bottom: 8rpx;
+						width: 4rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						background: #FFF;
+					}
+				}
+    }
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    border: none;
+    // width: 100%;
+    height: auto;
+    display: flex;
+    padding-bottom: 25rpx;
+    &:not(:last-child) {
+      position: relative;
+      &::after {
+        content: "";
+        position: absolute;
+        bottom: 5rpx;
+        left: 0;
+        right: 0;
+        border-bottom: 1rpx solid rgba(0,0,0,0.1);
+        transform: scaleY(0.5);
+      }
+    }
+    &__hd {
+      width: 200rpx;
+      height: 200rpx;
+      border-radius: 12rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+    .shops-img {
+      width: 100%;
+      height: 100%;
+    }
+    .item-info {
+      flex: 1;
+      padding: 0 20rpx;
+    }
+    .shops-c-t {
+      padding-top: 15rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      min-height: 75rpx;
+    }
+    .shops-s-t {
+      padding-top: 10rpx;
+      font-size: 24rpx;
+      color: #999;
+    }
+    .shops-b-t {
+      padding-top: 10rpx;
+
+      .b-t1 {
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 30rpx;
+      }
+      .b-t3 {
+        color: #999;
+      }
+      .car {
+        width: 44rpx;
+        height: 44rpx;
+
+        .icon_gouwuche {
+          color: #fff;
+          font-size: 32rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-banner.vue b/pagesA/themes/hongFuQiTian/components/themes-banner.vue
new file mode 100644
index 0000000..7f5fdee
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-banner.vue
@@ -0,0 +1,74 @@
+<template>
+  <view class="themes-banner">
+    <swiper
+      class="swiper-container"
+      :indicator-dots="true"
+      :autoplay="true"
+      circular="true"
+      :interval="5000"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopBanner"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <image class="swiper-item__img" :src="item.imgurl"></image>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopBanner: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-banner {
+  .swiper-container {
+    width: 100%;
+    height: 800rpx;
+    margin-top: 28rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+    .wx-swiper-dot {
+      width: 12rpx;
+      height: 8rpx;
+      border-radius: 20rpx;
+    }
+    .wx-swiper-dot::before {
+      content: "";
+      flex-grow: 1;
+      background: #efbd6f;
+    }
+    .wx-swiper-dot-active::before {
+      width: 50rpx;
+      background: #efbd6f;
+    }
+    .swiper-item {
+      width: 100%;
+      height: 100%;
+      border-radius: 10rpx;
+      &__img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-c-img.vue b/pagesA/themes/hongFuQiTian/components/themes-c-img.vue
new file mode 100644
index 0000000..1c986be
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-c-img.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="themes-c-img" :class="[top? 'top' : 'top-z',navHeight > 60 ? 'top-m': '']">
+		<image class="kn-img" src="https://img0.baidu.com/it/u=617696644,3314521124&fm=253&fmt=auto&app=138&f=JPEG?w=625&h=500" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			top: {
+				type: Boolean,
+				default: false
+			},
+			navHeight: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+	
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-c-img {
+		display: flex;
+		.kn-img {
+			width: 100%;
+			border-radius: 12rpx
+			// vertical-align: middle;
+		}
+	}
+	.top {margin-top: -190rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -160rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-chunk-title.vue b/pagesA/themes/hongFuQiTian/components/themes-chunk-title.vue
new file mode 100644
index 0000000..0ca9d13
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-chunk-title.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="shops-til flex al-item-center">
+		<image class="shops-til__icon" :src="iconSrc"></image>
+		<view class="shops-til__title">{{ title }}</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			title: {
+				type: String,
+				default: ''
+			},
+			iconSrc: {
+				type: String,
+				default: ''
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shops-til {
+		padding: 24rpx 0;
+		&__icon {
+			width: 50rpx;
+			height: 50rpx;
+			flex-shrink: 0;
+			margin-right: 12rpx;
+		}
+		&__title {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 44rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-coupon-one.vue b/pagesA/themes/hongFuQiTian/components/themes-coupon-one.vue
new file mode 100644
index 0000000..aa19180
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-coupon-one.vue
@@ -0,0 +1,194 @@
+<template>
+	<view class="themes-coupon">
+		<themes-chunk-title title="优惠立减" :iconSrc="event_rul + '/static/theme/conpon-icon.svg'"></themes-chunk-title>
+		<scroll-view class="scroll-list" :scroll-x="true">
+			<block v-for="(item, idx) in shopCoupon1" :key="idx">
+				<!-- isUse 是按钮为'去使用'的优惠券 -->
+				<view class="scroll-list__item" v-if="!item.isOver" :class="{ 'isUse': item.isUse }" @tap.stop="getcoupon" :data-idx="idx" :data-id="item.couponid" :data-price="item.price" :data-score="item.score">
+					<image class="scroll-list__item-bg" :src="item.isUse ? event_rul + '/static/theme/couponed.png' : event_rul + '/static/theme/iscoupon.png'"></image>
+					<view class="conpon-price">
+						<view class="conpon-price-c flex j-center">
+							<text class="price-f">¥</text>
+							<text class="price-num font-w">{{ item.money }}</text>
+						</view>
+						<view class="conpon-price-h">满{{ item.minprice }}元使用</view>
+					</view>
+					<view class="conpon-btn border-rius-r flex al-item-center">{{ item.msg || '领券' }}</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	var app = getApp();
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopCoupon: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data() {
+			return {
+				shopCoupon1: this.shopCoupon,
+				event_rul: app.globalData.event_url,
+			}
+		},
+		watch: {
+			shopCoupon (newV, oldV) {
+				this.shopCoupon1 = newV;
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+		methods: {
+			// 点击领取
+			getcoupon: function (e) {
+				
+				var that = this;
+				var idx = e.currentTarget.dataset.idx;
+				var id = e.currentTarget.dataset.id;
+				var score = parseInt(e.currentTarget.dataset.score);
+				var price = e.currentTarget.dataset.price;
+				
+				if (price > 0) {
+					app.post('ApiCoupon/buycoupon', {id: id}, function (res) {
+						console.log(res)
+						if(res.status == 0) {
+								app.error(res.msg);
+						} else {
+							app.goto('/pages/pay/pay?id=' + res.payorderid);
+						}
+					})
+					return;
+				}
+				if (score > 0) {
+					app.confirm('确定要消耗' + score + '' + that.t('积分') + '兑换吗?', function () {
+						app.showLoading('兑换中');
+						app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+							app.showLoading(false);
+							if (data.status == 0) {
+								app.error(data.msg);
+							} else {
+								app.success(data.msg);
+							}
+						});
+					});
+				}
+				that.shopCoupon.map((item,index) => {
+					if(index === idx) {
+						if(item.isUse) {
+							uni.navigateTo({
+								url:'/pages/shop/prolist?cpid='+ id
+							})
+						} else if(item.isOver) {
+							return;
+						} else {
+							app.showLoading('领取中');
+							app.post('ApiCoupon/getcoupon', {id: id}, function (data) {
+								app.showLoading(false);
+								if (data.status == 0) {
+									app.error(data.msg);
+								} else {
+									app.success(data.msg);
+									that.$set(item,"msg","去使用");
+									that.$set(item,'isUse',true);
+									that.$set(item,'isOver',false);
+								}
+							});
+						}
+					}
+				})				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-coupon {
+		margin-top: 30rpx;
+		background: #FFF;
+		border-radius: 20rpx;
+		padding: 0 0 24rpx 22rpx;
+		.scroll-list {
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			.scroll-list__item {
+				display: inline-flex;
+				flex-direction: column;
+				align-items: center;
+				margin-right: 28rpx;
+				position: relative;
+				width: 164rpx;
+				height: 212rpx;
+				padding: 14rpx;
+				z-index: 1;
+				&:last-child {
+					margin-right: 22rpx;
+				}
+				&.isUse {
+					.conpon-price {
+						color: #EE7E8C;
+					}
+					.conpon-btn {
+						color: #FFF;
+					}
+				}
+				&-bg {
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 100%;
+					height: 100%;
+					z-index: -1;
+				}
+				.conpon-price {
+					color: #FFF;
+					.conpon-price-c {
+						align-items: flex-start;
+						.price-f {
+							padding: 10rpx 2rpx 0 0;
+							font-size: 24rpx;
+							line-height: 34rpx;
+						}
+						.price-num {
+							font-size: 72rpx;
+							line-height: 100rpx;
+							letter-spacing: 2rpx;
+						}
+					}
+					.conpon-price-h {
+						margin-top: -6rpx;
+						font-size: 20rpx;
+						font-weight: 500;
+						line-height: 28rpx;
+					}
+				}
+				.conpon-btn {
+					width: 80%;
+					justify-content: center;
+					margin-top: 35rpx;
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #D22B31;
+					line-height: 34rpx;
+				}
+			}
+		}
+	}
+	
+	.top {margin-top: -70rpx;}
+	.top-z {margin-top: 30rpx;}
+	.top-m {margin-top: -40rpx;}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-head.vue b/pagesA/themes/hongFuQiTian/components/themes-head.vue
new file mode 100644
index 0000000..da35a60
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-head.vue
@@ -0,0 +1,418 @@
+<template>
+  <view
+    class="themes-head position-r"
+    :style="{ 'padding-top': navHeight + 'px' }"
+  >
+    <view
+      class="head-bx-h"
+      :style="'height:'+ navHeight+'px;background:'+(shopInfo.bgimg ?'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top 0 left 0':'')"
+    >
+      <view class="head-bx-ct position-a flex al-item-center">
+        <text class="iconfont icon-icon_arrow_left" @tap="goBack"></text>
+        <text
+          class="iconfont icon-shouye"
+          @tap="goto"
+          data-url="/pages/index/index"
+          data-opentype="reLaunch"
+        ></text>
+        <view class="search flex al-item-center j-between border-rius-r">
+          <text class="iconfont icon-search"></text>
+          <input
+            placeholder="请输入搜索内容..."
+            type="text"
+            v-model="searchVlaue"
+            @confirm="search"
+          />
+        </view>
+      </view>
+    </view>
+
+    <view class="head-bx-cont">
+      <view class="head-store flex al-item-center j-between">
+        <view class="store-l flex al-item-center">
+          <image class="store-logo" :src="shopInfo.logo"></image>
+          <view class="store-l-c flex1">
+            <view
+              class="store-l-tlt flex al-item-center"
+              @click="goto"
+              :data-url="
+                '/pagesA/shop/shop-detail?bid=' +
+                shopInfo.id +
+                '&pagestext=' +
+                shopInfo.name
+              "
+            >
+              <text class="head-store__name">{{ shopInfo.name || "" }}</text>
+              <text class="iconfont icon-arrow-right"></text>
+            </view>
+            <!-- <view class="store-l-tx text-center" :style="{'background-color': '#FF8017'}">自营</view> -->
+          </view>
+        </view>
+        <view class="store-r flex flex-colum al-item-center">
+          <view
+            @tap="followFn"
+            class="store-r-tlt text-center"
+            :class="shopInfo.isFollow ? 'followed' : 'isFollow'"
+          >
+            <image
+              class="follow-icon"
+              v-if="!shopInfo.isFollow"
+              :src="event_rul + '/static/theme/follow-icon.svg'"
+            ></image>
+            <text>{{ shopInfo.isFollow ? "已关注" : "关注" }}</text>
+          </view>
+          <!-- <view class="store-r-tlt text-center" :style="{'border-color': '#FF8017', 'color': '#FF8017','border':' 1px solid'}">已关注</view> -->
+          <view class="store-r-tx">{{ shopInfo.attention || 0 }}人关注</view>
+        </view>
+      </view>
+      <view
+        v-if="isShowNav"
+        class="head-nav-list flex j-between"
+        :class="{ 'isFixed': navFixed }"
+        :style="'top:'+ (navHeight - 1) + 'px;background:'+(navFixed ? (shopInfo.bgimg ? 'url('+ shopInfo.bgimg+');background-size: 100% auto;background-position: top -60px left 0':''):'')"
+      >
+        <block v-for="(item, idx) in navBar" :key="idx">
+          <view class="nav-list-itm" @tap="selectNav(idx)">
+            <view class="itm-tx color-white">{{ item }}</view>
+            <view
+              v-show="navIndex == idx"
+              class="itm-select border-rius-r"
+            ></view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState, mapActions } from "vuex";
+var app = getApp();
+export default {
+  props: {
+    navHeight: {
+      type: Number,
+      default: 0,
+    },
+    navList: {
+      typa: Array,
+      default: function() {
+        return [];
+      },
+    },
+    shopData: {
+      typa: Object,
+      default: {},
+    },
+    navIndex: {
+      type: Number,
+      default: 0,
+    },
+    isShowNav: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      bxContHeight: 0,
+      timeout: null,
+      timeouttwo: null,
+      searchVlaue: "",
+      shopInfo: this.shopData,
+      event_rul: app.globalData.event_url,
+      navBar: [],
+    };
+  },
+  computed: {
+    ...mapState(["opt","navFixed","heardHeight"]),
+  },
+  watch: {
+    // 监听shopData变化
+    shopData(newV, oldV) {
+      this.shopInfo = newV;
+    },
+    navList: {
+      handler: function(newV, oldV) {
+        this.navBar = newV;
+      },
+      deep: true,
+    }
+  },
+  mounted() {
+    const vr = uni.getSystemInfoSync();
+    this.styleHeight();
+    this.getData();
+  },
+  beforeDestroy() {
+    clearTimeout(this.timeout);
+    clearTimeout(this.timeouttwo);
+  },
+  methods: {
+    ...mapActions(["acNavHeightTop","acHeardHeight"]),
+    getData() {
+      if (this.navList.length == 0) {
+        this.navBar = ["精选", "商品", "活动", "新品"];
+      } else {
+        this.navBar = this.navList;
+      }
+      const query = uni.createSelectorQuery().in(this);
+      this.timeouttwo = setTimeout(() => {
+        let listTop = 0;
+        query.select(".head-nav-list").boundingClientRect((data) => {
+          listTop = data ? Number(data.top) : 0;
+        }).exec();
+        query.select(".head-bx-cont").boundingClientRect((data) => {
+          const heightTop = listTop - (data ? Number(data.top) : 0);
+          this.acNavHeightTop(heightTop);
+        }).exec();
+      }, 200)
+    },
+    // 关注店铺
+    followFn() {
+      var that = this;
+      console.log("打印店铺信息+++++", this.shopData, this.shopData);
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.shopData.id || "", type: "store" },
+        function (res) {
+          console.log("点击关注和取消关注addFollow===========", res);
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo();
+        }
+      );
+    },
+
+    getInfo() {
+      var that = this;
+      // 暂时写死 id：27，正确为 id：that.shopData.id
+      app.post(
+        "/ApiBusiness/follow",
+        { bid: that.shopData.id || "" },
+        function (res) {
+          that.$set(that.shopData, "attention", res.data.followCount);
+          that.$set(that.shopData, "isFollow", res.data.isFollow);
+
+          console.log("-----", that.shopData);
+          // 公共头部信息
+          uni.setStorage({
+            key: "header_data",
+            data: that.shopData,
+          });
+        }
+      );
+    },
+
+    styleHeight() {
+      let query = uni.createSelectorQuery().in(this);
+      query.select(".head-bx-cont").boundingClientRect();
+      query.select(".themes-head").boundingClientRect();
+      this.timeout = setTimeout(() => {
+        query.exec((res) => {
+          if (res[0] != null && res[1] != null) {
+            this.bxContHeight = res[0].height;
+            console.log(this.navFixed)
+            if(!this.navFixed) {
+              this.acHeardHeight(res[1].height)
+            }
+          }
+        });
+      }, 200)
+    },
+    // 返回
+    goBack() {
+      uni.navigateBack();
+    },
+    // 搜索
+    search() {
+      uni.navigateTo({
+        url:
+          "/pagesA/shop/search?keyword=" +
+          this.searchVlaue +
+          "&id=" +
+          this.shopData.id,
+      });
+      return;
+    },
+    selectNav(idx) {
+      this.$emit("navselect", idx, this.bxContHeight, this.heardHeight);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-head {
+  width: 100%;
+  flex-shrink: 0;
+  z-index: 3;
+  .head-bx-h {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 99;
+    background-size: 100% 1020rpx;
+    background-position: top 0 left 0;
+    .head-bx-ct {
+      height: 32px;
+      left: 0;
+      bottom: 4px;
+
+      .icon-icon_arrow_left {
+        padding-left: 30rpx;
+        color: #fff;
+        font-size: 50rpx;
+      }
+      .icon-shouye {
+        font-size: 45rpx;
+        color: #fff;
+        padding: 10rpx 20rpx;
+      }
+      .search {
+        margin-left: 20rpx;
+        width: 60%;
+        height: 100%;
+        padding: 0 20rpx;
+        background-color: #fff;
+
+        .icon-search {
+          font-size: 50rpx;
+          color: #ababab;
+        }
+        input {
+          padding-left: 20rpx;
+        }
+      }
+    }
+  }
+
+  .head-bx-cont {
+    padding-top: 30rpx;
+
+    .head-store {
+      color: #fff;
+      padding: 0 28rpx;
+      &__name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        /* autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        text-align: justify;
+      }
+      .store-l {
+        width: 80%;
+        .store-logo {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 12rpx;
+        }
+
+        .store-l-c {
+          padding-left: 20rpx;
+          .store-l-tlt {
+            font-size: 32rpx;
+            white-space: pre-wrap;
+            word-break: break-all;
+            padding-right: 45rpx;
+            display: flex;
+            align-items: center;
+
+            .icon-arrow-right {
+              font-size: 40rpx;
+              padding: 6rpx 0 0 0;
+            }
+          }
+          .store-l-tx {
+            min-width: 60rpx;
+            // min-height: 30rpx;
+            padding: 4rpx 10rpx;
+            margin-top: 8rpx;
+            line-height: 30rpx;
+            display: inline-block;
+            font-size: 24rpx;
+            border-radius: 4rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
+
+      .store-r {
+        .store-r-tlt {
+          width: 120rpx;
+          height: 48rpx;
+          line-height: 48rpx;
+          border-radius: 24rpx;
+          font-size: 24rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          &.isFollow {
+            background: linear-gradient(150deg, #ea1f05 0%, #f54617 100%);
+            color: #fff;
+            .follow-icon {
+              width: 28rpx;
+              height: 24rpx;
+              margin-right: 6rpx;
+            }
+          }
+          &.followed {
+            color: #fff;
+            position: relative;
+            &::before {
+              content: "";
+              position: absolute;
+              left: 0;
+              top: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #fff;
+              box-sizing: border-box;
+              transform: scale(0.5, 0.5);
+              border-radius: 48rpx;
+              transform-origin: 0 0;
+            }
+          }
+        }
+
+        .store-r-tx {
+          padding-top: 6rpx;
+          font-size: 22rpx;
+        }
+      }
+    }
+
+    .head-nav-list {
+      padding: 0 28rpx;
+      font-size: 28rpx;
+      align-items: flex-start;
+      background-size: 100% 1020rpx;
+      &.isFixed {
+        position: fixed;
+        left: 0;
+        right: 0;
+      }
+      .nav-list-itm {
+        padding: 28rpx 32rpx 0;
+        .itm-tx {
+          z-index: 6;
+        }
+        .itm-select {
+          width: 100%;
+          height: 6rpx;
+          margin-top: 6rpx;
+          z-index: 2;
+          background: #fff;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-hot.vue b/pagesA/themes/hongFuQiTian/components/themes-hot.vue
new file mode 100644
index 0000000..db0ecf0
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-hot.vue
@@ -0,0 +1,183 @@
+<template>
+  <view class="themes-hot-sale">
+    <scroll-view class="scroll-list" :scroll-x="true" @scroll="scrollHandle($event)">
+      <view class="scroll-list-row" v-for="(items, idx) in shopMenu" :key="idx">
+        <view
+          class="scroll-list-item"
+          v-for="(item, index) in items"
+          :key="index"
+          @tap.stop="goShopCgry(item.hrefurl, item.id)"
+        >
+          <view class="list-item flex flex-w">
+            <view class="list-item-c flex flex-colum al-item-center">
+              <view class="list-item-cnt position-r">
+                <image
+                  class="item-c-img border-rius-r"
+                  :src="item.imgurl"
+                  mode=""
+                ></image>
+                <!-- <text
+                  class="item-c-hot hot-s1 position-a"
+                  :style="{ 'border-color': '#FE7D11', color: '#FE7D11' }"
+                  v-if="index == 0"
+                  >HOT</text
+                > -->
+              </view>
+              <text class="list-item-tl fs12">{{ item.text }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view v-if="isShowDots" class="list-dots">
+      <view class="list-dots__item" :style="'left:' + dotLeft + 'px'"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  props: {
+    shopMenu: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    isShowDots: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      width: 0,  // scroll-list节点宽度
+      dotLeft: 0,  // 圆点滚动的距离
+    }
+  },
+  computed: {
+    ...mapState(["opt"]),
+  },
+  mounted() {
+    const query = uni.createSelectorQuery().in(this);
+    query.select('.scroll-list').boundingClientRect(data => {
+      this.width = data.width;
+      console.log("得到布局位置信息" + this.width);
+    }).exec();
+  },
+  methods: {
+    scrollHandle(e){
+      let scrollLeft = e.detail.scrollLeft;
+      let scrollWidth  = e.detail.scrollWidth;
+      let ratio = scrollLeft / (scrollWidth - this.width);
+      this.dotLeft = 18 * ratio;
+    },
+    goShopCgry(url, id) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-hot-sale {
+  background: #FFF;
+  padding: 16rpx 16rpx;
+  box-shadow: 0rpx 4px 8rpx 0rpx rgba(0,0,0,0.0300);
+  border-radius: 20rpx;
+  margin-top: 28rpx;
+  .swiper-container {
+    height: 450rpx;
+    &.swiper-single {
+      height: 210rpx;
+    }
+  }
+
+  .scroll-list {
+    width: 100%;
+    position: relative;
+    width: calc(100% + 16rpx);
+    right: -16rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+    &-row:not(:last-child) {
+      margin-bottom: 18rpx;
+    }
+    .scroll-list-item {
+      background: none;
+      display: inline-block;
+      margin-left: 35rpx;
+
+      .list-item-c {
+        width: 106rpx;
+
+        .list-item-cnt {
+          .item-c-img {
+            width: 90rpx;
+            height: 90rpx;
+            vertical-align: middle;
+          }
+
+          .item-c-hot {
+            padding: 2rpx 10rpx;
+            font-size: 20rpx;
+            border: 2rpx solid;
+            border-radius: 50rpx 60rpx 60rpx 0px;
+            background-color: #fff;
+            top: 6rpx;
+            right: -12rpx;
+          }
+
+          .hot-s1 {
+            background-color: #fff;
+          }
+        }
+        .list-item-tl {
+          max-width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          padding-top: 10rpx;
+        }
+      }
+    }
+    .scroll-list-item:first-child {
+      margin-left: 0;
+    }
+  }
+  .list-dots {
+    margin-top: 18rpx;
+    position: relative;
+    width: 72rpx;
+    height: 6rpx;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #EAEAEA;
+    border-radius: 6rpx;
+    &__item {
+      position: absolute;
+      top: 0;
+      width: 50%;
+      height: 100%;
+      background: #EA4E34;
+    }
+  }
+}
+
+.top {
+  margin-top: -60rpx;
+}
+.top-z {
+  margin-top: 0rpx;
+}
+.top-m {
+  margin-top: -50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-live.vue b/pagesA/themes/hongFuQiTian/components/themes-live.vue
new file mode 100644
index 0000000..7f7a6c1
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-live.vue
@@ -0,0 +1,206 @@
+<template>
+  <view class="themes-live position-r">
+    <view
+      v-for="(item, index) in shopVideo"
+      :key="index"
+      @click="goto"
+      :data-url="'/activity/shortvideo/detail?id=' + item.videoId"
+    >
+      <text class="iconfont icon-bofang"></text>
+      <image
+        class="themes-live-bg"
+        :src="item.coverimg"
+        mode="aspectFill"
+      ></image>
+      <view class="live-an-t flex al-item-center j-between position-a">
+        <view class="live-an-t-l flex j-between">
+          <text class="heng1"></text>
+          <text class="heng2"></text>
+          <text class="heng3"></text>
+        </view>
+        <view class="live-an-t-l-r">{{
+          formatSeconds(Number(item.video_duration)) || "00:00"
+        }}</view>
+      </view>
+      <view class="live-s-t position-a flex al-item-center" v-if="item.hasOwnProperty('goods')">
+        <image
+          class="s-t-img"
+          :src="item.goods.propic"
+          mode="aspectFill"
+        ></image>
+        <view class="tx-bx flex1 overflow-hd flex flex-colum j-between">
+          <text class="tx-tl text-overflow-line">{{ item.goods.proname }}</text>
+          <text class="tx1 flex"
+            >¥<text class="tx2 font-w">{{
+              item.goods.prosell_price
+            }}</text></text
+          >
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopVideo: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {
+    formatSeconds(time){
+				let newTime,hour,minite,seconds;
+				if(time >= 3600){
+				hour = parseInt(time/3600) < 10 ? '0' + parseInt(time/3600) : parseInt(time/3600);
+				minite = parseInt(time%3600/60) < 10 ? '0' + parseInt(time%3600/60):parseInt(time%3600/60);
+				seconds = time%3600%60 < 10 ? '0' + Math.round(time%3600%60) : Math.round(time%3600%60);
+				newTime = hour + ':' + minite + ':' + seconds;
+				}else if(time >= 60 && time < 3600){
+				minite = parseInt(time/60) < 10 ? '0' + parseInt(time/60) : parseInt(time/60);
+				seconds = time%60 < 10 ? '0' + Math.round(time%60) : Math.round(time%60);
+				newTime = minite + ':' + seconds;  
+				}else if(time < 60 ){
+				seconds = time < 10 ? '0' + Math.round(time) : Math.round(time);
+				newTime = '00:'+ seconds;
+				}
+				return newTime;
+			},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-live {
+  margin-top: 30rpx;
+  .icon-bofang {
+    position: absolute;
+    font-size: 130rpx;
+    left: 50%;
+    top: 50%;
+    color: rgba(255, 255, 255, 0.6);
+    transform: translateX(-50%) translateY(-70%);
+  }
+
+  .themes-live-bg {
+    width: 100%;
+    height: 400rpx;
+    border-radius: 12rpx;
+    vertical-align: middle;
+  }
+
+  .live-an-t {
+    // width: 102rpx;
+    padding: 4rpx 12rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    border-radius: 8rpx;
+    color: #fff;
+    left: 30rpx;
+    top: 30rpx;
+    z-index: 3;
+
+    .live-an-t-l {
+      width: 24rpx;
+      height: 24rpx;
+      margin-right: 16rpx;
+      align-items: flex-end;
+
+      .heng1,
+      .heng2,
+      .heng3 {
+        width: 4rpx;
+        border-radius: 6rpx;
+        background-color: #fff;
+      }
+      .heng1 {
+        height: 24rpx;
+        animation: hengos 0.8s linear infinite;
+      }
+      .heng2 {
+        height: 10rpx;
+        animation: hengts 0.8s linear infinite;
+      }
+      .heng3 {
+        height: 24rpx;
+        animation: henghs 0.8s linear 0.2s infinite;
+      }
+    }
+    .live-an-t-r {
+      font-size: 24rpx;
+    }
+  }
+
+  .live-s-t {
+    width: 308rpx;
+    height: 120rpx;
+    padding: 6rpx 16rpx;
+    border-radius: 12rpx;
+    background-color: #fff;
+    left: 15rpx;
+    bottom: 15rpx;
+    z-index: 3;
+
+    .s-t-img {
+      width: 86rpx;
+      height: 86rpx;
+      border-radius: 12rpx;
+    }
+
+    .tx-bx {
+      min-height: 43px;
+      padding-left: 16rpx;
+      .tx-tl {
+        font-size: 24rpx;
+      }
+      .tx1 {
+        padding-top: 6rpx;
+        font-size: 20rpx;
+      }
+      .tx2 {
+        font-size: 28rpx;
+      }
+    }
+  }
+}
+
+@keyframes hengos {
+  0% {
+    height: 24rpx;
+  }
+  50% {
+    height: 10rpx;
+  }
+  100% {
+    height: 24rpx;
+  }
+}
+@keyframes hengts {
+  0% {
+    height: 10rpx;
+  }
+  50% {
+    height: 24rpx;
+  }
+  100% {
+    height: 10rpx;
+  }
+}
+@keyframes henghs {
+  0% {
+    height: 24rpx;
+  }
+  50% {
+    height: 10rpx;
+  }
+  100% {
+    height: 24rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-note-desc.vue b/pagesA/themes/hongFuQiTian/components/themes-note-desc.vue
new file mode 100644
index 0000000..cfbcb2e
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-note-desc.vue
@@ -0,0 +1,140 @@
+<template>
+  <view class="themes-note">
+    <view class="note-til flex flex-colum al-item-center">
+      <text class="tex1">热门笔记</text>
+      <view class="flex flex-colum al-item-center">
+        <text class="tex2">POPULAR NOTES</text>
+        <text class="tex-bg"></text>
+      </view>
+    </view>
+    <view class="themes-note__list">
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="themes-note__item"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <image
+            class="themes-note__item-img"
+            :src="item.pic+'?x-oss-process=image/resize,m_fill,w_167,h_245'"
+            mode="aspectFill"
+          ></image>
+          <view class="themes-note__item-txt">{{ item.title }}</view>
+          <view class="note-c-b flex al-item-center j-between">
+            <view class="note-c-b-l flex al-item-center">
+              <image
+                class="note-u-img border-rius-r"
+                :src="item.headimg"
+                mode="aspectFill"
+              ></image>
+              <text class="text-overflow-tx flex1">{{ item.nickname }}</text>
+            </view>
+            <view class="note-c-b-r flex al-item-center">
+              <text class="iconfont icon-aixin"></text>
+              <!-- <text class="iconfont icon-aixin_shixin" :style="{'color':t('color1')}"></text> -->
+              <text class="z-tx">{{ item.zan }}</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+  margin-top: 30rpx;
+  .note-til {
+    padding-bottom: 30rpx;
+    letter-spacing: 4rpx;
+    .tex1 {
+      font-size: 48rpx;
+      padding-bottom: 10rpx;
+    }
+    .tex2 {
+      z-index: 6;
+      color: #efbd6f;
+    }
+    .tex-bg {
+      height: 12rpx;
+      width: 92%;
+      margin-top: -12rpx;
+      z-index: 2;
+      background: rgba(239, 189, 111, 0.3);
+    }
+  }
+  &__list {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    margin-bottom: -28rpx;
+  }
+  &__item {
+    width: 334rpx;
+    height: 490rpx;
+    padding-bottom: 18rpx;
+    box-sizing: border-box;
+    box-shadow: 0 0 4rpx 1rpx rgba(0, 0, 0, 0.1);
+    border-radius: 6rpx 6rpx 6rpx 6rpx;
+    margin-bottom: 28rpx;
+    &-img {
+      width: 100%;
+      height: 320rpx;
+    }
+    &-txt {
+      padding: 16rpx 16rpx 0rpx;
+      min-height: 92rpx;
+      font-size: 28rpx;
+      color: #333;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+    .note-c-b {
+      margin-top: 10rpx;
+      font-size: 20rpx;
+      color: #999;
+      padding: 0 16rpx;
+      .note-c-b-l {
+        width: 60%;
+        .note-u-img {
+          width: 36rpx;
+          height: 36rpx;
+          border-radius: 50%;
+          margin-right: 16rpx;
+        }
+      }
+      .note-c-b-r {
+        .icon-aixin {
+          font-size: 24rpx;
+        }
+        .icon-aixin_shixin {
+          font-size: 24rpx;
+        }
+        .z-tx {
+          padding-left: 10rpx;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-note.vue b/pagesA/themes/hongFuQiTian/components/themes-note.vue
new file mode 100644
index 0000000..6dbdca2
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-note.vue
@@ -0,0 +1,154 @@
+<template>
+  <view class="themes-note">
+    <themes-chunk-title title="热门笔记" :iconSrc="event_rul + '/static/theme/note-icon.svg'"></themes-chunk-title>
+    <scroll-view
+      class="scroll-list"
+      :scroll-x="true"
+    >
+      <block v-for="(item, idx) in shopNote" :key="idx">
+        <view
+          class="scroll-list-item overflow-hd"
+          @click="goto"
+          :data-url="'/activity/luntan/detail?id=' + item.videoId"
+        >
+          <view class="scroll-list-item-ct flex flex-colum overflow-hd">
+            <view class="note-s overflow-hd position-r">
+              <image class="note-img" :src="item.pic+'?x-oss-process=image/resize,m_fill,w_120,h_115'" mode="aspectFill"></image>
+            </view>
+            <view class="note-b-cnt flex flex1 flex-colum j-between">
+              <text class="note-title text-overflow-line font-w">{{
+                item.title
+              }}</text>
+              <view class="note-c-b flex al-item-center j-between">
+                <view class="note-c-b-l flex al-item-center">
+                  <image
+                    class="note-u-img border-rius-r"
+                    :src="item.headimg"
+                    mode="aspectFill"
+                  ></image>
+                  <text class="text-overflow-tx flex1">{{
+                    item.nickname
+                  }}</text>
+                </view>
+                <view class="note-c-b-r flex al-item-center">
+                  <text class="iconfont icon-aixin"></text>
+                  <text class="z-tx">{{ item.zan ? (item.zan >= 10000 ? (item.zan / 10000).toFixed(1) + '万': item.zan) : 0 }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import themesChunkTitle from './themes-chunk-title.vue'
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitle
+  },
+  props: {
+    shopNote: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-note {
+  .scroll-list {
+    position: relative;
+    width: calc(100% + 28rpx);
+    right: -28rpx;
+    left: 0;
+    white-space: nowrap;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+
+    .scroll-list-item {
+      display: inline-block;
+      margin-right: 20rpx;
+      background-color: #fff;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 20rpx;
+      &:last-child {
+        margin-right: 28rpx;
+      }
+
+      .scroll-list-item-ct {
+        width: 320rpx;
+        height: 536rpx;
+
+        .note-s {
+          width: 100%;
+          height: 376rpx;
+
+          .note-img {
+            width: 100%;
+            height: 100%;
+          }
+
+          .note-hot {
+            left: 16rpx;
+            top: 14rpx;
+            line-height: 34rpx;
+
+            .note-hot-img {
+              width: 110rpx;
+              height: 34rpx;
+            }
+            .note-hot-tx {
+              font-size: 20rpx;
+            }
+          }
+        }
+
+        .note-b-cnt {
+          width: 100%;
+          padding: 22rpx 16rpx 20rpx;
+          white-space: normal;
+          .note-title {
+          }
+
+          .note-c-b {
+            font-size: 28rpx;
+            color: #999;
+            .note-c-b-l {
+              width: 60%;
+              .note-u-img {
+                width: 36rpx;
+                height: 36rpx;
+                margin-right: 10rpx;
+              }
+            }
+            .note-c-b-r {
+              .icon-aixin {
+                font-size: 28rpx;
+              }
+              .icon-aixin_shixin {
+                font-size: 28rpx;
+              }
+              .z-tx {
+                padding-left: 6rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-recommend.vue b/pagesA/themes/hongFuQiTian/components/themes-recommend.vue
new file mode 100644
index 0000000..b1be8a3
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-recommend.vue
@@ -0,0 +1,171 @@
+<template>
+  <view class="themes-recommend">
+    <block
+      class="themes-recommend__list"
+      v-for="(item, idx) in shopProduct"
+      :key="idx"
+    >
+      <view
+        class="themes-recommend__item"
+        @click="goto"
+        :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+      >
+        <text class="themes-recommend__item-tab">抢鲜价</text>
+        <view class="themes-recommend__item-hd">
+          <image
+            class="themes-recommend__item-img"
+            :src="item.pic"
+            mode="aspectFill"
+          ></image>
+        </view>
+        <view class="themes-recommend__item-bd">
+          <view class="themes-recommend__item-title">{{ item.name }}</view>
+          <view class="themes-recommend__item-price">
+            <text class="themes-recommend__item-symbol">¥</text>
+            <text class="themes-recommend__item-num">{{ item.sell_price }}</text>
+          </view>
+          <view
+            class="themes-recommend__item-btn"
+            @click.stop="buydialogChange"
+            :data-proid="item.proid"
+            >立即抢购</view
+          >
+        </view>
+      </view>
+    </block>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+    menuindex: {
+      default: -1,
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+    };
+  },
+  mounted() {
+    // console.log(this.shopProduct)
+  },
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-recommend {
+  &__list {
+    border-radius: 10rpx;
+    overflow: hidden;
+    &:not(last-child) {
+      margin-top: 28rpx;
+    }
+  }
+  &__item {
+    display: flex;
+    position: relative;
+    height: 296rpx;
+    margin-top: 28rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.03);
+    border-radius: 20rpx;
+    padding: 40rpx 28rpx 0 30rpx;
+    &-tab {
+      position: absolute;
+      top: 0;
+      left: 0;
+      background: linear-gradient(150deg, #23B500 0%, #3ECF01 100%);
+      border-radius: 20rpx 0rpx 20rpx 0rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 40rpx;
+      padding: 0 18rpx;
+      z-index: 1;
+    }
+    &-hd {
+      width: 242rpx;
+      height: 242rpx;
+      flex-shrink: 0;
+    }
+    &-img {
+      width: 100%;
+      height: 100%;
+    }
+    &-bd {
+      flex: 1;
+      padding: 0 0 40rpx 36rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+    &-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 3;
+      /* autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      text-align: justify;
+      white-space: pre-wrap;
+      word-break: break-all;
+
+    }
+    &-price {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #ED5925;
+      line-height: 50rpx;
+    }
+    &-symbol {
+      font-size: 24rpx;
+      line-height: 34rpx;
+      margin-right: 6rpx;
+    }
+    &-btn {
+      position: absolute;
+      bottom: 28rpx;
+      right: 28rpx;
+      background: linear-gradient(150deg, #FA5F47 0%, #FC4741 100%);
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 50rpx;
+      border-radius: 25rpx;
+      padding: 0 22rpx;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-shop.vue b/pagesA/themes/hongFuQiTian/components/themes-shop.vue
new file mode 100644
index 0000000..0c793b0
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-shop.vue
@@ -0,0 +1,167 @@
+<template>
+  <view class="themes-shops">
+		<themes-chunk-title v-if="isShowTitle" title="精选商品" :iconSrc="event_rul + '/static/theme/choiceness-icon.svg'" tengtx="group purchase"></themes-chunk-title>
+    <view class="shops-box">
+      <view class="flex flex-w shop-item">
+        <block v-for="(item, idx) in shopProduct" :key="idx">
+          <view
+            class="shops-cont bg-color-white overflow-hd"
+            @click="goto"
+            :data-url="item.pic ? '/pages/shop/product?id=' + item.proid : ''"
+          >
+            <view class="shops-cont__hd flex j-center al-item-center">
+              <image
+                class="shops-img"
+                :src="item.pic"
+                mode="widthFix"
+              ></image>
+            </view>
+            <view class="item-info">
+              <view class="shops-c-t text-overflow-line">{{ item.name }}</view>
+              <view class="shops-b-t flex al-item-center j-between">
+                <view class="item-info__price">
+                  <text class="b-t1 flex al-item-center"
+                    >¥<text class="b-t2 font-w">{{ item.sell_price }}</text>
+                  </text>
+                  <view class="shops-s-t">已售 {{ item.sales ? (item.sales >= 10000 ? (item.sales / 10000).toFixed(1) + '万': item.sales) : 0 }}</view>
+                </view>
+                <view
+                  class="car flex border-rius-r al-item-center j-center"
+                  @click.stop="buydialogChange"
+                  :data-proid="item.proid"
+                >
+                  <text class="iconfont icon-gouwuche1"></text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    <buydialog
+      v-if="buydialogShow"
+      :proid="proid"
+      @addcart="addcart"
+      @buydialogChange="buydialogChange"
+      :menuindex="menuindex"
+    ></buydialog>
+  </view>
+</template>
+
+<script>
+import themesChunkTitle from './themes-chunk-title.vue';
+var app = getApp();
+export default {
+  components: {
+    themesChunkTitle
+  },
+  props: {
+    isShowTitle: { type: Boolean, default: false },
+    menuindex: { default: -1 },
+    shopProduct: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 14,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {
+    buydialogChange(e) {
+      if (!this.buydialogShow) {
+        console.log(e.currentTarget.dataset.proid);
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-shops {
+  padding: 22rpx 0 20rpx;
+}
+.shops-box {
+  width: 100%;
+  .shops-cont {
+    width: 49%;
+    box-sizing: border-box;
+    box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+    border-radius: 20rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &__hd {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+    }
+
+    .shops-img {
+      width: 100%rpx;
+      height: 260rpx;
+    }
+    .item-info {
+      padding: 24rpx 20rpx;
+      width: 100%;
+    }
+    .shops-c-t {
+      min-height: 72rpx;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 36rpx;
+    }
+    .shops-s-t {
+      display: flex;
+      align-items: center;
+      margin-top: 2rpx;
+      font-size: 18rpx;
+      color: #999999;
+      line-height: 22rpx;
+    }
+    .shops-b-t {
+      padding-top: 28rpx;
+
+      .b-t1 {
+        color: #ED5925;
+        font-size: 24rpx;
+      }
+      .b-t2 {
+        font-size: 36rpx;
+        margin-left: 6rpx;
+      }
+      .car {
+        width: 54rpx;
+        height: 54rpx;
+        background: #ff8e1f;
+
+        .icon-gouwuche1 {
+          color: #fff;
+          font-size: 36rpx;
+          line-height: 44rpx;
+          height: 48rpx;
+        }
+      }
+    }
+  }
+  .shops-cont:nth-child(2n) {
+    // margin-left: calc(100% - 680rpx);
+    margin-left: 2%;
+  }
+  .shops-cont:nth-child(n + 3) {
+    margin-top: 20rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-tuangou-item.vue b/pagesA/themes/hongFuQiTian/components/themes-tuangou-item.vue
new file mode 100644
index 0000000..889a7f6
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-tuangou-item.vue
@@ -0,0 +1,200 @@
+<template>
+<view style="width:100%">
+	<view class="dp-tuangou-item">
+		<view class="item" v-for="(item,index) in data" :style="showstyle==2 ? 'width:48%;margin-right:'+(index%2==0?'4%':0) : (showstyle==3 ? 'width:32%;margin-right:'+(index%3!=2?'2%':0) :'width:100%')" :key="item.id" >
+			<view class="" @click="goto" :data-url="'/activity/tuangou/product?id='+item[idfield]">
+				<view class="product-pic">
+					<image class="image" :src="item.pic" mode="widthFix"/>
+					<image class="saleimg" :src="saleimg" v-if="saleimg!=''" mode="widthFix"/>
+				</view>
+				<view class="product-info">
+					<view class="p1" v-if="showname == 1">{{item.name}}</view>
+					<view class="p2">
+						<view class="p2-1" v-if="showprice != '0'">
+							<text class="t1" :style="{color:'#ED5925'}"><text style="font-size:24rpx">低至￥</text>{{item.min_price}}</text>
+							<text class="t2" v-if="showprice == '1' && item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+						</view>
+					</view>
+					<view class="p3" v-if="showsales=='1' && item.sales>0">已售{{item.sales}}件</view>
+					<view class="p4 flex border-rius-r al-item-center j-center" :style="{background:'#FB5444'}" v-if="showcart==1" @click.stop="buydialogChange" :data-proid="item[idfield]"><text class="iconfont icon-gouwuche1"></text></view>
+					<view class="p4" :style="{background:t('color1')}" v-if="showcart==2" @click.stop="buydialogChange" :data-proid="item[idfield]"><image :src="cartimg" class="img"></image></view>
+				</view>
+			</view>
+			<view class="overdue" v-if="item.endtime < timestamp">
+				<image class="overdue-img" :src="event_rul + '/static/theme/tuangou-jiesu.png'" mode="widthFix"></image>
+			</view>
+		</view>
+	</view>
+	<buydialog-tuangou v-if="buydialogShow" :proid="proid" @addcart="addcart" @buydialogChange="buydialogChange" controller="ApiTuangou" :menuindex="menuindex"></buydialog-tuangou>
+</view>
+</template>
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+      buydialogShow: false,
+      proid: 0,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  props: {
+    showstyle: { default: 2 },
+    menuindex: { default: -1 },
+    saleimg: { default: "" },
+    showname: { default: 1 },
+    namecolor: { default: "#333" },
+    showprice: { default: "1" },
+    showsales: { default: "1" },
+    showcart: { default: "1" },
+	timestamp:{ default: 0 },
+    cartimg: {
+      default: app.globalData.event_url + "/static/img/static/imgsrc/cart.svg",
+    },
+    data: {},
+    idfield: { default: "id" },
+  },
+  methods: {
+    buydialogChange: function (e) {
+      if (!this.buydialogShow) {
+        this.proid = e.currentTarget.dataset.proid;
+      }
+      this.buydialogShow = !this.buydialogShow;
+      console.log(this.buydialogShow);
+    },
+    addcart: function () {
+      this.$emit("addcart");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.dp-tuangou-item {
+  height: auto;
+  position: relative;
+  overflow: hidden;
+  padding: 0rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 30rpx;
+}
+.dp-tuangou-item .item {
+  display: inline-block;
+  position: relative;
+  margin-bottom: 12rpx;
+  background: #fff;
+  border-radius: 10rpx;
+  overflow: hidden;
+  // border: 1rpx solid rgba(0, 0, 0, 0.08);
+  box-shadow: 0rpx 4rpx 4rpx 0rpx rgba(0,0,0,0.0300);
+}
+.dp-tuangou-item .product-pic {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  background: #ffffff;
+  padding-bottom: 100%;
+  position: relative;
+}
+.dp-tuangou-item .product-pic .image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: auto;
+}
+.dp-tuangou-item .product-pic .saleimg {
+  position: absolute;
+  width: 60px;
+  height: auto;
+  top: -3px;
+  left: -3px;
+}
+.dp-tuangou-item .product-info {
+  padding: 20rpx 20rpx;
+  position: relative;
+}
+.dp-tuangou-item .product-info .p1 {
+  color: #323232;
+  font-weight: bold;
+  font-size: 26rpx;
+  line-height: 36rpx;
+  margin-bottom: 10rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  height: 72rpx;
+}
+.dp-tuangou-item .product-info .p2 {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  padding: 2px 0;
+}
+.dp-tuangou-item .product-info .p2-1 {
+  flex-grow: 1;
+  flex-shrink: 1;
+  height: 40rpx;
+  line-height: 40rpx;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.dp-tuangou-item .product-info .p2-1 .t1 {
+  font-size: 36rpx;
+  color: #efbd6f;
+}
+.dp-tuangou-item .product-info .p2-1 .t2 {
+  margin-left: 10rpx;
+  font-size: 24rpx;
+  color: #aaa;
+  text-decoration: line-through; /*letter-spacing:-1px*/
+}
+.dp-tuangou-item .product-info .p2-2 {
+  font-size: 20rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: right;
+  padding-left: 20rpx;
+  color: #999;
+}
+.dp-tuangou-item .product-info .p3 {
+  color: #999999;
+  font-size: 20rpx;
+  margin-top: 10rpx;
+}
+.dp-tuangou-item .product-info .p4 {
+  color: #fff;
+  width: 54rpx;
+  height: 54rpx;
+  border-radius: 50%;
+  position: absolute;
+  display: relative;
+  bottom: 20rpx;
+  right: 20rpx;
+  text-align: center;
+}
+.dp-tuangou-item .product-info .p4 .icon-gouwuche1 {
+  font-size: 36rpx;
+  height: 48rpx;
+  line-height: 44rpx;
+}
+.dp-tuangou-item .product-info .p4 .img {
+  width: 100%;
+  height: 100%;
+}
+.overdue {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, .3);
+	.overdue-img {
+		width: 202rpx;
+		position: absolute;
+		top: 130rpx;
+		right: 2rpx;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-tuangou.vue b/pagesA/themes/hongFuQiTian/components/themes-tuangou.vue
new file mode 100644
index 0000000..3dd86e5
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-tuangou.vue
@@ -0,0 +1,130 @@
+<template>
+	<view class="themes-miao-s bg-color-white">
+		<themes-chunk-title title="团购活动" :iconSrc="event_rul + '/static/theme/avtivity-icon.svg'" tengtx="group purchase"></themes-chunk-title>
+		<scroll-view :scroll-x="true" class="miao-cont">
+			<block v-for="item in shopTuangou" :key="item.id">
+				<view class="miao-cont__item al-item-center flex-colum j-between" @click="goto"
+				:data-url="'/activity/tuangou/product?id=' + item.proid">
+					<image class="miao-cont__item-img" :src="item.pic" mode="aspectFill"></image>
+					<view class="miao-cont__item-title">{{ item.name }}</view>
+					<view class="miao-cont__item-bottom">
+						<view class="miao-cont__item-price">
+							<view class="miao-cont__item-current"><text class="price-symbol">低至¥</text><text>{{ item.min_price }}</text></view>
+							<view class="miao-cont__item-original"><text class="price-symbol">¥</text><text>{{ item.sell_price }}</text></view>
+						</view>
+						<text class="iconfont icon-jiahao"></text>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import { mapState } from "vuex";
+	import themesChunkTitle from './themes-chunk-title.vue'
+	
+	var app = getApp();
+	export default{
+		components: {
+			themesChunkTitle
+		},
+		props:{
+			shopTuangou: {
+				type: Array,
+				default: function() {
+					return [];
+				},
+			},
+		},
+		data(){
+			return {
+				event_rul: app.globalData.event_url,
+			}
+		},
+		computed: {
+			...mapState(['opt'])
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.themes-miao-s {
+		width: 100%;
+		margin-top: 28rpx;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 0 0 30rpx 30rpx;
+		.miao-cont {
+			white-space: nowrap;
+			& ::-webkit-scrollbar {
+				display: none;
+			}
+			&__item {
+				width: 220rpx;
+				flex-shrink: 0;
+				margin-right: 40rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				display: inline-flex;
+				&:last-child {
+					margin-right: 30rpx;
+				}
+				&-img {
+					width: 156rpx;
+					height: 156rpx;
+					margin-bottom: 16rpx;
+				}
+				&-title {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 36rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					/* autoprefixer: ignore next */
+					-webkit-box-orient: vertical;
+					text-align: justify;
+					white-space: pre-wrap;
+					word-break: break-all;
+
+				}
+				&-bottom {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					margin-top: 4rpx;
+				}
+				&-price {
+					display: flex;
+					align-items: flex-end;
+				}
+				&-current {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #ED5925;
+					line-height: 50rpx;
+					.price-symbol {
+						font-size: 22rpx;
+						line-height: 32rpx;
+						margin-right: 4rpx;
+					}
+				}
+				&-original {
+					margin: 0 0 6rpx 4rpx;
+					font-size: 20rpx;
+					font-weight: 500;
+					color: #999999;
+					line-height: 28rpx;
+					text-decoration: line-through;
+				}
+				.icon-jiahao {
+					font-size: 44rpx;
+					color: #FD4440;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/components/themes-vip.vue b/pagesA/themes/hongFuQiTian/components/themes-vip.vue
new file mode 100644
index 0000000..42ef9fd
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/components/themes-vip.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="head-new-vu flex al-item-center">
+    <swiper
+      class="swiper-box"
+      vertical="true"
+      autoplay="true"
+      circular="true"
+      :indicator-dots="false"
+      :auto-play="true"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, idx) in shopNotice"
+        :key="idx"
+        @click="goto"
+        :data-url="item.hrefurl"
+      >
+        <view class="new-cnt">
+          <image class="notice-icon" :src="noticeIcon ? noticeIcon:event_rul + '/static/theme/note-icon.svg'"></image>
+          <view class="notice-txt">{{ item.title }}</view>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  props: {
+    noticeIcon: {
+      type: String,
+      default: '',
+    },
+    shopNotice: {
+      type: Array,
+      default: function() {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      event_rul: app.globalData.event_url,
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.head-new-vu {
+  width: 100%;
+  height: 90rpx;
+  margin-top: 30rpx;
+  border-radius: 12rpx;
+  background: rgba(255,255,255,0.3);
+  border: 1rpx solid #FFF;
+  .swiper-box,.swiper-item {
+    width: 100%;
+    height: 100%;
+  }
+
+  .new-cnt {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    margin: 0 20rpx;
+    .notice-icon {
+      width: 50rpx;
+      height: 50rpx;
+      flex-shrink: 0;
+      margin-right: 12rpx;
+    }
+    .notice-txt {
+      flex: 1;
+      color: #333;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/goods.vue b/pagesA/themes/hongFuQiTian/goods.vue
new file mode 100644
index 0000000..9c1d314
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/goods.vue
@@ -0,0 +1,119 @@
+<template>
+  <view class="themes-goods position-a"
+        :style="{ height: 'calc(100vh - ' + hearHeight + ')' }">
+    <view :class="{'themes-goods__content' : !nodata}">
+      <view class="nav-list flex j-between al-item-center">
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="!field || field == 'sort' ? 'color:#D11800' : ''"
+          data-field="sort"
+          data-order="desc"
+          >推荐</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'sales' ? 'color:#D11800' : ''"
+          data-field="sales"
+          data-order="desc"
+          >销量</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          :style="field == 'createtime' ? 'color:#D11800' : ''"
+          data-field="createtime"
+          data-order="desc"
+          >新品</view
+        >
+        <view
+          @tap.stop="sortClick"
+          class="search-navbar-item"
+          data-field="sell_price"
+          :data-order="order == 'asc' ? 'desc' : 'asc'"
+        >
+          <text :style="field == 'sell_price' ? 'color:#D11800' : ''"
+            >价格</text
+          >
+          <text
+            style="font-size: 26rpx"
+            class="iconfont icon-danbianjiantou1"
+            :style="{
+              color: field == 'sell_price' && order == 'asc' ? '#D11800' : '',
+            }"
+          ></text>
+          <text
+            style="font-size: 26rpx; margin-left: -10rpx"
+            class="iconfont icon-danbianjiantou"
+            :style="{
+              color: field == 'sell_price' && order == 'desc' ? '#D11800' : '',
+            }"
+          ></text>
+        </view>
+      </view>
+      <scroll-view
+        class="scroll-list"
+        :scroll-y="true"
+        v-if="shopSelPro && shopSelPro.length > 0"
+      >
+        <themes-shop
+          :mgtop="0"
+          :mgright="30"
+          :mgleft="30"
+          :mgbottom="2"
+          :shopProduct="shopSelPro"
+        ></themes-shop>
+        <nomore v-if="nomore"></nomore>
+      </scroll-view>
+    </view>
+    <loading v-if="loading"></loading>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/goods.js";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-goods {
+  background: #FAF8F8;
+  left: 0;
+  right: 0;
+  border-radius: 20rpx 20rpx 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+.themes-goods__content {
+	height: 100%;
+}
+.nav-list {
+  height: 80rpx;
+  padding: 28rpx 30rpx 12rpx;
+
+  .selec {
+    transform: scale(1.1);
+  }
+}
+.scroll-list {
+  height: calc(100% - 80rpx);
+  padding: 0 28rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.lise-h {
+  height: 100%;
+  padding-top: 10rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/index.vue b/pagesA/themes/hongFuQiTian/index.vue
new file mode 100644
index 0000000..bc00ca9
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <view class="themes-default">
+    <image
+      class="themes-default__img"
+      :src="shopData.bgimg
+          ? shopData.bgimg
+          : event_rul + '/static/images/df-bg.png'
+      "
+      mode="widthFix"
+    ></image>
+    <!-- 头部 -->
+    <themes-head
+      :navHeight="navHeight"
+      @navselect="navHeadSelect"
+      :navList="navList"
+      :navIndex="navIndex"
+      :shopData="shopData"
+    ></themes-head>
+    <view class="themes-content position-r">
+      <Choiceness v-show="navIndex === 0"></Choiceness>
+      <Goods v-show="navIndex === 1" :hearHeight="hearHeight"></Goods>
+      <Activity v-show="navIndex === 2" :hearHeight="hearHeight"></Activity>
+      <new-product v-show="navIndex === 3" :hearHeight="hearHeight"></new-product>
+    </view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/index.js";
+import themesHead from "./components/themes-head.vue";
+import Choiceness from "./choiceness.vue";
+import Activity from "./activity.vue";
+import newProduct from "./newProduct.vue";
+import Goods from "./goods.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesHead,
+    Choiceness,
+    Activity,
+    newProduct,
+    Goods,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-default {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #FAF8F8;
+  position: relative;
+  z-index: 1;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+  &__img {
+    position: absolute;
+    top: 0;
+    z-index: -1;
+    width: 100%;
+  }
+}
+.themes-content {
+  flex: 1;
+  z-index: 2;
+  padding: 0 28rpx 40rpx;
+  margin-top: 16rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/newProduct.vue b/pagesA/themes/hongFuQiTian/newProduct.vue
new file mode 100644
index 0000000..1859777
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/newProduct.vue
@@ -0,0 +1,55 @@
+<template>
+  <view class="themes-newProduct position-a" :style="{height: 'calc(100vh - ' + hearHeight + ')' }">
+    <scroll-view
+      class="scroll-list"
+      :scroll-y="true"
+      @scrolltolower="getmorecomment"
+      v-if="shopProduct && shopProduct.length > 0"
+    >
+      <themes-shop
+        :mgtop="0"
+        :mgright="30"
+        :mgleft="30"
+        :mgbottom="2"
+        :shopProduct="shopProduct"
+      ></themes-shop>
+      <nomore v-if="nomore"></nomore>
+    </scroll-view>
+    <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+    <loading v-if="loading"></loading>
+  </view>
+</template>
+
+<script>
+import { myMixin } from "../logic/newProduct.js";
+import themesShop from "./components/themes-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.themes-newProduct {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background: #FAF8F8;
+  padding: 4rpx 28rpx 0;
+  border-radius: 20rpx 20rpx 0;
+  flex: 1;
+  left: 0;
+  right: 0;
+}
+.scroll-list {
+  flex: 1;
+  overflow-y: scroll;
+  padding-bottom: 40rpx;
+  & ::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/hongFuQiTian/shop-detail.vue b/pagesA/themes/hongFuQiTian/shop-detail.vue
new file mode 100644
index 0000000..2ffe1b1
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/shop-detail.vue
@@ -0,0 +1,351 @@
+<template>
+  <view class="store-detail">
+    <view v-if="!loading">
+		<view class="flex">
+			<image class="img-logo" :src="info.logo" mode="aspectFill"></image>
+		</view>
+		<view class="detail-contetn">
+			<view class="content-h border-btm flex al-item-center">
+				<view class="h-l">
+					<view class="title">{{ info.name }}</view>
+					<view class="text-n fs12">{{ followCount || 0 }}人关注</view>
+				</view>
+				<view class="su"></view>
+				<view class="h-r flex ">
+					<view class="h-r__info flex flex-colum al-item-center" @click="followFn">
+						<!-- <image class="follow-icon" v-if="!shopInfo.isFollow" :src="event_rul + '/static/theme/follow-icon.svg'" mode="widthFix"></image> -->
+						<text class="iconfont" :class="{'isFollow icon-aixin_shixin': info.isFollow, 'icon-aixin': !info.isFollow}" style="font-size: 44rpx;color: #CE0000;"></text>
+						<text class="follow-tx fs12">{{info.isFollow ? "已关注" : "关注"}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.content">
+				<text class="iconfont icon-icon-themes-coupon"></text>
+				<view class="flex flex-colum ">
+					<view class="title">店铺简介</view>
+					<view class="text fs12">{{ info.content }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.address">
+				<text class="iconfont icon-icon-location"></text>
+				<view class="flex flex-colum ">
+					<view class="title">店铺地址</view>
+					<view class="text fs12">{{ info.address }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.createtime">
+        <text class="iconfont icon-rilitianchong"></text>
+				<view class="flex flex-colum ">
+					<view class="title">开店时间</view>
+					<view class="text fs12">{{ info.createtime }}</view>
+				</view>
+			</view>
+			<view class="content-t border-btm flex al-item-center" v-show="info.start_hours || info.end_hours">
+        <text class="iconfont icon-icon-clock"></text>
+				<view class="flex flex-colum ">
+					<view class="title">营业时间</view>
+					<view class="text fs12">{{ info.start_hours || "" }}-{{ info.end_hours || "" }}</view>
+				</view>
+			</view>
+			<view class="content-t  flex al-item-center" v-show="info.tel">
+        <text class="iconfont icon-icon-phone"></text>
+				<view class="flex flex-colum ">
+					<view class="title">联系电话</view>
+					<view class="text fs12">{{ info.tel }}</view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" @tap="goback">去看看全部商品</button>
+    </view>
+    <loading v-else></loading>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+  </view>
+</template>
+
+<script>
+var app = getApp();
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      info: {},
+      loading: false,
+	  event_rul: app.globalData.event_url,
+	  followCount: 0,
+    shopData: uni.getStorageSync('header_data') || {}, 
+    };
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  created() {
+    this.loading = true;
+  },
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    goback() {
+      uni.navigateBack(1);
+    },
+    followFn() {
+      var that = this;
+
+      // 暂时写死follow_id：27，正确为 follow_id: that.opt.bid
+      app.post(
+        "ApiMy/addFollow",
+        { follow_id: that.opt.bid || "", type: "store" },
+        function (res) {
+          if (res) {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+          that.getInfo()
+          setTimeout(() => {
+            that.$set(that.shopData,'attention',that.info.fans_count);
+            that.$set(that.shopData,'isFollow',that.info.isFollow);
+            uni.setStorage({
+              key: "header_data",
+              data: that.shopData,
+            });
+          }, 200);
+        }
+      );
+    },
+	// 获取详情信息
+    getInfo() {
+      var that = this;
+      // 暂时写死id: 27,正确为 id: that.opt.bid
+      app.get(
+        "ApiBusiness/newIndex",
+        { id: that.opt.bid || "" },
+        function (res) {
+          that.info = res.business;
+		  that.followCount = res.followCount
+          that.loading = false;
+        }
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.store-detail {
+  letter-spacing: 2rpx;
+  color: #333;
+  
+  .img-logo {
+	  width: 100%;
+	  height: 400rpx;
+  }
+  .detail-contetn {
+	  padding: 0 40rpx;
+	  background-color: #fff;
+	  .content-h {
+		  padding: 28rpx 0;
+		  
+		  .h-l {
+			  width: 452rpx;
+			  padding-right: 10rpx;
+			 .title {
+				 font-weight: 500;
+			 	 font-size: 34rpx;
+			 }
+			 .text-n {
+			 	padding-top: 14rpx;
+				color: #666;
+				font-weight: 400;
+			 } 
+		  }
+		  .su {
+			  width: 2rpx;
+			  height: 56rpx;
+			  background-color: #FF5E5E;
+		  }
+		  .h-r {
+			  width: 180rpx;
+			  justify-content: flex-end;
+        &__info {
+          width: 80rpx;
+        }
+        .icon-aixin {
+          color: #666666;
+          &.isFollow {
+            color: #EB2407;
+          }
+        }
+			  
+			  .follow-icon {
+			    width: 44rpx;
+			  }
+			  .follow-tx {
+				  color: #666;
+			  }
+		  }
+	  }
+	  
+	  .content-t {
+		  padding: 20rpx 0;
+		  .iconfont {
+        color: #FF5E5E;
+        font-size: 44rpx;
+        flex-shrink: 0;
+        margin-right: 26rpx;
+      }
+		  
+		  .title {
+			font-weight: 500;
+		  }
+		  .text {
+			  font-weight: 500;
+			  padding-top: 8rpx;
+			  color: #666;
+		  }
+	  }
+  }
+  .btn {
+    font-size: 36rpx;
+    // font-weight: bold;
+    width: 630rpx;
+    margin: 90rpx auto;
+    border-radius: 400rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-image: linear-gradient(to right, #FA5F47, #FC4741);
+    color: #fff;
+  }
+  .border-btm {
+	  border-bottom: 2rpx solid #ECECEC;
+  }
+  
+  .attention {
+    padding: 30rpx 20rpx;
+
+    .attention-box {
+      padding: 30rpx 20rpx;
+      background: #fff;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      border-radius: 10rpx;
+
+      .attention-l {
+        display: flex;
+        align-items: center;
+
+        .attention-l-img {
+          width: 120rpx;
+          height: 120rpx;
+          border-radius: 16rpx;
+          flex-shrink: 0;
+        }
+        .attention-l-text {
+          height: 100%;
+          padding-left: 20rpx;
+          display: flex;
+          flex-direction: column;
+          .attention-l-title {
+            font-size: 30rpx;
+            font-weight: bold;
+          }
+          .attention-l-text-s {
+            padding-top: 10rpx;
+            display: flex;
+            align-items: center;
+            font-size: 24rpx;
+            color: #bdbdbd;
+
+            .icon_arrow_right {
+              padding-left: 20rpx;
+            }
+          }
+        }
+      }
+      .attention-r {
+        width: 120rpx;
+        height: 54rpx;
+        line-height: 54rpx;
+        text-align: center;
+        flex-shrink: 0;
+        border-radius: 8rpx;
+        &.isFollow {
+          background-color: #efbd6f;
+          color: #FFF;
+        }
+        &.followed {
+          color: #efbd6f;
+          position: relative;
+          &::before {
+            content: "";
+              position: absolute;
+              left: 0;
+              width: 200%;
+              height: 200%;
+              border: 2rpx solid #efbd6f;
+              box-sizing: border-box;
+              transform: scale(0.5,0.5);
+              border-radius: 16rpx;
+              transform-origin: 0 0;
+          }
+        }
+      }
+    }
+  }
+
+  .store-detail-conten {
+    padding: 0 20rpx;
+    .detail-conten-b {
+      display: flex;
+      flex-direction: column;
+      border-radius: 10rpx;
+      background-color: #fff;
+
+      .detail-conten-c {
+        min-height: 400rpx;
+        padding: 0 20rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-evenly;
+      }
+      .detail-conten-t {
+        display: flex;
+        // align-items: center;
+        .detail-conten-t-tilt {
+          width: 150rpx;
+          font-weight: bold;
+          font-size: 30rpx;
+        }
+
+        .detail-conten-t-text {
+          flex: 1;
+          // color: #bdbdbd;
+          padding-top: 4rpx;
+          // font-weight: bold;
+          color: #111111;
+        }
+      }
+
+      .btn {
+        font-size: 30rpx;
+        font-weight: bold;
+        width: 650rpx;
+        margin: 30rpx auto;
+        border-radius: 400rpx;
+        height: 70rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-image: linear-gradient(to right, #fbd89e, #eec071);
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/pagesA/themes/hongFuQiTian/themes-search.vue b/pagesA/themes/hongFuQiTian/themes-search.vue
new file mode 100644
index 0000000..40e71ba
--- /dev/null
+++ b/pagesA/themes/hongFuQiTian/themes-search.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="themes-search">
+		<view class="search-head">
+			<view class="head-b flex al-item-center border-rius-r">
+				<text class="iconfont icon-search"></text>
+				<input v-model="keyword" placeholder="商品搜索" placeholder-style="font-size:28rpx;" @confirm="searchConfirm" />
+        <text class="iconfont icon-shanchu" @click="delKeywordtex"></text>
+			</view>
+		</view>
+		<view class="search-content">
+			<view class="nav-list flex j-between al-item-center">
+				<view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="!field || field == 'sort' ? 'color: #D11800' : ''"
+            data-field="sort"
+            data-order="desc"
+            >推荐</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'sales' ? 'color: #D11800' : ''"
+            data-field="sales"
+            data-order="desc"
+            >销量</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            :style="field == 'createtime' ? 'color: #D11800' : ''"
+            data-field="createtime"
+            data-order="desc"
+            >新品</view
+          >
+          <view
+            @tap.stop="sortClick"
+            class="search-navbar-item"
+            data-field="sell_price"
+            :data-order="order == 'asc' ? 'desc' : 'asc'"
+          >
+            <text :style="field == 'sell_price' ? 'color: #D11800' : ''"
+              >价格</text
+            >
+            <text
+              style="font-size: 26rpx"
+              class="iconfont icon-danbianjiantou1"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'asc' ? '#D11800' : '',
+              }"
+            ></text>
+            <text
+              style="font-size: 26rpx; margin-left: -10rpx"
+              class="iconfont icon-danbianjiantou"
+              :style="{
+                color:
+                  field == 'sell_price' && order == 'desc' ? '#D11800' : '',
+              }"
+            ></text>
+          </view>
+			</view>
+		</view>
+		<scroll-view class="scroll-list lise-h" :scroll-y="true" @scrolltolower="getmorecomment" >
+			<themes-shop :shopProduct="shopProduct" :mgtop="0" :mgright="30" :mgleft="30" :mgbottom="2"></themes-shop>
+		<loading v-if="loading"></loading>
+        <nomore v-if="nomore"></nomore>
+        <nodata text="没有查找到相关商品" v-if="nodata"></nodata>
+		</scroll-view>
+    <!-- 悬浮按钮 -->
+    <drag-button></drag-button>
+	</view>
+</template>
+
+<script>
+import { myMixin } from '../logic/search.js';
+import themesShop from "../hongFuQiTian/components/classify-shop.vue";
+
+export default {
+  mixins: [myMixin],
+  components: {
+    themesShop,
+  },
+};
+</script>
+
+<style lang="scss">
+.themes-search {
+  height: 100vh;
+  overflow-y: hidden;
+  display: flex;
+  flex-direction: column;
+  background: #F4F4F4;
+  ::v-deep .classify-shops {
+    .shops-item {
+      padding: 24rpx 40rpx 12rpx 20rpx;
+      box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,0,0,0.0300);
+      border-radius: 10rpx;
+      border-bottom: 0;
+      margin-bottom: 20rpx;
+    }
+  }
+  .search-head {
+    width: 100%;
+    height: 74rpx;
+    padding: 10rpx 28rpx 0;
+    flex-shrink: 0;
+    background: #FFF;
+    .head-b {
+      width: 100%;
+      height: 100%;
+      padding: 0 12rpx;
+      background-color: #F7F7F7;
+
+      .icon-search {
+        color: #ABABAB;
+        font-size: 50rpx;
+        flex-shrink: 0;
+      }
+      input {
+        flex: 1;
+        font-size: 28rpx;
+        line-height: 40rpx;
+        margin-left: 14rpx;
+        color: #333333;
+      }
+      .icon-shanchu {
+        font-size: 40rpx;
+        color: #cccccc;
+      }
+    }
+  }
+
+  .search-content {
+    flex-shrink: 0;
+    background: #FFFFFF;
+    .nav-list {
+      height: 100rpx;
+      padding: 34rpx 32rpx 34rpx 40rpx;
+
+      .selec {
+        // font-size: 32rpx;
+        transform: scale(1.2);
+      }
+    }
+  }
+
+  .scroll-list {
+    flex: 1;
+    overflow-y: scroll;
+    padding: 20rpx 28rpx;
+    & ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/themes/logic/activity.js b/pagesA/themes/logic/activity.js
new file mode 100644
index 0000000..53be540
--- /dev/null
+++ b/pagesA/themes/logic/activity.js
@@ -0,0 +1,264 @@
+
+import { mapState } from "vuex";
+
+var app = getApp();
+export const myMixin = {
+  data() {
+    return {
+      loading: false,
+
+      // 3. 活动 内容
+      menuindex: -1,
+      event_rul: app.globalData.event_url,
+      shopTuangou: [], // 团购活动
+      pagenum: 1,
+      nomore: false,
+      nodata: false,
+      field: "sort",
+      order: "desc",
+      cpid: "",
+      isActivity: true, // 是否有活动
+	  saixuan: false, // 是否选中筛选
+
+      visibleSync: false,
+      showDrawer: false,
+      rightMode: false,
+      watchTimer: null,
+      drawerWidth: 70,
+      mask: true,
+      maskClick: true,
+      mode: "right",
+
+      selectAll: true,
+      boltingList: [],
+      boltingListIndex: 0,
+	  timestamp: 0, // 当前时间戳
+
+    }
+  },
+  props: {
+    hearHeight: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  mounted() {
+    this.getData();
+  },
+
+  methods: {
+	gettimestamp() {
+		this.timestamp = Date.parse(new Date()) / 1000
+	},
+    getData: function () {
+      this.loading = true;
+      this.getprolist();
+    },
+    // 获取活动商品列表
+    getprolist(loadmore) {
+	  this.gettimestamp()
+      const that = this;
+      that.loading = true;
+      that.nodata = false;
+      that.nomore = false;
+      if (!loadmore) {
+        that.pagenum = 1;
+        that.shopTuangou = [];
+      }
+      console.log("打印最开始的cpid", that.cpid);
+      app.post(
+        "/ApiTuangou/getprolist",
+        {
+          bid: that.opt.bid,
+          cpid: that.cpid,
+          field: that.field,
+          order: that.order,
+          pagenum: that.pagenum,
+        },
+        function (res) {
+          console.log("ApiShop/getprolist=接口返回数据===", res);
+          that.loading = false;
+          if (that.pagenum == 1) {
+            // console.log("that.pagenum-------", that.pagenum);
+            that.isActivity = true;
+            res.data.map((item) => {
+              if (item.id) {
+                item.proid = item.id;
+              }
+              that.shopTuangou.push(item);
+            });
+            // 如果没有团购活动就返回店铺商品
+            if (res.data.length == 0) {
+              that.isActivity = false;
+              that.getAllProList(true);
+            }
+          } else {
+            if (res.data.length == 0) {
+              that.nomore = true;
+            } else {
+              // console.log("that.pagenum++++++----", that.pagenum);
+              res.data.map((item) => {
+                if (item.id) {
+                  item.proid = item.id;
+                }
+                that.shopTuangou = that.shopTuangou.concat(item);
+              });
+            }
+          }
+        }
+      );
+    },
+    // 获取全部商品
+    getAllProList(loadmore) {
+	  this.gettimestamp()
+      const that = this;
+      that.loading = true;
+      that.nodata = false;
+      that.nomore = false;
+      if (!loadmore) {
+        that.pagenum = 1;
+        that.shopTuangou = [];
+      }
+      console.log("this.cpid-------------", that.cpid);
+      app.post(
+        "/ApiShop/getprolist",
+        {
+          bid: that.opt.bid,
+          field: that.field,
+          order: that.order,
+          pagenum: that.pagenum,
+        },
+        function (res) {
+          that.loading = false;
+          if (that.pagenum == 1) {
+            res.data.map((item) => {
+              if (item.id) {
+                item.proid = item.id;
+              }
+              that.shopTuangou.push(item);
+            });
+            if (res.data.length == 0) {
+              that.nodata = true;
+            }
+          } else {
+            if (res.data.length == 0) {
+              that.nomore = true;
+            } else {
+              res.data.map((item) => {
+                if (item.id) {
+                  item.proid = item.id;
+                }
+                that.shopTuangou = that.shopTuangou.concat(item);
+              });
+            }
+          }
+        }
+      );
+    },
+    // 获取活动分类
+    getclassify() {
+      const that = this;
+      app.get("/ApiTuangou/prolist", { bid: that.opt.bid }, function (res) {
+        console.log("团购活动筛选", res);
+        const NewboltingList = [];
+        res.clist.map((item) => {
+          NewboltingList.push({
+            id: item.id,
+            name: item.name,
+          });
+        });
+        that.boltingList = NewboltingList;
+      });
+    },
+    // 滚动
+    getmorecomment() {
+      this.pagenum = this.pagenum + 1;
+      if (!this.nomore && !this.nodata) {
+        if(this.isActivity) {
+        	this.getprolist(true);
+        }else {
+        	this.getAllProList(true)
+        }
+      }
+    },
+    // 切换 -活动
+    sortClick(e) {
+	  this.saixuan = false
+      this.field = e.currentTarget.dataset.field;
+      this.order = e.currentTarget.dataset.order;
+      // 每次跳转之前先把商品列表清空
+      this.shopTuangou = [];
+	  if(this.isActivity) {
+		  this.getprolist();
+	  }else {
+		  this.getAllProList()
+	  }
+    },
+
+    // 筛选
+    close(type) {
+      // fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
+      if ((type === "mask" && !this.maskClick) || !this.visibleSync) return;
+      this._change("showDrawer", "visibleSync", false);
+      this.boltingList = [];
+    },
+    open() {
+	  this.saixuan = true
+      const that = this;
+      // fixed by mehaotian 处理重复点击打开的事件
+      if (that.visibleSync) return;
+      that._change("visibleSync", "showDrawer", true);
+      that.getclassify();
+    },
+    _change(param1, param2, status) {
+      this[param1] = status;
+      if (this.watchTimer) {
+        clearTimeout(this.watchTimer);
+      }
+      this.watchTimer = setTimeout(
+        () => {
+          this[param2] = status;
+          this.$emit("change", status);
+        },
+        status ? 50 : 300
+      );
+    },
+    filterConfirm(cpid) {
+      this._change("showDrawer", "visibleSync", false);
+      this.cpid = cpid;
+      console.log("点击确定打印cpid", this.cpid);
+      this.shopTuangou = [];
+      this.getprolist();
+      this.boltingList = [];
+    },
+    bolting(n) {
+      const that = this;
+      that.boltingListIndex = n;
+      console.log("点击tab打印boltingList", that.boltingList);
+      that.boltingList.map((item, index) => {
+        if (that.boltingListIndex === index + 1) {
+          that.cpid = item.id;
+          console.log("点击tab打印cpid", that.cpid);
+        } else {
+          that.cpid = "";
+          console.log("点击tab打印cpid", that.cpid);
+        }
+      });
+    },
+    boltingAll() {
+      this.boltingListIndex = 0;
+      this.cpid = "";
+      console.log("点击all打印cpid", this.cpid);
+    },
+  },
+  beforeDestroy() {
+    clearTimeout(this.watchTimer);
+  },
+}
+
+
+
+
diff --git a/pagesA/themes/logic/choiceness.js b/pagesA/themes/logic/choiceness.js
new file mode 100644
index 0000000..41508f6
--- /dev/null
+++ b/pagesA/themes/logic/choiceness.js
@@ -0,0 +1,194 @@
+import { mapState, mapActions } from 'vuex'
+
+var app = getApp();
+export const myMixin = {
+  data() {
+    return {
+      loading: false,
+      
+      // 1精选内容
+      shopData: {},
+      shopNotice: [], // 店铺公告
+      shopMenu: [], // 店铺菜单
+      isShowDots: true,
+      couponids: [],
+      shopCoupon: [], // 店铺优惠
+      shopVideo: [], // 店铺短视频
+      shopNote: [], // 店铺笔记
+      shopBanner: [], // 店铺banner
+      shopTuangou: [], // 团购活动
+      shopProduct: [], // 店铺商品
+      shopSelPro: [], // 精选商品
+    }
+  },
+  computed: {
+    ...mapState(['opt', 'pagecontentList']),
+  },
+  mounted() {
+    this.getData()
+  },
+
+  methods: {
+    ...mapActions(['acPagecontent']),
+
+    getData() {
+      const that = this;
+      that.loading = true;
+      uni.getStorage({
+        key: "header_data",
+        success: function(res){
+            that.shopData = res.data;
+        },
+      })
+      // 获取state的pagecontentList,不为空就直接使用
+      if (that.pagecontentList.length != 0) {
+        that.getPagecontent(that.pagecontentList);
+      } else {
+        // 否则重新发送请求获取数据
+        that.getShopBuiness();
+      }
+    },
+    getShopBuiness() {
+      const that = this;
+      app.post('ApiBusiness/ThemeIndex', { bid: that.opt.bid }, function (res) {
+        if (res.pagecontent) {
+          console.log('ApiBusiness/ThemeIndex=接口返回数据===', res)
+          const { pagecontent } = res;
+  
+          that.acPagecontent(pagecontent);
+          // 内容处理
+          that.getPagecontent(pagecontent);
+        }
+      })
+    },
+    getPagecontent(pagecontent) {
+      const that = this;
+      console.log("打印pagecontent===========",pagecontent)
+      pagecontent.map((item) => {
+          // 公告
+          if (item.temp === 'notice') {
+            that.shopNotice = item.data
+          }
+
+          // 轮播图
+          if (item.temp == 'banner') {
+            that.shopBanner = item.data
+          }
+
+          // 店铺菜单
+          let MetuItem = [];
+          if (item.temp == 'menu') {
+            if (item.data.length != 0) {
+              item.data.map((el, index) => {
+                MetuItem.push(el);
+                let idx = index + 1;
+                let num = Math.ceil(item.data.length / 2);
+                // console.log("打印num",num);
+                if(item.data.length >= 10) {
+                  if(idx === num) {
+                    that.shopMenu.push(MetuItem);
+                    MetuItem = [];
+                  } 
+                  if(idx === item.data.length) {
+                    that.shopMenu.push(MetuItem);
+                  }
+                } else {
+                  that.shopMenu[0] = MetuItem;
+                }
+
+                if(item.data.length <= 10) {
+                  that.isShowDots = false;
+                }
+              })
+            }
+          }
+          
+          // 优惠立减
+          if (item.temp == 'coupon') {
+            that.shopCoupon = item.data
+            that.shopCoupon.map((items,ind) => {
+              that.$set(items,'idd',ind);
+            })
+            that.getCouponTime();
+          }
+          // 短视频
+          if (item.temp == 'shortvideo') {
+            that.shopVideo = item.data
+          }
+          // 笔记
+          if (item.temp == 'note') {
+            that.shopNote = item.data
+          }
+
+          // 团购活动
+          if (item.temp == 'tuangou') {
+            that.shopTuangou = item.data
+          }
+
+          // 商品列表
+          if (item.temp == 'product') {
+            that.shopProduct = item.data
+          }
+          // 精选商品
+          if (item.temp == 'selected_product') {
+            that.shopSelPro = item.data
+          }
+          that.loading = false;
+        })
+        uni.getStorage({
+          key: "isLogin",
+          success: function(res) {
+            if(res.data) {
+              that.getCoupon();
+            }
+          }
+        })
+    },
+    // 获取我的优惠券
+    getCoupon() {
+      const that = this;
+
+      app.post('ApiCoupon/mycoupon', { bid: that.opt.bid }, function (res) {
+        let Newcouponids = [];
+        res.data.map((item) => {
+          Newcouponids.push({couponid: item.couponid})
+        })
+        that.couponids = Newcouponids;
+        console.log("优惠券id",that.couponids)
+        
+        that.getCouponTime();
+        if(that.couponids.length > 0) {
+          that.couponids.map((item) => {
+            that.shopCoupon.map((item1) => {
+              // 我的优惠券列表的优惠券id与店铺所有优惠券id对比,相等的就显示去使用
+              if(item.couponid === item1.couponid) {
+                // console.log("打印优惠券id",item.couponid,item1.couponid)
+                that.$set(item1,"msg","去使用");
+                that.$set(item1,'isUse',true);
+                that.$set(item,'isOver',false);
+              }
+            })
+          })
+        }
+      })
+
+    },
+    // 优惠券时间(是否已经过期)
+    getCouponTime() {
+      let that = this;
+      for (let i = that.shopCoupon.length - 1; i >= 0; i--) {
+        let now = new Date(); // 当前时间
+        let endTime =  that.shopCoupon[i].endtime;
+        let end = new Date(endTime.replace(/-/g,"/")); // 对比时间
+
+        if(now.getTime() > end.getTime()) {
+          that.shopCoupon.splice(i,1);
+        }else {
+          // 未过期
+          that.$set(that.shopCoupon[i],'isUse',false);
+          that.$set(that.shopCoupon[i],'isOver',false);
+        }
+      }
+    }
+  }
+}
diff --git a/pagesA/themes/logic/classify.js b/pagesA/themes/logic/classify.js
new file mode 100644
index 0000000..1da9d0f
--- /dev/null
+++ b/pagesA/themes/logic/classify.js
@@ -0,0 +1,202 @@
+
+import { mapState } from "vuex";
+
+var app = getApp();
+export const myMixin = {
+  data() {
+    return {
+      flag: false,
+      shopData: uni.getStorageSync('header_data') || {}, // 店铺信息
+      shopProduct: [], // 商品列表
+      shopCategory: [], // 商品类别
+      shopCategorychild: [], // 分类二级列表
+      cid2: "", // 类别id
+      currentIndex: "",
+      curidx: "",
+      nodata: false,
+      loading: false,
+      nomore: false,
+      loadmore: true,
+      pagenum: 1,
+      navHeight: 0,
+      hearHeight: 0,
+      isSelectAll: true,
+      event_rul: app.globalData.event_url,
+    };
+  },
+  computed: {
+    ...mapState([
+        'opt'
+    ])
+  },
+  mounted() {
+    let elemetn;
+    // #ifdef MP-WEIXIN
+    let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+    uni.getSystemInfo({
+      success: (res) => {
+        if (res) {
+          elemetn = res.statusBarHeight;
+        }
+      },
+    });
+    // #endif
+    // #ifdef MP-WEIXIN
+    this.navHeight = menuButtonInfo.bottom + menuButtonInfo.top - elemetn;
+    // console.log(menuButtonInfo,elemetn, 'navheight')
+    // #endif
+    // #ifndef MP
+    this.navHeight = 60;
+    // #endif
+    
+    this.getData();
+    this.flag = true;
+  },
+  methods: {
+    getData: function () {
+      const that = this;
+      // const cid = that.opt.cid;
+      that.loading = true;
+      that.getCategory();
+      that.getprolist();
+    },
+    // 获取类别列表
+    getCategory() {
+      const that = this;
+      that.loading = true;
+      that.shopCategorychild = [];
+      that.shopCategory = [];
+      console.log(that.opt, "打印opt");
+      app.post(
+        "/ApiShop/classify",
+        {
+          bid: that.opt.bid,
+        },
+        function (res) {
+          if (res.data.length > 0) {
+            const shopCategoryArr = [];
+            res.data.map((item, index) => {
+              shopCategoryArr.push({
+                aid: item.aid,
+                createtime: item.createtime,
+                id: item.id,
+                name: item.name,
+                pic: item.pic,
+                pid: item.pid,
+              });
+              that.shopCategory.push(item);
+              if (item.id == that.opt.cid) {
+                that.currentIndex = index;
+                if (item.child != []) {
+                  item.child.map((item) => {
+                    that.shopCategorychild.push(item);
+                  });
+                }
+                console.log(that.shopCategorychild, "打印二级类别");
+              }
+            });
+          }
+        }
+      );
+    },
+    // 获取商品列表
+    getprolist(loadmore) {
+      const that = this;
+      that.loading = true;
+      that.nodata = false;
+      that.nomore = false;
+      that.cid2 = that.opt.cid;
+      console.log("打印cid2:", that.cid2, "打印bid:", that.opt.bid);
+      if (!loadmore) {
+        that.pagenum = 1;
+        that.shopProduct = [];
+      }
+      app.post(
+        "/ApiShop/getprolist",
+        {
+          bid: that.opt.bid,
+          cid2: that.cid2,
+          field: "sort",
+          order: "desc",
+          pagenum: that.pagenum,
+        },
+        function (res) {
+          that.loading = false;
+          if (that.pagenum == 1) {
+            res.data.map((item) => {
+              if (item.id) {
+                item.proid = item.id;
+              }
+              that.shopProduct.push(item);
+            });
+            if (res.data.length == 0) {
+              that.nodata = true;
+            }
+          } else {
+            if (res.data.length == 0) {
+              that.nomore = true;
+            } else {
+              that.loadmore = false;
+              res.data.map((item) => {
+                if (item.id) {
+                  item.proid = item.id;
+                }
+                that.shopProduct = that.shopProduct.concat(item);
+              });
+            }
+          }
+        }
+      );
+    },
+    // 类别跳转
+    categoryHandle(cid, index) {
+      this.isSelectAll = true;
+      this.currentIndex = index;
+      this.opt.cid = cid;
+      this.getCategory();
+      this.getprolist();
+    },
+    // 二级类别跳转
+    categoryChildHandle(cid, idx) {
+      this.curidx = idx;
+      this.isSelectAll = false;
+      console.log(cid, "打印cid");
+      this.opt.cid = cid;
+      // this.getCategory();
+      this.getprolist();
+    },
+    // 滚动
+    getmorecomment() {
+      this.pagenum = this.pagenum + 1;
+      if (!this.nomore && !this.nodata) {
+        this.getprolist(true);
+      }
+    },
+    // 获取全部商品
+    selectAll() {
+      this.currentIndex = "";
+      this.isSelectAll = true;
+      this.opt.cid = "";
+      this.getCategory();
+      this.getprolist();
+    },
+    // 获取类别全部商品
+    selectCategoryAll() {
+      this.isSelectAll = true;
+      this.curidx = "";
+      console.log(
+        "this.currentIndex:",
+        this.currentIndex,
+        "打印this.shopCategory:",
+        this.shopCategory
+      );
+      this.shopCategory.map((item, index) => {
+        if (this.currentIndex === index) {
+          this.opt.cid = item.id;
+        }
+      });
+      this.getCategory();
+      this.getprolist();
+    },
+  },
+};
\ No newline at end of file
diff --git a/pagesA/themes/logic/goods.js b/pagesA/themes/logic/goods.js
new file mode 100644
index 0000000..9e3a8db
--- /dev/null
+++ b/pagesA/themes/logic/goods.js
@@ -0,0 +1,108 @@
+
+import { mapState } from "vuex";
+
+var app = getApp();
+
+export const myMixin = {
+  data() {
+    return {
+      loading: false,
+      // 2. 商品 内容
+      shopSelPro: [], // 精选商品
+      nodata: false,
+      nomore: false,
+      pagenum: 1,
+      field: "sort",
+      order: "desc",
+      cpid: 0,
+    }
+  },
+  props: {
+    hearHeight: {
+      type: String,
+      default: "0px",
+    },
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  mounted() {
+    this.getData();
+  },
+
+  methods: {
+    getData: function () {
+      const that = this;
+      that.getprolist();
+    },
+    // 获取商品列表
+    getprolist(loadmore) {
+      const that = this;
+      that.loading = true;
+      that.nodata = false;
+      that.nomore = false;
+      if (!loadmore) {
+        that.pagenum = 1;
+        that.shopSelPro = [];
+      }
+      app.post(
+        "/ApiShop/getprolist",
+        {
+          bid: that.opt.bid,
+          field: that.field,
+          order: that.order,
+          pagenum: that.pagenum,
+        },
+        function (res) {
+          console.log("ApiShop/getprolist=接口返回数据===", res);
+          that.loading = false;
+          if (that.pagenum == 1) {
+            res.data.map((item) => {
+              if (item.id) {
+                item.proid = item.id;
+              }
+              that.shopSelPro.push(item);
+            });
+            if (res.data.length == 0) {
+              that.nodata = true;
+            }
+          } else {
+            if (res.data.length == 0) {
+              that.nomore = true;
+            } else {
+              console.log("that.pagenum++++++----", that.pagenum);
+              res.data.map((item) => {
+                if (item.id) {
+                  item.proid = item.id;
+                }
+                that.shopSelPro = that.shopSelPro.concat(item);
+              });
+            }
+          }
+        }
+      );
+    },
+    // 滚动
+    getmorecomment() {
+      this.pagenum = this.pagenum + 1;
+      if (!this.nomore && !this.nodata) {
+        this.getprolist(true);
+      }
+    },
+    // 切换 -商品
+    sortClick(e) {
+      this.field = e.currentTarget.dataset.field;
+      this.order = e.currentTarget.dataset.order;
+      // 每次切换之前先把商品列表清空
+      this.shopSelPro = [];
+      this.getprolist();
+    },
+  },
+  beforeDestroy() {
+    clearTimeout(this.watchTimer);
+  },
+}
+
+
+
+
diff --git a/pagesA/themes/logic/index.js b/pagesA/themes/logic/index.js
new file mode 100644
index 0000000..cb573f6
--- /dev/null
+++ b/pagesA/themes/logic/index.js
@@ -0,0 +1,106 @@
+import { mapState, mapGetters } from 'vuex'
+
+var app = getApp();
+export const myMixin = {
+  data() {
+    return {
+      loading: false,
+      
+      // 头部数据
+      top: 0,
+      navHeight: 0,
+      navIndex: 0,
+      hearHeight: "0",
+      tabArr: [0],
+      navList: [],
+      shopData: {},
+      event_rul: app.globalData.event_url,
+	  
+	  bgColor: false,
+	  boxHeight: 0, // 要减去的高度
+	  mgtHeight: 0, // 代替 margin 的高度
+	  timeupe: null,
+    }
+  },
+  computed: {
+    ...mapState(['opt','navFixed','navHeightTop']),
+	...mapGetters(['getHeardHeight'])
+  },
+  mounted() {
+    this.setNavHeight()
+    this.getData()
+	this.timeupe = setTimeout(() => {
+		this.styleMgtop()
+	}, 100)
+  },
+  beforeDestroy() {
+	  clearTimeout(this.timeupe)
+  },
+  watch:{
+		navFixed: {
+			handler(newValue, oldValue) {
+				this.bgColor = newValue
+			},
+			immediate: true,
+			deep: true,
+		},
+	},
+
+  methods: {
+    getData: function () {
+      const that = this;
+      that.loading = true;
+      uni.getStorage({
+        key: "header_data",
+        success: function(res){
+            that.shopData = res.data;
+            console.log("打印shopData============",that.shopData)
+            if(that.shopData.headTitle) {
+              that.shopData.headTitle.map((item)=> {
+                that.navList.push(item.text);
+              })
+            }
+        },
+      })
+    },
+    setNavHeight() {
+      let elemetn
+      // #ifdef MP-WEIXIN
+      let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+      uni.getSystemInfo({
+        success: (res) => {
+          if (res) {
+            elemetn = res.statusBarHeight
+          }
+        },
+      })
+      // #endif
+      // #ifdef MP-WEIXIN
+      this.navHeight = menuButtonInfo.bottom + menuButtonInfo.top - elemetn
+      // console.log(menuButtonInfo,elemetn, 'navheight')
+      // #endif
+      // #ifndef MP
+      this.navHeight = 60
+      // #endif
+      // const vr = uni.getSystemInfoSync();
+    },
+	styleMgtop() {	
+		let query = uni.createSelectorQuery().in(this);
+		query.select(".top-mg").boundingClientRect();
+		query.exec((res) => {		
+      if(res[0] != null) {
+        this.mgtHeight = res[0].height
+        this.boxHeight = (this.mgtHeight + this.getHeardHeight) + 'px'
+      }
+		});
+	},
+    navHeadSelect(e, h, hh) {
+      this.hearHeight = this.navHeight + h + 15 + 'px'
+			this.top = '-' + (hh - (this.navHeight + h + 15)) + 'px'
+      this.navIndex = e;
+      if(this.tabArr.indexOf(e) < 0){
+        this.tabArr.push(e);
+      }
+    },
+  },
+}
diff --git a/pagesA/themes/logic/newProduct.js b/pagesA/themes/logic/newProduct.js
new file mode 100644
index 0000000..bf42d34
--- /dev/null
+++ b/pagesA/themes/logic/newProduct.js
@@ -0,0 +1,107 @@
+
+import { mapState } from "vuex";
+
+var app = getApp();
+export const myMixin = {
+  data() {
+    return {
+      loading: false,
+
+      // 4. 商品 内容
+      shopProduct: [], // 店铺商品
+      field: "createtime",
+      order: "desc",
+      pagenum: 1,
+      loading: false,
+      nomore: false,
+      nodata: false,
+      searchVlaue: "",
+      navIndex: 3,
+      tops: 0,
+      hearHeights: 0,
+    };
+  },
+  props: {
+    hearHeight: {
+      type: String,
+      default: "0px",
+    },
+  },
+  computed: {
+    ...mapState(['opt'])
+  },
+  mounted() {    
+    this.getData();
+  },
+  methods: {
+    getData: function () {
+      const that = this;
+      that.loading = true;
+      that.getprolist();
+    },
+    getprolist(loadmore) {
+      const that = this;
+      that.loading = true;
+      that.nodata = false;
+      that.nomore = false;
+      if (!loadmore) {
+        that.pagenum = 1;
+        that.shopProduct = [];
+      }
+      app.post(
+        "/ApiShop/getprolist",
+        {
+          bid: that.opt.id,
+          pagenum: that.pagenum,
+          field: that.field,
+          order: that.order,
+        },
+        function (res) {
+          that.loading = false;
+          if (that.pagenum == 1) {
+            // console.log("that.pagenum-------", that.pagenum, res);
+            const newShopProduct = [];
+            res.data.map((item) => {
+              newShopProduct.push({
+                proid: item.id,
+                pic: item.pic,
+                name: item.name,
+                sales: item.sales,
+                sell_price: item.sell_price,
+              });
+            });
+            that.shopProduct = newShopProduct;
+            if (res.data.length == 0) {
+              that.nodata = true;
+            }
+          } else {
+            if (res.data.length == 0) {
+              that.nomore = true;
+            } else {
+              console.log("that.pagenum++++++----", that.pagenum);
+              const newShopProduct = [];
+              res.data.map((item) => {
+                newShopProduct.push({
+                  proid: item.id,
+                  pic: item.pic,
+                  name: item.name,
+                  sales: item.sales,
+                  sell_price: item.sell_price,
+                });
+              });
+              that.shopProduct = that.shopProduct.concat(newShopProduct);
+            }
+          }
+          console.log(that.nomore, "打印nomore");
+        }
+      );
+    },
+    // 滚动
+    getmorecomment() {
+      this.pagenum = this.pagenum + 1;
+      if (!this.nomore && !this.nodata) {
+        this.getprolist(true);
+      }
+    },
+  },
+};
\ No newline at end of file
diff --git a/pagesA/themes/logic/search.js b/pagesA/themes/logic/search.js
new file mode 100644
index 0000000..af0fb0d
--- /dev/null
+++ b/pagesA/themes/logic/search.js
@@ -0,0 +1,109 @@
+
+import { mapState } from "vuex";
+
+var app = getApp();
+export const myMixin = {
+  data() {
+    return {
+      keyword: "",
+      event_rul: app.globalData.event_url,
+      field: "sort",
+      order: "desc",
+      shopProduct: [],
+      loading: false,
+      nomore: false,
+      nodata: false,
+      pagenum: 1,
+    }
+  },
+  computed: {
+    ...mapState([
+        'opt'
+    ])
+  },
+  mounted() {
+    this.keyword = this.opt.keyword;
+    console.log("keyword",this.opt.keyword)
+    this.getprolist(this.keyword);
+  },
+  methods: {
+    //   获取商品列表
+    getprolist(word, loadmore) {
+      const that = this;
+      that.loading = true;
+      that.nodata = false;
+      that.nomore = false;
+      if (!loadmore) {
+        that.pagenum = 1;
+        that.shopProduct = [];
+      }
+      app.post(
+        "ApiShop/getprolist",
+        {
+          pagenum: that.pagenum,
+          field: that.field,
+          keyword: word,
+          order: that.order,
+          bid: that.opt.bid,
+        },
+        function (res) {
+          console.log(res);
+          if (that.pagenum == 1) {
+            res.data.map((item) => {
+              if (item.id) {
+                item.proid = item.id;
+              }
+              that.shopProduct.push(item);
+            });
+            if (res.data.length == 0) {
+              that.nodata = true;
+            }
+          } else {
+            if (res.data.length == 0) {
+              that.nomore = true;
+            } else {
+              console.log("that.pagenum++++++----", that.pagenum);
+              res.data.map((item) => {
+                if (item.id) {
+                  item.proid = item.id;
+                }
+                that.shopProduct = that.shopProduct.concat(item);
+              });
+            }
+          }
+        }
+      );
+      that.loading = false;
+    },
+    // 搜索
+    searchConfirm() {
+      this.getprolist(this.keyword);
+    },
+    // 价格升序降序切换
+    searchSelectNavList(n) {
+      this.searchNavListIndx = n;
+      if (this.searchNavListIndx == 3) {
+        this.order = this.order == "asc" ? "desc" : "asc";
+      }
+    },
+    // 切换 -商品
+    sortClick(e) {
+      this.field = e.currentTarget.dataset.field;
+      this.order = e.currentTarget.dataset.order;
+      // 每次切换之前先把商品列表清空
+      this.shopProduct = [];
+      this.getprolist(this.keyword);
+    },
+    // 滚动
+    getmorecomment() {
+      this.pagenum = this.pagenum + 1;
+      if (!this.nomore && !this.nodata) {
+        this.getprolist(this.keyword, true);
+      }
+    },
+    // 删除标签
+    delKeywordtex() {
+      this.keyword = "";
+    },
+  },
+};
\ No newline at end of file
diff --git a/restaurant/booking/add.vue b/restaurant/booking/add.vue
new file mode 100644
index 0000000..faf6f35
--- /dev/null
+++ b/restaurant/booking/add.vue
@@ -0,0 +1,258 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="subform">
+			<view class="content">
+				<view class="info-item">
+					<view class="t1">就餐日期</view>
+					<view class="t2" @tap="chooseTime"><input type="text" placeholder="请选择时间" name="time" :value="chooseTimeStr" disabled="true"></view>
+					<image class="t3" @tap="chooseTime" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+				<view class="info-item">
+					<view class="t1">人数</view>
+					<view class="t2">
+						<picker @change="numChange" :value="nindex" :range="numArr" name="renshu">
+							<view class="picker">{{numArr[nindex]}}</view>
+						</picker>
+					</view>
+					<image class="t3" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+				<view class="info-item">
+					<view class="t1">餐桌</view>
+					<view class="t2" @tap="selectTable" :data-url="'tableList?bid='+opt.bid"><input type="text" :value="tableName" placeholder="请选择"></view>
+					<image class="t3" @tap="selectTable" :data-url="'tableList?bid='+opt.bid" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			<view class="content">
+				<view class="info-item">
+					<view class="t1">您的姓名</view>
+					<view class="t2"><input type="text" @input="input" data-name="linkman" name="linkman" :value="linkman" placeholder="请输入姓名"></view>
+				</view>
+				<view class="info-item">
+					<view class="t1">手机号</view>
+					<view class="t2"><input type="number" @input="input" data-name="tel" name="tel" :value="tel" placeholder="请输入手机号"></view>
+				</view>
+			</view>
+			
+			<view class="content">
+				<view class=" remark" >
+					<view class="t1">订餐备注</view>
+					<view class="">
+					<textarea @input="input" data-name="message" name="message" :value="message" placeholder="如您有其他需求请填写" placeholder-style="color:#ABABABFF"></textarea>
+					</view>
+				</view>
+			</view>
+			
+			<view style="padding:30rpx 0">
+				<button form-type="submit" class="set-btn" style="background:#FE5B07">立即订座</button>
+			</view>
+		</form>
+		
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hideTimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hideTimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in timeArr" :key="index" @tap="timeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		userinfo:{},
+		pstimeDialogShow: false,
+		timeArr:[],
+		chooseTimeStr:'',
+		chooseTimeIndex:0,
+		nindex:0,
+		numArr:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20],
+		tableName:'',
+		linkman:'',
+		tel:'',
+		message:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		if(uni.getStorageSync('restaurant_booking') == '') {
+			uni.setStorageSync('restaurant_booking', {})
+		}
+		this.opt = app.getopts(opt);
+		this.opt.bid = this.opt.bid ? this.opt.bid : 0;
+		var tempdata = uni.getStorageSync('restaurant_booking');
+		this.chooseTimeStr = tempdata.chooseTimeStr;
+		this.chooseTimeIndex = tempdata.chooseTimeIndex;
+		this.nindex = tempdata.nindex ? tempdata.nindex : 0;
+		this.linkman = tempdata.linkman;
+		this.tel = tempdata.tel;
+		this.message = tempdata.message;
+		
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantBooking/add', {bid:that.opt.bid,tableId:that.opt.tableId}, function (data) {
+				that.loading = false;
+				that.timeArr = data.timeArr;
+				that.tableName = data.table ? data.table.name : '';
+				that.loaded();
+			});
+		},
+		subform: function (e) {
+			var that = this;
+			var info = e.detail.value;
+			info.tableId = that.opt.tableId;
+			info.bid = that.opt.bid;
+			info.renshu = that.numArr[that.nindex]
+			// console.log(info);return;
+			if (info.time == '') {
+				app.error('请选择时间');
+				return false;
+			}
+			if (info.renshu <= 0) {
+				app.error('请选择人数');
+				return false;
+			}
+			if (info.tableId == 0) {
+				app.error('请选择餐桌');
+				return false;
+			}
+			if (info.linkman == '') {
+				app.error('请填写姓名');
+				return false;
+			}
+			if (info.tel == '') {
+				app.error('请填写手机号');
+				return false;
+			}
+			that.loading = true;
+			app.post("ApiRestaurantBooking/add", {bid:that.opt.bid,info: info}, function (res) {
+				that.loading = false;
+				if(res.status == 0) {
+					app.alert(res.msg);
+					return false;
+				}
+				uni.removeStorageSync('restaurant_booking');
+				app.alert(res.msg,function(){
+					if(res.payorderid)
+					app.goto('/pages/pay/pay?id='+res.payorderid);
+					else
+					app.goto('detail?id='+res.id);
+				});
+		  });
+		},
+		selectTable: function (e) {
+			var that = this;
+			console.log(that.chooseTimeStr);
+			if(typeof(that.chooseTimeStr) =='undefined' || that.chooseTimeStr == '') {
+		    app.alert('请选择日期时间');
+		    return;
+			}
+			if(typeof(that.numArr[that.nindex]) =='undefined' || that.numArr[that.nindex] <= 0) {
+			  app.alert('请选择人数');
+			  return;
+			}
+			app.goto(e.currentTarget.dataset.url)
+		},
+		chooseTime: function (e) {
+		  var that = this;
+		  var allbuydata = that.allbuydata;
+		  var bid = e.currentTarget.dataset.bid;
+		  var timeArr = that.timeArr;
+		  var itemlist = [];
+		  for (var i = 0; i < timeArr.length; i++) {
+		    itemlist.push(timeArr[i].title);
+		  }
+		  if (itemlist.length == 0) {
+		    app.alert('当前没有可选时间段');
+		    return;
+		  }
+		  that.nowbid = bid;
+		  that.pstimeDialogShow = true;
+		  that.pstimeIndex = -1;
+		},
+		timeRadioChange: function (e) {
+		  var that = this;
+			var allbuydata = that.allbuydata;
+		  var pstimeIndex = e.currentTarget.dataset.index;
+			console.log(pstimeIndex)
+			var nowbid = that.nowbid;
+			var chooseTime = that.timeArr[pstimeIndex];
+			that.chooseTimeIndex = pstimeIndex;
+			that.chooseTimeStr = that.timeArr[pstimeIndex].value;
+			var tempdata = uni.getStorageSync('restaurant_booking');
+			tempdata.chooseTimeIndex = pstimeIndex;
+			tempdata.chooseTimeStr = that.timeArr[pstimeIndex].value;
+			uni.setStorageSync('restaurant_booking', tempdata);
+		  that.pstimeDialogShow = false;
+		},
+    hideTimeDialog: function () {
+      this.pstimeDialogShow = false;
+    },
+		numChange: function (e) {
+		  this.nindex = e.detail.value;
+			var tempdata = uni.getStorageSync('restaurant_booking');
+			tempdata.nindex = this.nindex;
+			uni.setStorageSync('restaurant_booking', tempdata);
+		},
+		input: function(e){
+			var value = e.target.value;
+			// console.log(value)
+			var name = e.currentTarget.dataset.name;
+			// console.log(e)
+			var tempdata = uni.getStorageSync('restaurant_booking');
+			tempdata[name] = value;
+			uni.setStorageSync('restaurant_booking', tempdata);
+		}
+  }
+};
+</script>
+<style>
+.content{width:94%;margin:20rpx 3%;background:#fff;border-radius:5px;padding:0 20rpx;}
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid;height:120rpx;line-height:96rpx}
+.info-item:last-child{border:none}
+ .t1{ width: 200rpx;color: #333;font-weight:bold;height:96rpx;line-height:96rpx}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+.remark {
+	height: 320rpx;padding:0 3%; 
+}
+.remark .t1 {width: 100%; flex: inherit;}
+.remark textarea { height: 100px;}
+.set-btn{width: 90%;margin:0 5%;height:96rpx;line-height:96rpx;font-size:34rpx;border-radius:10rpx;color:#FFFFFF;}
+picker {height: 96rpx;}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+</style>
\ No newline at end of file
diff --git a/restaurant/booking/detail.vue b/restaurant/booking/detail.vue
new file mode 100644
index 0000000..a095bca
--- /dev/null
+++ b/restaurant/booking/detail.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+			<view class="head-bg">
+				<view class="title" v-if="detail.check_status == 0 && detail.status == 0">预定成功，请支付</view>
+				<view class="title" v-if="detail.check_status == 0 && detail.status > 0">预定成功，等待审核</view>
+				<view class="title" v-if="detail.check_status == 1 && detail.status > 0">预定成功</view>
+				<view class="title" v-if="detail.check_status == 1 && detail.status == 0">预定成功，请支付</view>
+				<view class="title" v-if="detail.check_status == -1 && detail.status > 0">预定失败，商家驳回</view>
+				<view class="text-center mt20" v-if="detail.check_status != -1">请在预定时间20分钟内到店。</view>
+				<view class="text-center mt20" v-if="detail.check_status == -1 && detail.status == 0">请重新预定。</view>
+			</view>
+			<view class="card-view">
+				<view class="card-wrap">
+					<view class="card-title">{{business.name}}</view>
+					<view class="mt20">{{business.address}}</view>
+				</view>
+				<view class="card-wrap">
+					<view class="card-title">预定信息</view>
+					<view class="info-item mt">
+						<view class="t1">预定人</view>
+						<view class="t2">{{detail.linkman}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">手机号</view>
+						<view class="t2">{{detail.tel}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">预定时间</view>
+						<view class="t2">{{detail.booking_time}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">用餐人数</view>
+						<view class="t2">{{detail.seat}}</view>
+					</view>
+					<view class="info-item">
+						<view class="t1">预定桌台</view>
+						<view class="t2">{{detail.tableName}}</view>
+					</view>
+					<view class="info-item info-textarea">
+						<view class="t1">备注信息</view>
+						<view class="t2">{{detail.message}}</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="btn-view button-sp-area">
+				<button type="default" class="btn-default" @tap="cancel">取消</button>
+				<button type="primary" v-if="detail.status == 0" @click="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去支付</button>
+			</view>
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				
+				detail:{},
+				business:{}
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				app.get('ApiRestaurantBooking/detail', {id:that.opt.id}, function (res) {
+					that.loading = false;
+					if(res.status == 0){
+						app.alert(res.msg,function(){
+							app.goback();
+						});return;
+					}
+					that.detail = res.data;
+					that.business = res.business;
+					
+					that.loaded();
+					//
+				});
+			},
+			cancel:function () {
+				var that = this;
+				that.loading = true;
+				app.get('ApiRestaurantBooking/del', {id:that.opt.id}, function (res) {
+					that.loading = false;
+					if(res.status == 0){
+						app.alert(res.msg,function(){
+							app.goback();
+						});return;
+					}
+					if(res.status == 1){
+						app.alert(res.msg,function(){
+							app.goback();
+						});return;
+					}
+					//
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	.text-center { text-align: center;}
+	.head-bg {width: 100%;height: 400rpx; background: linear-gradient(120deg, #FF7D15 0%, #FC5729 100%); color: #fff;padding-top:100rpx;}
+	.head-bg .title { text-align: center; }
+	
+	.card-wrap { background-color: #FFFFFF; border-radius: 10rpx;padding: 30rpx; margin: 30rpx auto 0; width: 94%;}
+	.card-wrap:first-child{ margin-top: -100rpx; }
+	.card-wrap .card-title {font-size: 34rpx; color: #333; font-weight: bold;}
+	
+.info-item{ display:flex;align-items:center;width: 100%; background: #fff;padding:0 3%;  border-bottom: 1px #f3f3f3 solid;height:96rpx;line-height:96rpx}
+.info-item:last-child{border:none}
+.info-item .t1{ width: 200rpx;color: #8B8B8B;font-weight:bold;height:96rpx;line-height:96rpx}
+.info-item .t2{ color:#444444;text-align:right;flex:1;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.info-item .t3{ width: 26rpx;height:26rpx;margin-left:20rpx}
+.info-textarea { height: auto; line-height: 40rpx;}
+.info-textarea .t2{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp: unset;overflow: scroll;}
+
+.btn-view { display: flex;justify-content: space-between; margin: 30rpx 0;}
+.btn-view button{ width: 45%; border-radius: 10rpx;}
+.btn-default {background-color: #FFFFFF;}
+</style>
diff --git a/restaurant/booking/orderlist.vue b/restaurant/booking/orderlist.vue
new file mode 100644
index 0000000..bdb26c6
--- /dev/null
+++ b/restaurant/booking/orderlist.vue
@@ -0,0 +1,140 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','待审核','已完成','退款']" :itemst="['all','0','1','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block>
+				<view class="order-box" v-for="(item2, idx) in datalist" :key="idx">
+					<block>
+						<view class="content" @tap="goto" :data-url="'detail?id=' + item2.id">
+							<view class="pic">
+								<image :src="item2.binfo.logo" class="img"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.binfo.name}}</text>
+								<text class="t2">预约桌台：{{item2.tableName}}</text>
+								<text class="t2">预约时间：{{item2.booking_time}}</text>
+							</view>
+						</view>
+					</block>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+			st: 'all',
+      datalist: [],
+      pagenum: 1,
+      nomore: false,
+			nodata:false,
+			takeoutshow:false,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onShow:function (opt) {
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiRestaurantBooking/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		changetab: function (st) {
+		  this.st = st;
+		  uni.pageScrollTo({
+		    scrollTop: 0,
+		    duration: 0
+		  });
+		  this.getdata(false);
+		},
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx; }
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:0 3%;margin-top:20rpx;padding:6rpx 0; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width: 94%;margin:0 3%;border-bottom: 1px #f4f4f4 solid; height:90rpx; line-height: 90rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{flex:1;display:flex;align-items:center;color:#222;font-weight:bold}
+.order-box .head .f1 image{width:56rpx;height:56rpx;margin-right:20rpx;border-radius:50%}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px 16rpx 20rpx;border-bottom: 0 #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content .pic{ width: 120rpx; height: 120rpx;}
+.order-box .content .pic .img{ width: 120rpx; height: 120rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:20rpx;flex:1;margin-top:6rpx}
+.order-box .content .detail .t1{font-size:28rpx;font-weight:bold;height:40rpx;line-height:40rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .detail .t2{height: 36rpx;line-height: 36rpx;color: #999;overflow: hidden;font-size: 22rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+
+.order-box .bottom{ width:100%; padding:20rpx; border-top: 0 #f4f4f4 solid; color: #555;}
+.op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding:20rpx; border-top: 0 #f4f4f4 solid; color: #555; position: fixed; bottom: 0; left: 0; background-color: #fff;}
+
+.btn1{margin-left:20rpx;width:200rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:44rpx;text-align:center;font-weight:bold}
+.btn2{margin-left:20rpx;width:200rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;font-weight:bold;border-radius:44rpx;text-align:center}
+</style>
\ No newline at end of file
diff --git a/restaurant/booking/tableList.vue b/restaurant/booking/tableList.vue
new file mode 100644
index 0000000..7c84229
--- /dev/null
+++ b/restaurant/booking/tableList.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="container">
+		<block v-if="isload">
+		<view class="tab-box shopping">
+			<view class="page-tab">
+				<view class="page-tab2">
+					<view :class="'item ' + (curTopIndex == -1 ? 'on' : '')" @tap="switchTopTab" :data-index="-1" :data-id="0">全部</view>
+					<block v-for="(item, index) in clist" :key="index">
+						<view :class="'item ' + (curTopIndex == index ? 'on' : '')" @tap="switchTopTab" :data-index="index" :data-id="item.id">{{item.name}}</view>
+					</block>
+				</view>
+			</view>
+			<view class="shop-box">
+				<view class="shop-item" v-for="item in contentList">
+					<image class="shop-img" :src="item.pic ? item.pic : logo" mode="aspectFill"> </image>
+					<view class="f2 flex-col flex1">
+						<view class="shop-name multi-ellipsis-2">
+							{{item.name}}
+						</view>
+						<view class="desc">人数：{{item.seat}}</view>
+						<view class="desc">预定费：{{item.booking_fee}} 最低消费：{{item.limit_fee}}</view>
+					</view>
+					<view class="f3 button" @click="goto" :data-url="'add?bid='+opt.bid+'&tableId=' + item.id">
+						预定
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+		</block>
+		<loading v-if="loading"></loading>
+		<dp-tabbar :opt="opt"></dp-tabbar>
+	</view>
+</template>
+
+<script>
+var app = getApp();
+	export default {
+		data() {
+			return {
+				opt:{},
+				loading:false,
+				isload: false,
+				nomore: false,
+				nodata:false,
+				
+				pagenum:1,
+				contentList:[],
+				clist:[],
+				curCid:0,
+				curTopIndex: -1,
+				curIndex: -1,
+				logo:''
+			}
+		},
+		onLoad: function (opt) {
+			this.opt = app.getopts(opt);
+			this.opt.bid = this.opt.bid ? this.opt.bid : 0;
+			this.logo = app.globalData.initdata.logo;
+			this.getdata();
+		},
+		onPullDownRefresh: function () {
+			this.getdata();
+		},
+		onReachBottom: function () {
+			if (!this.nodata && !this.nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getTabContentList();
+			}
+		},
+		methods: {
+			getdata: function () {
+				var that = this;
+				that.loading = true;
+				var nowcid = that.opt.cid;
+				if (!nowcid) nowcid = 0;
+				app.get('ApiRestaurantBooking/tableCategory', {bid:that.opt.bid}, function (res) {
+					that.loading = false;
+					var data = res.data;
+					that.clist = data;
+					// that.curCid = data[0]['id'];
+					if (nowcid) {
+						for (var i = 0; i < data.length; i++) {
+							if (data[i]['id'] == nowcid) {
+								that.curTopIndex = i;
+								that.curCid = nowcid;
+								break;
+							}
+						}
+					}
+					that.getTabContentList();
+					that.loaded();
+				});
+			},
+			
+			switchTopTab: function (e) {
+			  var that = this;
+			  var id = e.currentTarget.dataset.id;
+			  var index = parseInt(e.currentTarget.dataset.index);
+			  this.curTopIndex = index;
+			  this.curIndex = -1;
+			  this.contentList = [];
+			  this.curCid = id;
+				this.pagenum = 1;
+			  this.getTabContentList();
+			},
+			getTabContentList:function(){
+				var that = this;
+				var pagenum = that.pagenum;
+				var tempdata = uni.getStorageSync('restaurant_booking');
+				that.nodata = false;
+				that.nomore = false;
+				that.loading = true;
+				console.log(tempdata)
+				app.post('ApiRestaurantBooking/tableList', {cid: that.curCid,bid:that.opt.bid,pagenum: pagenum, time:tempdata.chooseTimeStr}, function (res) {
+					that.loading = false;
+					var data = res.data;
+					if (pagenum == 1) {
+						that.contentList = data;
+						if (data.length == 0) {
+							that.nodata = true;
+						}
+						that.loaded();
+					}else{
+						if (data.length == 0) {
+							that.nomore = true;
+						} else {
+							var contentList = that.contentList;
+							var newdata = contentList.concat(data);
+							that.contentList = newdata;
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+.page-tab{display:flex;width:100%;overflow-x:scroll;border-bottom: 1px #f5f5f5 solid;padding:0 10rpx; background-color: #FFFFFF;}
+.page-tab2{display:flex;width:auto;min-width:100%}
+.page-tab2 .item{width:auto;padding:0 20rpx;font-size:28rpx;text-align: center; color:#333; height:90rpx; line-height:90rpx; overflow: hidden;position:relative;flex-shrink:0;flex-grow: 1;}
+.page-tab2 .on{color:#FE5B07; font-size: 30rpx;}
+
+.shop-box {padding: 0 30rpx 30rpx;}
+.shop-box .shop-item {width: 100%;margin-top: 20rpx; display: flex;background: #fff;border-radius: 8rpx; padding: 20rpx;}
+.shop-box .shop-item .shop-img {width: 200rpx;height: 200rpx;border-radius: 8rpx; background-color: #eee;}
+.shop-box .shop-item .f2 {margin-top: 12rpx;justify-content: space-between; padding: 10rpx;}
+.shop-box .shop-item .shop-name {font-size: 32rpx;color: #333;}
+.shop-box .shop-item .desc {color: #999;}
+.shop-box .shop-item .f3 {width: 120rpx; align-items: center;}
+.button{width: 100rpx;height:70rpx;line-height:70rpx;font-size:28rpx;color:#FFFFFF;  background: linear-gradient(90deg, #FF7D15 0%, #FC5729 100%);
+border-radius: 10rpx; text-align: center;}
+
+</style>
diff --git a/restaurant/deposit/add.vue b/restaurant/deposit/add.vue
new file mode 100644
index 0000000..107d353
--- /dev/null
+++ b/restaurant/deposit/add.vue
@@ -0,0 +1,161 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form">
+			<view class="form-item">
+				<text class="label">物品名称</text>
+				<input type="text" class="input" placeholder="请输入物品名称" name="name" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+			<view class="form-item">
+				<text class="label">寄存数量</text>
+				<input type="text" class="input" placeholder="请输入寄存数量" name="num" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+			<view class="form-item">
+				<text class="label">寄存人</text>
+				<input type="text" class="input" placeholder="请输入姓名" name="linkman" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+			<view class="form-item">
+				<text class="label">手机号</text>
+				<input type="text" class="input" placeholder="请输入手机号" name="tel" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">备注</text>
+				<input type="text" class="input" placeholder="如您有其他需求请填写" name="message" placeholder-style="color:#BBBBBB;font-size:28rpx"/>
+			</view>
+		</view>
+		<view class="form">
+			<view class="flex-col">
+				<text class="label" style="height:98rpx;line-height:98rpx;font-size:30rpx">寄存拍照</text>
+				<view class="flex" style="flex-wrap:wrap;padding-bottom:20rpx;">
+					<view v-for="(item, index) in pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="pic"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="pic" v-if="pic.length==0"></view>
+				</view>
+				<input type="text" hidden="true" name="pic" :value="pic.join(',')" maxlength="-1"></input>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="'background:linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'">提交寄存</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		pic:[],
+
+		event_rul: app.globalData.event_url,
+			
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loaded();
+		},
+		formSubmit:function(e){
+			var that = this;
+			var info = e.detail.value;
+			var tel = this.tel
+			var renshu = this.renshu;
+			var cid = this.cid;
+			if(!info.name){
+				app.alert('请输入寄存物品名称');return;
+			}
+			if(!info.num){
+				app.alert('请输入寄存数量');return;
+			}
+			if(!info.linkman){
+				app.alert('请输入您的姓名');return;
+			}
+			if(!info.tel){
+				app.alert('请输入您的手机号');return;
+			}
+			if(!info.pic){
+				app.alert('请上传寄存物品拍照');return;
+			}
+			info.bid = that.opt.bid;
+			app.showLoading('提交中');
+			app.post('ApiRestaurantDeposit/add',info,function(res){
+				app.showLoading(false);
+				if(res.status==0){
+					app.alert(res.msg);
+				}else{
+					app.alert(res.msg,function(){
+						app.goto('orderdetail?bid='+that.opt.bid,'reLaunch');
+					});
+				}
+			});
+		},
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+			},1)
+		},
+		removeimg:function(e){
+			var that = this;
+			var index= e.currentTarget.dataset.index
+			var field= e.currentTarget.dataset.field
+			if(field == 'pic'){
+				var pics = that.pic
+				pics.splice(index,1);
+				that.pic = pics;
+			}
+		},
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+.container{height:100%;overflow:hidden;position: relative;}
+
+.form{ width:94%;margin:0 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;margin-top:20rpx}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;font-size:30rpx}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;text-align:right}
+.form-item .f2{flex:1;color: #000;text-align:right}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 0;flex:1;color: #000;}
+
+.btn{width:94%;margin:0 3%;margin-top:40rpx;height:90rpx;line-height:90rpx;text-align:center;background: linear-gradient(90deg, #FF7D15 0%, #FC5729 100%);color:#fff;font-size:32rpx;font-weight:bold;border-radius:10rpx}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;z-index:90;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/deposit/orderdetail.vue b/restaurant/deposit/orderdetail.vue
new file mode 100644
index 0000000..e8e11ca
--- /dev/null
+++ b/restaurant/deposit/orderdetail.vue
@@ -0,0 +1,213 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topbg"></view>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box">
+					<view class="pic">
+						<image :src="item.pic" class="img"/>
+					</view>
+					<view class="detail">
+						<text class="t1">{{item.name}}</text>
+						<text class="t2">数量：{{item.num}}</text>
+						<text class="t2">存入时间：{{date(item.createtime)}}</text>
+					</view>
+					<view v-if="item.status==0" class="takeout st0">审核中</view>
+					<view v-if="item.status==1" class="takeout" @tap="takeout" :data-orderid="item.id"><image :src="event_rul +'/static/img/static/restaurant/deposit_takeout.png'" class="img"/>取出</view>
+					<view v-if="item.status==2" class="takeout st2" @tap="takeout" :data-orderid="item.id">已取走</view>
+					<view v-if="item.status==3" class="takeout st3" @tap="takeout" :data-orderid="item.id">未通过</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+
+		
+		<view class="bottom">
+			<view class="btn2" @tap="takeouts" data-orderid="0">一键取出</view>
+			<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'add?bid='+bid">我要寄存</view>
+		</view>
+		<!-- 弹框 -->
+		<view v-if="invoiceShow" class="">
+						<view class="" @tap.stop="handleClickMask"></view>
+						<view class="popup__modal">
+							<view class="popup__title">
+								<text class="popup__title-text">请输入取酒数量</text>
+								<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx"
+									@tap.stop="handleClickMask" />
+							</view>
+							<view class="popup__content invoiceBox">
+								<form @submit="invoiceFormSubmit" @reset="formReset" report-submit="true">
+									<view class="orderinfo">
+										
+										<view class="item">
+											<text class="t1">取出数量</text>
+											<input class="t2" type="text" placeholder="请输入要取出的数量" placeholder-style="font-size:28rpx;color:#BBBBBB" name="numbers"  value="1"></input>
+										</view>
+									</view>
+									<button class="btn" form-type="submit" :style="{background:t('color1')}">确定</button>
+									
+								</form>
+							</view>
+						</view>
+					</view>
+        
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		pre_url:app.globalData.pre_url,
+
+		datalist: [],
+		pagenum: 1,
+		invoiceShow:false,
+		invoice:'',
+		nomore: false,
+		nodata:false,
+		takeoutshow:false,
+		bid:0,
+		orderid:0,
+
+		event_rul: app.globalData.event_url,
+ 
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.bid){
+			this.bid = this.opt.bid;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiRestaurantDeposit/orderdetail', {st: st,pagenum: pagenum,bid:that.opt.bid}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+	handleClickMask: function() {	
+		this.invoiceShow = false;
+	},
+    takeout: function (e) {
+       var that = this;
+       this.orderid = e.currentTarget.dataset.orderid;
+	   this.invoiceShow = true; //显示弹框
+    },
+	
+	takeouts: function (e) {
+	   var that = this;
+	  var orderid = e.currentTarget.dataset.orderid;
+	  app.confirm('确定要全部取出吗?', function () {
+	    app.post('ApiRestaurantDeposit/takeout', {bid:that.bid,orderid: orderid}, function (data) {
+					if(data.status== 0){
+						app.alert(data.msg);return;
+					}
+	      app.success(data.msg);
+	      setTimeout(function () {
+	        that.getdata();
+	      }, 1000);
+	    });
+	  });
+	},
+	
+	invoiceFormSubmit: function (e) {
+		 var that = this;
+		 var formdata = e.detail.value;
+		 //alert(formdata.numbers);
+		
+		app.post('ApiRestaurantDeposit/takeout', {bid:that.bid,orderid:that.orderid,numbers:formdata.numbers}, function (data) {
+						if(data.status== 0){
+							app.alert(data.msg);return;
+						}
+		  app.success(data.msg);
+		  setTimeout(function () {
+			  that.invoiceShow = false; //隐藏弹框
+			that.getdata();
+		  }, 1000);
+		});
+	},
+  }
+};
+</script>
+<style>
+.container{ width:100%;}
+.topbg{width: 94%;margin:20rpx 3%;border-radius:8rpx;overflow:hidden}
+.topbg .img{width:100%;height:auto}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:0 3%;margin-bottom:20rpx;padding:10rpx 0 10rpx 20rpx; background: #fff;border-radius:8px;display:flex;position:relative}
+.order-box .pic{ width: 120rpx; height: 120rpx;}
+.order-box .pic .img{ width: 120rpx; height: 120rpx;}
+.order-box .detail{display:flex;flex-direction:column;margin-left:20rpx;flex:1;margin-top:6rpx}
+.order-box .detail .t1{font-size:28rpx;font-weight:bold;height:40rpx;line-height:40rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .detail .t2{height: 36rpx;line-height: 36rpx;color: #999;overflow: hidden;font-size: 22rpx;}
+.order-box .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .takeout{display:flex;align-items:center;justify-content:center;padding:0 24rpx;height:52rpx;position:absolute;top:50%;margin-top:-26rpx;right:0;border-radius:26rpx 0 0 26rpx;background:#FFE8E1;color:#222222;font-size:24rpx;font-weight:bold}
+.order-box .takeout .img{width:28rpx;height:28rpx;margin-right:6rpx}
+.order-box .takeout.st0{color:#f55}
+.order-box .takeout.st2{background:#F7F7F7;color:#BBBBBB}
+.order-box .takeout.st3{background:#F7F7F7;color:#888}
+
+.orderinfo{width:94%;margin:0 3%;border-radius:8rpx;margin-top:16rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:0px dashed #ededed;overflow:hidden}
+.orderinfo .item{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;flex-shrink:0}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-between;align-items:center;
+box-shadow: 0px 10px 15px 0px rgba(0, 0, 0, 0.06);}
+.btn1{margin-left:20rpx;width:370rpx;height:88rpx;line-height:88rpx;color:#fff;border-radius:44rpx;text-align:center;font-weight:bold}
+.btn2{margin-left:20rpx;width:280rpx;height:88rpx;line-height:88rpx;color:#333;background:#fff;border:1px solid #cdcdcd;font-weight:bold;border-radius:44rpx;text-align:center}
+
+.popup__modal{ min-height: 0;}
+
+</style>
\ No newline at end of file
diff --git a/restaurant/deposit/orderlist.vue b/restaurant/deposit/orderlist.vue
new file mode 100644
index 0000000..4b0763c
--- /dev/null
+++ b/restaurant/deposit/orderlist.vue
@@ -0,0 +1,167 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'detail?id=' + item.id">
+					<view class="head">
+						<view class="f1" @tap.stop="goto" :data-url="item.bid!=0?'/pages/business/index?bid=' + item.bid:'/pages/index/index'">
+							<image :src="item.binfo.logo"></image>
+							<text>{{item.binfo.name}}</text>
+							<text class="flex1"></text>
+							<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text>
+						</view>
+					</view>
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view class="pic">
+								<image :src="item2.pic" class="img"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">数量：{{item2.num}}</text>
+								<text class="t2">存入时间：{{date(item2.createtime)}}</text>
+							</view>
+							<view v-if="item2.status==0" class="takeout st0" :data-orderid="item2.id">审核中</view>
+							<view v-if="item2.status==1" class="takeout" @tap="takeout" :data-bid="item.bid" :data-orderid="item2.id"><image :src="event_rul + '/static/img/static/restaurant/deposit_takeout.png'" class="img"/>取出</view>
+							<view v-if="item2.status==2" class="takeout st2" :data-orderid="item2.id">已取走</view>
+							<view v-if="item2.status==3" class="takeout st3" :data-orderid="item2.id">未通过</view>
+						</view>
+					</block>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'orderdetail?bid=' + item.bid" class="btn2">寄存记录</view>
+						<view @tap.stop="goto" :data-url="'add?bid=' + item.bid" class="btn2">我要寄存</view>
+						<view @tap.stop="takeout" :data-bid="item.bid" data-orderid="0" class="btn1" :style="{background:t('color1')}">一键取出</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		takeoutshow:false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiRestaurantDeposit/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    takeout: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.orderid;
+      var bid = e.currentTarget.dataset.bid;
+      app.confirm('确定要取出吗?', function () {
+        app.post('ApiRestaurantDeposit/takeout', {bid:bid,orderid: orderid}, function (data) {
+					if(data.status== 0){
+						app.alert(data.msg);return;
+					}
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:0 3%;margin-top:20rpx;padding:6rpx 0; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width: 94%;margin:0 3%;border-bottom: 1px #f4f4f4 solid; height:90rpx; line-height: 90rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{flex:1;display:flex;align-items:center;color:#222;font-weight:bold}
+.order-box .head .f1 image{width:56rpx;height:56rpx;margin-right:20rpx;border-radius:50%}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px 16rpx 20rpx;border-bottom: 0 #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content .pic{ width: 120rpx; height: 120rpx;}
+.order-box .content .pic .img{ width: 120rpx; height: 120rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:20rpx;flex:1;margin-top:6rpx}
+.order-box .content .detail .t1{font-size:28rpx;font-weight:bold;height:40rpx;line-height:40rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .detail .t2{height: 36rpx;line-height: 36rpx;color: #999;overflow: hidden;font-size: 22rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .takeout{display:flex;align-items:center;justify-content:center;padding:0 24rpx;height:52rpx;position:absolute;top:50%;margin-top:-26rpx;right:0;border-radius:26rpx 0 0 26rpx;background:#FFE8E1;color:#222222;font-size:24rpx;font-weight:bold}
+.order-box .content .takeout .img{width:28rpx;height:28rpx;margin-right:6rpx}
+.order-box .content .takeout.st0{color:#f55}
+.order-box .content .takeout.st2{background:#F7F7F7;color:#BBBBBB}
+.order-box .content .takeout.st3{background:#F7F7F7;color:#888}
+
+.order-box .bottom{ width:100%; padding:20rpx; border-top: 0 #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding:20rpx; border-top: 0 #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:200rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:44rpx;text-align:center;font-weight:bold}
+.btn2{margin-left:20rpx;width:200rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;font-weight:bold;border-radius:44rpx;text-align:center}
+</style>
\ No newline at end of file
diff --git a/restaurant/queue/index.vue b/restaurant/queue/index.vue
new file mode 100644
index 0000000..c99be15
--- /dev/null
+++ b/restaurant/queue/index.vue
@@ -0,0 +1,221 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topbannerbg" :style="business.pic?'background:url('+business.pic+') 100%':''"></view>
+		<view class="topbannerbg2"></view>
+		<view class="topbanner">
+			<view class="left"><image class="img" :src="business.logo"/></view>
+			<view class="right">
+				<view class="f1">{{business.name}}</view>
+				<view class="f2">{{business.desc}}</view>
+				<!-- <view class="f3"><view class="flex1"></view><view class="t2">收藏<image class="img" :src="event_rul + '/static/img/static/restaurant/like1.png'"/></view></view> -->
+			</view>
+		</view>
+		<view class="notice">
+			<view class="content">
+				<image :src="event_rul + '/static/img/static/restaurant/queue-notice.png'" class="f1"/>
+				<view class="f2">{{notice}}</view>
+			</view>
+		</view>
+		<view class="clist">
+			<view class="title">当前排队</view>
+			<view class="content">
+				<view class="item" v-for="item in clist">
+					<view class="f1">
+						<view class="t1">{{item.name}}</view>
+						<view class="t2">{{item.seat_min}}-{{item.seat_max}}人</view>
+					</view>
+					<view class="f2">等待<text style="color:#FC5729;padding:0 6rpx;font-size:28rpx">{{item.waitnum}}</text>桌</view>
+					<view class="f3"><text style="color:#FC5729;padding:0 6rpx;font-size:28rpx">{{item.need_minute}}</text>分钟</view>
+				</view>
+			</view>
+		</view>
+		<view class="myqueue" v-if="myqueue">
+			<view class="title"><text class="t1">我的排队</text><text class="t2" @tap="cancel" :data-id="myqueue.id" :data-queue_no="myqueue.queue_no">取消排队</text></view>
+			<view class="content">
+				<view class="f1">{{myqueue.queue_no}}</view>
+				<view class="f2">{{myqueue.cname}}</view>
+				<view class="f2">取号时间：{{date(myqueue.create_time,'H:i:s')}}</view>
+			</view>
+			<view class="bottom">
+				<view class="f1">前面还有<text style="color:#FC5729;padding:0 6rpx;">{{myqueue.beforenum}}</text>人等待中</view>
+				<view class="f2">预计等待<text style="color:#FC5729;padding:0 6rpx;">{{myqueue.need_minute}}</text>分钟</view>
+			</view>
+		</view>
+		<view class="myqueue" v-if="myjustqueue">
+			<view class="title"><text class="t1">我的排队</text><text class="t2">已叫号 请前往用餐</text></view>
+			<view class="content">
+				<view class="f1">{{myjustqueue.queue_no}}</view>
+				<view class="f2">{{myjustqueue.cname}}</view>
+				<view class="f2">取号时间：{{date(myjustqueue.create_time,'H:i:s')}}</view>
+				<view class="f2">叫号时间：{{date(myjustqueue.call_time,'H:i:s')}}</view>
+			</view>
+		</view>
+		<view class="btn" v-if="!myqueue" @tap="goto" :data-url="'quhao?bid='+bid">取号排队</view>
+		<view class="log" v-if="!myqueue" @tap="goto" :data-url="'record?bid='+bid">我的排队记录</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var intervel;
+var socketMsgQueue = [];
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		business:{},
+		clist: [],
+		myqueue:'',
+		myjustqueue:'',
+		notice:'',
+		bid:'',
+		socketOpen:false,
+		token:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.bid = this.opt.bid || 0;
+		this.getdata();
+  },
+  onUnload: function () {
+    clearInterval(intervel);
+    if(this.socketOpen) uni.closeSocket();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantQueue/index', {bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				that.business = res.business
+				that.clist = res.clist;
+				that.notice = res.notice;
+				that.myqueue = res.myqueue;
+				that.myjustqueue = res.myjustqueue;
+				that.token = res.token;
+				that.loaded();
+
+				if(!that.socketOpen){
+					var pre_url = app.globalData.pre_url;
+					var wssurl = pre_url.replace('https://', "wss://") + '/wss';
+					uni.closeSocket();
+					uni.connectSocket({
+						url: wssurl
+					});
+					uni.onSocketOpen(function (res) {
+						console.log(res)
+						that.socketOpen = true;
+						for (var i = 0; i < socketMsgQueue.length; i++) {
+							that.sendSocketMessage(socketMsgQueue[i]);
+						}
+						socketMsgQueue = [];
+					});
+					that.sendSocketMessage({type: 'restaurant_queue',token: that.token,data:{ aid:app.globalData.aid,bid:that.bid }});
+					intervel = setInterval(function () {
+						that.sendSocketMessage({type: 'connect',token: that.token});
+					}, 25000);
+					
+					uni.onSocketMessage(function (res) {
+						console.log(res)
+						try {
+							var data = JSON.parse(res.data);
+							that.receiveMessage(data);
+						} catch (e) {}
+					});
+				}
+			});
+		},
+		sendSocketMessage:function(msg) {
+			if (this.socketOpen) {
+				console.log(msg)
+				uni.sendSocketMessage({
+					data: JSON.stringify(msg)
+				});
+			} else {
+				console.log('111')
+				socketMsgQueue.push(msg);
+			}
+		},
+    receiveMessage: function (data) {
+			console.log(data);
+			if(data.type == 'restaurant_queue_add' || data.type == 'restaurant_queue_callno' || data.type == 'restaurant_queue_cancel'){
+				this.getdata();
+			}
+    },
+		cancel:function(e){
+			var that = this;
+			var id = e.currentTarget.dataset.id;
+			var queue_no = e.currentTarget.dataset.queu_no;
+			app.confirm('确定要取消排队吗?',function(){
+				app.showLoading('取消中');
+				app.get('ApiRestaurantQueue/cancel', {id:id}, function (res) {
+					app.showLoading(false);
+					app.alert(res.msg,function(){
+						that.getdata();
+					});
+					if(res.status==1){
+						that.sendSocketMessage({type: 'restaurant_queue_cancel',token: that.token,data:{ aid:app.globalData.aid,bid:that.bid,queue_id:id }});
+					}
+				})
+			})
+		}
+  }
+};
+</script>
+<style>
+.container{height:100%;overflow:hidden;position: relative;}
+
+.topbannerbg{width:100%;height:280rpx;background:#fff;}
+.topbannerbg2{position:absolute;z-index:7;width:100%;height:280rpx;background:rgba(0,0,0,0.7);top:0}
+.topbanner{position:absolute;z-index:8;width:100%;display:flex;padding:60rpx;top:0;align-items:center}
+.topbanner .left{width:100rpx;height:100rpx;flex-shrink:0;margin-right:20rpx;display:none}
+.topbanner .left .img{width:100%;height:100%;border-radius:50%}
+.topbanner .right{display:flex;flex-direction:column;padding:20rpx 0}
+.topbanner .right .f1{font-size:32rpx;font-weight:bold;color:#fff}
+.topbanner .right .f2{font-size:22rpx;color:#fff;opacity:0.7;margin-top:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;line-height:30rpx;}
+.topbanner .right .f3{width:100%;display:flex;padding-right:20rpx;margin-top:10rpx}
+.topbanner .right .f3 .t2{display:flex;align-items:center;font-size:24rpx;color:rgba(255,255,255,0.9)}
+.topbanner .right .f3 .img{width:32rpx;height:32rpx;margin-left:10rpx}
+
+.notice{display:flex;width:94%;margin:0 3%;height:120rpx;background: #fff;position:absolute;z-index:11;padding:0 50rpx;border-radius:10rpx;margin-top:-70rpx;}
+.notice .content{display:flex;width:100%;align-items:center}
+.notice .content .f1{width:40rpx;height:40rpx;margin-right:20rpx}
+.notice .content .f2{flex:1;color:#FC5729;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.clist{display:flex;flex-direction:column;width:94%;margin:0 3%;margin-top:70rpx;background: #fff;padding:30rpx 38rpx;border-radius:10rpx;}
+.clist .title{color:#161616;font-weight:bold}
+.clist .content{display:flex;flex-direction:column;margin:20rpx 0}
+.clist .content .item{background:#FFF6F3;border-radius:10rpx;display:flex;align-items:center;width:100%;height:110rpx;margin-bottom:16rpx;padding:0 40rpx}
+.clist .content .item .f1{display:flex;flex-direction:column;width:50%;padding-left:20rpx}
+.clist .content .item .f1 .t1{color:#222222}
+.clist .content .item .f1 .t2{color:#999999;font-size:20rpx}
+.clist .content .item .f2{display:flex;width:30%;align-items:center;font-size:24rpx}
+.clist .content .item .f3{display:flex;width:20%;align-items:center;font-size:24rpx;justify-content:flex-end}
+
+.myqueue{display:flex;flex-direction:column;width:94%;margin:0 3%;margin-top:20rpx;background: #fff;padding:30rpx 38rpx;border-radius:10rpx;}
+.myqueue .title{display:flex;align-items:center;justify-content:space-between}
+.myqueue .title .t1{color:#161616;font-weight:bold}
+.myqueue .title .t2{color:#FC5729;font-size:24rpx}
+.myqueue .content{display:flex;flex-direction:column;align-items:center;width:100%;margin:40rpx 0}
+.myqueue .content .f1{font-size:64rpx;font-weight:bold;color:#564B4B}
+.myqueue .content .f2{font-size:24rpx;color:#A29E9E;margin-top:10rpx}
+.myqueue .bottom{display:flex;align-items:center;width:100%;color:#564B4B;justify-content:space-between}
+
+.btn{width:94%;margin:0 3%;margin-top:40rpx;height:90rpx;line-height:90rpx;text-align:center;background: linear-gradient(90deg, #FF7D15 0%, #FC5729 100%);color:#fff;font-size:32rpx;font-weight:bold;border-radius:10rpx}
+.log{width:100%;text-align:center;margin-top:30rpx;margin-bottom:40rpx;color:#888}
+</style>
\ No newline at end of file
diff --git a/restaurant/queue/quhao.vue b/restaurant/queue/quhao.vue
new file mode 100644
index 0000000..9c087fc
--- /dev/null
+++ b/restaurant/queue/quhao.vue
@@ -0,0 +1,293 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="topbannerbg" :style="business.pic?'background:url('+business.pic+') 100%':''"></view>
+		<view class="topbannerbg2"></view>
+		<view class="topbanner">
+			<view class="left"><image class="img" :src="business.logo"/></view>
+			<view class="right">
+				<view class="f1">{{business.name}}</view>
+				<view class="f2">{{business.desc}}</view>
+				<!-- <view class="f3"><view class="flex1"></view><view class="t2">收藏<image class="img" :src="event_rul +'/static/img/static/restaurant/like1.png'"/></view></view> -->
+			</view>
+		</view>
+		<view class="notice">
+			<view class="content">
+				<image :src="event_rul +'/static/img/static/restaurant/queue-notice.png'" class="f1"/>
+				<view class="f2">{{notice}}</view>
+			</view>
+		</view>
+		<view class="form">
+			<view class="form-item">
+				<text class="label">您的姓名</text>
+				<input type="text" class="input" placeholder="请输入姓名" name="linkman" :value="linkman" placeholder-style="color:#BBBBBB;font-size:28rpx" @input="inputLinkman"/>
+			</view>
+			<view class="form-item">
+				<text class="label">手机号</text>
+				<input type="text" class="input" placeholder="请输入手机号" name="tel" :value="tel" placeholder-style="color:#BBBBBB;font-size:28rpx" @input="inputTel"/>
+			</view>
+			<view class="form-item">
+				<text class="label">用餐人数</text>
+				<text class="f2" @tap="showRenshuSelect" :style="renshu==''?'color:#BBBBBB;font-size:28rpx':''">{{renshu!='' ? renshu+'人' : '请选择人数'}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal;font-size:28rpx"></text></text>
+			</view>
+			<view class="form-item">
+				<text class="label">排队队列</text>
+				<text class="f2" @tap="showCategorySelect" :style="cname==''?'color:#BBBBBB;font-size:28rpx':''">{{cname!='' ? cname : '请选择队列'}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal;font-size:28rpx"></text></text>
+			</view>
+		</view>
+		<view class="btn" @tap="confirmQuhao">确定取号</view>
+
+		<view v-if="renshuvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择用餐人数</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<view class="cuxiao-desc">
+						<view class="cuxiao-item" @tap="changeRenshu" :data-id="item" v-for="item in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]">
+							<view class="type-name"><text style="color:#333">{{item}}人</text></view>
+							<view class="radio" :style="renshuCache==item ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</view>
+					
+					<view style="width:100%; height:120rpx;"></view>
+					<view style="width:100%;position:absolute;bottom:0;padding:20rpx 5%;background:#fff">
+						<view style="width:100%;height:80rpx;line-height:80rpx;border-radius:40rpx;text-align:center;color:#fff;" :style="{background:t('color1')}" @tap="chooseRenshu">确 定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="categoryvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择队列</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<view class="cuxiao-desc">
+						<view class="cuxiao-item" @tap="changeCategory" :data-id="item.id" v-for="item in clist">
+							<view class="type-name"><text style="color:#333">{{item.name}}</text></view>
+							<view class="radio" :style="cidCache==item.id ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</view>
+					
+					<view style="width:100%; height:120rpx;"></view>
+					<view style="width:100%;position:absolute;bottom:0;padding:20rpx 5%;background:#fff">
+						<view style="width:100%;height:80rpx;line-height:80rpx;border-radius:40rpx;text-align:center;color:#fff;" :style="{background:t('color1')}" @tap="chooseCategory">确 定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var intervel;
+var socketMsgQueue = [];
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		business:{},
+		clist: [],
+		notice:'',
+
+		linkman:'',
+		tel:'',
+		renshuvisible:false,
+		renshuCache:'',
+		renshu:'',
+		categoryvisible:false,
+		cid:0,
+		cidCache:0,
+		cname:'',
+		socketOpen:false,
+		token:'',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(intervel);
+    if(this.socketOpen) uni.closeSocket();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantQueue/quhao', {bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				if(res.status==0){
+					app.alert(res.msg,function(){
+						app.goback(true);
+					});
+					return;
+				}
+				that.business = res.business
+				that.linkman = res.linkman
+				that.tel = res.tel
+				that.clist = res.clist;
+				that.notice = res.notice;
+				that.token = res.token;
+				that.loaded();
+
+				if(!that.socketOpen){
+					var pre_url = app.globalData.pre_url;
+					var wssurl = pre_url.replace('https://', "wss://") + '/wss';
+					uni.closeSocket();
+					uni.connectSocket({
+						url: wssurl
+					});
+					uni.onSocketOpen(function (res) {
+						console.log(res)
+						that.socketOpen = true;
+						for (var i = 0; i < socketMsgQueue.length; i++) {
+							that.sendSocketMessage(socketMsgQueue[i]);
+						}
+						socketMsgQueue = [];
+					});
+				}
+			});
+		},
+		sendSocketMessage:function(msg) {
+			if (this.socketOpen) {
+				console.log(msg)
+				uni.sendSocketMessage({
+					data: JSON.stringify(msg)
+				});
+			} else {
+				console.log('111')
+				socketMsgQueue.push(msg);
+			}
+		},
+		confirmQuhao:function(){
+			var that = this;
+			var linkman = this.linkman
+			var tel = this.tel
+			var renshu = this.renshu;
+			var cid = this.cid;
+			if(!linkman){
+				app.alert('请输入您的姓名');return;
+			}
+			if(!tel){
+				app.alert('请输入您的手机号');return;
+			}
+			if(!renshu){
+				app.alert('请选择用餐人数');return;
+			}
+			if(!cid){
+				app.alert('请选择队列');return;
+			}
+			app.showLoading('提交中');
+			app.post('ApiRestaurantQueue/quhao',{bid:that.opt.bid,linkman:linkman,tel:tel,renshu:renshu,cid:cid},function(res){
+				app.showLoading(false);
+				if(res.status==0){
+					app.alert(res.msg);
+				}else{
+					that.sendSocketMessage({type: 'restaurant_queue_add',token: that.token,data:{ aid:app.globalData.aid,bid:that.opt.bid }});
+					app.alert(res.msg,function(){
+						app.goto('index?bid='+that.opt.bid,'reLaunch');
+					});
+				}
+			})
+		},
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value;
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value;
+    },
+		showRenshuSelect:function(e){
+			this.renshuvisible = true;
+		},
+		changeRenshu: function (e) {
+      var that = this;
+      that.renshuCache = e.currentTarget.dataset.id;
+		},
+    chooseRenshu: function () {
+      var that = this;
+			that.renshu = that.renshuCache
+      this.renshuvisible = false;
+		},
+		showCategorySelect:function(e){
+			this.categoryvisible = true;
+		},
+		changeCategory: function (e) {
+      var that = this;
+      that.cidCache = e.currentTarget.dataset.id;
+		},
+    chooseCategory: function () {
+      var that = this;
+			that.cid = that.cidCache;
+			var clist = that.clist;
+			for(var i in clist){
+				if(clist[i].id == that.cid){
+					that.cname = clist[i].name;
+				}
+			}
+      this.categoryvisible = false;
+		},
+    handleClickMask: function () {
+      this.categoryvisible = false;
+      this.renshuvisible = false;
+    },
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 100%;}
+.container{height:100%;overflow:hidden;position: relative;}
+
+.topbannerbg{width:100%;height:280rpx;background:#fff;}
+.topbannerbg2{position:absolute;z-index:7;width:100%;height:280rpx;background:rgba(0,0,0,0.7);top:0}
+.topbanner{position:absolute;z-index:8;width:100%;display:flex;padding:60rpx;top:0;align-items:center}
+.topbanner .left{width:100rpx;height:100rpx;flex-shrink:0;margin-right:20rpx;display:none}
+.topbanner .left .img{width:100%;height:100%;border-radius:50%}
+.topbanner .right{display:flex;flex-direction:column;padding:20rpx 0}
+.topbanner .right .f1{font-size:32rpx;font-weight:bold;color:#fff}
+.topbanner .right .f2{font-size:22rpx;color:#fff;opacity:0.7;margin-top:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;line-height:30rpx;}
+.topbanner .right .f3{width:100%;display:flex;padding-right:20rpx;margin-top:10rpx}
+.topbanner .right .f3 .t2{display:flex;align-items:center;font-size:24rpx;color:rgba(255,255,255,0.9)}
+.topbanner .right .f3 .img{width:32rpx;height:32rpx;margin-left:10rpx}
+
+.notice{display:flex;width:94%;margin:0 3%;height:120rpx;background: #fff;position:absolute;z-index:9;padding:0 50rpx;border-radius:10rpx;margin-top:-70rpx;}
+.notice .content{display:flex;width:100%;align-items:center}
+.notice .content .f1{width:40rpx;height:40rpx;margin-right:20rpx}
+.notice .content .f2{flex:1;color:#FC5729;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+
+.form{ width:94%;margin:0 3%;border-radius:5px;padding:20rpx 20rpx;padding: 0 3%;background: #FFF;margin-top:70rpx}
+.form-item{display:flex;align-items:center;width:100%;border-bottom: 1px #ededed solid;height:98rpx;line-height:98rpx;font-size:30rpx}
+.form-item:last-child{border:0}
+.form-item .label{color: #000;width:200rpx;}
+.form-item .input{flex:1;color: #000;text-align:right}
+.form-item .f2{flex:1;color: #000;text-align:right}
+.form-item .picker{height: 60rpx;line-height:60rpx;margin-left: 0;flex:1;color: #000;}
+
+.btn{width:94%;margin:0 3%;margin-top:40rpx;height:90rpx;line-height:90rpx;text-align:center;background: linear-gradient(90deg, #FF7D15 0%, #FC5729 100%);color:#fff;font-size:32rpx;font-weight:bold;border-radius:10rpx}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/restaurant/queue/record.vue b/restaurant/queue/record.vue
new file mode 100644
index 0000000..f3e756f
--- /dev/null
+++ b/restaurant/queue/record.vue
@@ -0,0 +1,128 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="content" id="datalist">
+			<block v-for="(item, index) in datalist" :key="index"> 
+			<view class="item">
+				<view class="f1">
+						<text class="t1">{{item.queue_no}}</text>
+						<text class="t2">{{item.cname}}</text>
+						<text class="t2">{{date(item.create_time,'Y-m-d H:i')}}</text>
+				</view>
+				<view class="f2">
+					<text class="t1" v-if="item.status==0">排队中</text>
+					<text class="t2" v-if="item.status==1">已叫号</text>
+					<text class="t3" v-if="item.status==2">已过号</text>
+					<text class="t3" v-if="item.status==3">已取消</text>
+				</view>
+			</view>
+		</block>
+		<nodata v-if="nodata"></nodata>
+		</view>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+			
+			pre_url:app.globalData.pre_url,
+      st: 0,
+      datalist: [],
+      pagenum: 1,
+      myscore: 0,
+      nodata: false,
+      nomore: false
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiRestaurantQueue/record', {bid:that.opt.bid,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+					that.myscore = res.myscore;
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (e) {
+      var st = e.currentTarget.dataset.st;
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+  }
+};
+</script>
+<style>
+.myscore{width:94%;margin:20rpx 3%;border-radius: 10rpx 56rpx 10rpx 10rpx;position:relative;display:flex;flex-direction:column;padding:70rpx 0}
+.myscore .f1{margin:0 0 0 60rpx;color:rgba(255,255,255,0.8);font-size:24rpx;}
+.myscore .f2{margin:20rpx 0 0 60rpx;color:#fff;font-size:64rpx;font-weight:bold}
+
+.content{ width:94%;margin:0 3%;}
+.content .item{width:100%;margin:20rpx 0;background:#fff;border-radius:5px;padding:20rpx 20rpx;display:flex;align-items:center}
+.content .item .f1{flex:1;display:flex;flex-direction:column}
+.content .item .f1 .t1{color:#000000;font-size:30rpx;word-break:break-all;overflow:hidden;text-overflow:ellipsis;}
+.content .item .f1 .t2{color:#666666}
+.content .item .f1 .t3{color:#666666}
+.content .item .f2{ flex:1;font-size:36rpx;text-align:right}
+.content .item .f2 .t1{color:#0301bc}
+.content .item .f2 .t2{color:#03bc01}
+.content .item .f2 .t3{color:#aaa}
+.content .item .f3{ flex:1;font-size:32rpx;text-align:right}
+.content .item .f3 .t1{color:#03bc01}
+.content .item .f3 .t2{color:#000000}
+
+.data-empty{background:#fff}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/buy.vue b/restaurant/shop/buy.vue
new file mode 100644
index 0000000..e08a33c
--- /dev/null
+++ b/restaurant/shop/buy.vue
@@ -0,0 +1,537 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="address-add flex-y-center">
+			<view class="f1">桌台信息</view>
+			<view class="f2 flex1" v-if="tableinfo.id">
+				<view style="font-weight:bold;color:#111111;font-size:30rpx">{{tableinfo.name}}<text style="font-size:24rpx;font-weight:normal;color:#666;margin-left:10rpx">{{tableinfo.seat}}人桌</text></view>
+			</view>
+			<view v-else class="f2 flex1">请扫描桌台二维码</view>
+			<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"></image>
+		</view>
+		<view v-for="(buydata, index) in allbuydata" :key="index" class="buydata">
+			<view class="btitle"><image class="img" :src="event_rul +'/static/img/static/img/ico-shop.png'"/>{{buydata.business.name}}</view>
+			<view class="bcontent">
+				<view class="product">
+					<view v-for="(item, index2) in buydata.prodata" :key="index2" class="item flex">
+						<view class="img" @tap="goto" :data-url="'product?id=' + item.product.id"><image :src="item.product.pic"></image></view>
+						<view class="info flex1">
+							<view class="f1">{{item.product.name}}</view>
+							<view class="f2">规格：{{item.guige.name}}</view>
+							<view class="f3"><text style="font-weight:bold;">￥{{item.guige.sell_price}}</text><text style="padding-left:20rpx"> × {{item.num}}</text></view>
+						</view>
+					</view>
+				</view>
+				<view class="price" v-if="ordertype == 'create_order'">
+					<text class="f1">就餐人数</text>
+					<text class="f2" @tap="showRenshuSelect" :data-bid="buydata.bid">{{buydata.renshu>0 ? buydata.renshu+'人' : '请选择人数'}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></text>
+				</view>
+
+				<view class="price">
+					<text class="f1">菜品金额</text>
+					<text class="f2">¥{{buydata.product_price}}</text>
+				</view>
+				<view class="price" v-if="buydata.leveldk_money>0">
+					<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+					<text class="f2">-¥{{buydata.leveldk_money}}</text>
+				</view>
+				<view class="price" v-if="buydata.manjian_money>0">
+					<text class="f1">满减活动</text>
+					<text class="f2">-¥{{buydata.manjian_money}}</text>
+				</view>
+				<view class="price" v-if="ordertype == 'create_order'">
+					<text class="f1">{{buydata.tea_fee_text}}</text>
+					<text class="f2">+¥{{buydata.tea_fee * (buydata.renshu>0 ? buydata.renshu : 1)}}</text>
+				</view>
+				<view class="price" v-if="ordertype == 'create_order'">
+					<view class="f1">{{t('优惠券')}}</view>
+					<view v-if="buydata.couponCount > 0" class="f2" @tap="showCouponList" :data-bid="buydata.bid"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{buydata.couponrid!=0?buydata.couponList[buydata.couponkey].couponname:buydata.couponCount+'张可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+					<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+				</view>
+				<view class="price" v-if="ordertype == 'create_order' && buydata.cuxiaoCount > 0">
+					<view class="f1">促销活动</view>
+					<view class="f2" @tap="showCuxiaoList" :data-bid="buydata.bid"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{buydata.cuxiaoname?buydata.cuxiaoname:buydata.cuxiaoCount+'个可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="scoredk" v-if="ordertype == 'create_order' && userinfo.score2money>0 && (userinfo.scoremaxtype==0 || (userinfo.scoremaxtype==1 && userinfo.scoredkmaxmoney>0))">
+			<checkbox-group @change="scoredk" class="flex" style="width:100%">
+				<view class="f1">
+					<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+					<view style="font-size:22rpx;color:#999" v-if="userinfo.scoremaxtype==0 && userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+					<view style="font-size:22rpx;color:#999" v-else-if="userinfo.scoremaxtype==1">最多可抵扣{{userinfo.scoredkmaxmoney}}元</view>
+				</view>
+				<view class="f2">使用{{t('积分')}}抵扣
+					<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+				</view>
+			</checkbox-group>
+		</view>
+		<view style="width: 100%; height:110rpx;"></view>
+		<view class="footer flex">
+			<view class="text1 flex1">总计：
+				<text style="font-weight:bold;font-size:36rpx">￥{{alltotalprice}}</text>
+			</view>
+			<view class="op" @tap="topay" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</view>
+		</view>
+
+		<view v-if="couponvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<couponlist :couponlist="allbuydata[bid].couponList" :choosecoupon="true" :selectedrid="allbuydata[bid].couponrid" :bid="bid" @chooseCoupon="chooseCoupon"></couponlist>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="cuxiaovisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">优惠促销</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<view class="cuxiao-desc">
+						<view class="cuxiao-item" @tap="changecx" data-id="0">
+							<view class="type-name"><text style="color:#333">不使用促销</text></view>
+							<view class="radio" :style="cxid==0 ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+						<view v-for="(item, index) in allbuydata[bid].cuxiaolist" :key="index" class="cuxiao-item" @tap="changecx" :data-id="item.id">
+							<view class="type-name"><text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text> <text style="color:#333;padding-left:20rpx">{{item.name}}</text></view>
+							<view class="radio" :style="cxid==item.id ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</view>
+					<view id="cxproinfo" v-if="cuxiaoinfo.product" style="padding:0 40rpx">
+						<view class="product">
+							<view class="item flex" style="background:#f5f5f5">
+								<view class="img" @tap="goto" :data-url="'product?id=' + cuxiaoinfo.product.id"><image :src="cuxiaoinfo.product.pic"></image></view>
+								<view class="info flex1">
+									<view class="f1">{{cuxiaoinfo.product.name}}</view>
+									<view class="f2">规格：{{cuxiaoinfo.guige.name}}</view>
+									<view class="f3"><text style="font-weight:bold;">￥{{cuxiaoinfo.guige.sell_price}}</text><text style="padding-left:20rpx"> × 1</text></view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view style="width:100%; height:120rpx;"></view>
+					<view style="width:100%;position:absolute;bottom:0;padding:20rpx 5%;background:#fff">
+						<view style="width:100%;height:80rpx;line-height:80rpx;border-radius:40rpx;text-align:center;color:#fff;" :style="{background:t('color1')}" @tap="chooseCuxiao">确 定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="renshuvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择就餐人数</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<view class="cuxiao-desc">
+						<view class="cuxiao-item" @tap="changerenshu" :data-id="item" v-for="item in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]">
+							<view class="type-name"><text style="color:#333">{{item}}人</text></view>
+							<view class="radio" :style="renshu==item ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</view>
+					
+					<view style="width:100%; height:120rpx;"></view>
+					<view style="width:100%;position:absolute;bottom:0;padding:20rpx 5%;background:#fff">
+						<view style="width:100%;height:80rpx;line-height:80rpx;border-radius:40rpx;text-align:center;color:#fff;" :style="{background:t('color1')}" @tap="chooseRenshu">确 定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		address: [],
+		usescore: 0,
+		scoredk_money: 0,
+		totalprice: '0.00',
+		couponvisible: false,
+		cuxiaovisible: false,
+		renshuvisible:false,
+		renshu:1,
+		bid: 0,
+		nowbid: 0,
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		userinfo:{},
+		manjian_money: 0,
+		cxid: 0,
+		latitude: "",
+		longitude: "",
+		allbuydata: "",
+		alltotalprice: "",
+		cuxiaoinfo: false,
+		tableId:'',
+		tableinfo:{},
+		ordertype:'create_order',
+
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.tableId = this.opt.tableId || '';
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantShop/buy', {prodata: that.opt.prodata,tableId:that.tableId,frompage:that.opt.frompage}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					if (res.msg) {
+						app.alert(res.msg, function () {
+							if (res.url) {
+								app.goto(res.url);
+							} else {
+								app.goback();
+							}
+						});
+					} else if (res.url) {
+						app.goto(res.url);
+					} else {
+						app.alert('您没有权限购买该商品');
+					}
+					return;
+				}
+				that.tableinfo = res.tableinfo;
+				that.userinfo = res.userinfo;
+				that.allbuydata = res.allbuydata;
+				that.scorebdkyf = res.scorebdkyf;
+				that.ordertype = res.ordertype;
+				that.calculatePrice();
+				that.loaded();
+			});
+		},
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value;
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value;
+    },
+    inputfield: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+			var field = e.currentTarget.dataset.field;
+      allbuydata[bid][field] = e.detail.value;
+      this.allbuydata = allbuydata;
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var alltotalprice = 0;
+      for (var k in allbuydata) {
+        var product_price = parseFloat(allbuydata[k].product_price);
+        var leveldk_money = parseFloat(allbuydata[k].leveldk_money); //会员折扣
+        var manjian_money = parseFloat(allbuydata[k].manjian_money); //满减活动
+        var coupon_money = parseFloat(allbuydata[k].coupon_money); //-优惠券抵扣 
+        var cuxiao_money = parseFloat(allbuydata[k].cuxiao_money); //+促销活动  
+        var tea_fee = parseFloat(allbuydata[k].tea_fee) * (allbuydata[k].renshu ? allbuydata[k].renshu : 1); //+茶位费
+       
+        var totalprice = product_price + tea_fee - leveldk_money - manjian_money - coupon_money + cuxiao_money;
+        if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+        allbuydata[k].totalprice = totalprice.toFixed(2);
+        alltotalprice += totalprice;
+      }
+
+      if (that.usescore) {
+        var scoredk_money = parseFloat(that.userinfo.scoredk_money); //-积分抵扣
+      } else {
+        var scoredk_money = 0;
+      }
+
+      var oldalltotalprice = alltotalprice;
+      alltotalprice = alltotalprice - scoredk_money;
+      if (alltotalprice < 0) alltotalprice = 0;
+
+      var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+      var scoremaxtype = parseInt(that.userinfo.scoremaxtype);
+      var scoredkmaxmoney = parseFloat(that.userinfo.scoredkmaxmoney);
+
+      if (scoremaxtype == 0 && scoredk_money > 0 && scoredkmaxpercent > 0 && scoredkmaxpercent < 100 && scoredk_money > oldalltotalprice * scoredkmaxpercent * 0.01) {
+        scoredk_money = oldalltotalprice * scoredkmaxpercent * 0.01;
+        alltotalprice = oldalltotalprice - scoredk_money;
+      } else if (scoremaxtype == 1 && scoredk_money > scoredkmaxmoney) {
+        scoredk_money = scoredkmaxmoney;
+        alltotalprice = oldalltotalprice - scoredk_money;
+      }
+
+      if (alltotalprice < 0) alltotalprice = 0;
+      alltotalprice = alltotalprice.toFixed(2);
+      that.alltotalprice = alltotalprice;
+      that.allbuydata = allbuydata;
+    },
+		chooseCoupon:function(e){
+      var allbuydata = this.allbuydata;
+			var bid = e.bid;
+			var couponrid = e.rid;
+      var couponkey = e.key;
+			if (couponrid == allbuydata[bid].couponrid) {
+        allbuydata[bid].couponkey = 0;
+        allbuydata[bid].couponrid = 0;
+        allbuydata[bid].coupontype = 1;
+        allbuydata[bid].coupon_money = 0;
+        this.allbuydata = allbuydata;
+        this.couponvisible = false;
+      } else {
+        var couponList = allbuydata[bid].couponList;
+        var coupon_money = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        allbuydata[bid].couponkey = couponkey;
+        allbuydata[bid].couponrid = couponrid;
+        allbuydata[bid].coupontype = coupontype;
+        allbuydata[bid].coupon_money = coupon_money;
+        this.allbuydata = allbuydata;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+		},
+    //提交并支付
+    topay: function () {
+      var that = this;
+      var usescore = this.usescore;
+      var frompage = that.opt.frompage ? that.opt.frompage : '';
+      var allbuydata = that.allbuydata;
+      var buydata = [];
+			
+			for (var i in allbuydata) {
+				if(that.ordertype == 'create_order'){
+					if(allbuydata[i].tea_fee > 0 && allbuydata[i].renshu==0){
+						app.error('请选择就餐人数');
+					 return;
+					}
+				}
+				buydata.push({
+					bid: allbuydata[i].bid,
+					prodata: allbuydata[i].prodatastr,
+					cuxiaoid: allbuydata[i].cuxiaoid,
+					couponrid: allbuydata[i].couponrid,
+					renshu: allbuydata[i].renshu,
+					message: allbuydata[i].message,
+					field1: allbuydata[i].field1,
+					field2: allbuydata[i].field2,
+					field3: allbuydata[i].field3,
+					field4: allbuydata[i].field4,
+					field5: allbuydata[i].field5
+				});
+			}
+      
+			app.showLoading('提交中');
+			var apiurl = 'ApiRestaurantShop/createOrder';
+			if(that.ordertype == 'edit_order'){
+				apiurl = 'ApiRestaurantShop/editOrder';
+			}
+      app.post(apiurl, {frompage: frompage,buydata: buydata,tableid:that.tableId,usescore: usescore}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          //that.showsuccess(res.data.msg);
+          app.error(res.msg);
+          return;
+        }
+				if(frompage == 'admin')
+					app.goto('/admin/restaurant/tableWaiterDetail?id=' + that.tableId, 'redirect');
+				else {
+					if(res.pay_after && res.pay_after != 1)
+						app.goto('/pages/pay/pay?id=' + res.payorderid, 'redirect');
+					else
+						app.goto('/restaurant/shop/orderlist', 'redirect');
+						
+				}
+      });
+    },
+		showRenshuSelect:function(e){
+			this.renshuvisible = true;
+      this.bid = e.currentTarget.dataset.bid;
+		},
+		changerenshu: function (e) {
+      var that = this;
+      that.renshu = e.currentTarget.dataset.id;
+		},
+    chooseRenshu: function () {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = that.bid;
+			that.allbuydata[bid].renshu = that.renshu
+			this.renshuvisible = false;
+			that.calculatePrice();
+		},
+    showCouponList: function (e) {
+      this.couponvisible = true;
+      this.bid = e.currentTarget.dataset.bid;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+      this.cuxiaovisible = false;
+      this.renshuvisible = false;
+    },
+    showCuxiaoList: function (e) {
+      this.cuxiaovisible = true;
+      this.bid = e.currentTarget.dataset.bid;
+    },
+    changecx: function (e) {
+      var that = this;
+      var cxid = e.currentTarget.dataset.id;
+      console.log(cxid);
+      that.cxid = cxid;
+      if (cxid == 0) {
+        that.cuxiaoinfo = false;
+        return;
+      }
+      app.post("ApiRestaurantShop/getcuxiaoinfo", {id: cxid}, function (res) {
+        that.cuxiaoinfo = res;
+      });
+    },
+    chooseCuxiao: function () {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = that.bid;
+      var cxid = that.cxid;
+      if (cxid == 0) {
+        allbuydata[bid].cuxiaoid = '';
+        allbuydata[bid].cuxiao_money = 0;
+        allbuydata[bid].cuxiaoname = '不使用促销';
+      } else {
+        var cxtype = that.cuxiaoinfo.info.type;
+				console.log(cxtype);
+        if (cxtype == 1 || cxtype == 6) {
+          //满额立减 满件立减
+          allbuydata[bid].cuxiao_money = that.cuxiaoinfo.info['money'] * -1;
+        } else if (cxtype == 2) {
+          //满额赠送
+          allbuydata[bid].cuxiao_money = 0;
+        } else if (cxtype == 3) {
+          //加价换购
+          allbuydata[bid].cuxiao_money = that.cuxiaoinfo.info['money'];
+        } else if (cxtype == 4 || cxtype == 5) {
+					var product_price = parseFloat(allbuydata[bid].product_price);
+					var leveldk_money = parseFloat(allbuydata[bid].leveldk_money); //会员折扣
+					var manjian_money = parseFloat(allbuydata[bid].manjian_money); //满减活动
+          //满额打折 满件打折
+          allbuydata[bid].cuxiao_money = (1 - that.cuxiaoinfo.info['zhekou'] * 0.1) * (product_price - leveldk_money - manjian_money) * -1;
+        }
+        allbuydata[bid].cuxiaoid = cxid;
+        allbuydata[bid].cuxiaotype = cxtype;
+        allbuydata[bid].cuxiaoname = that.cuxiaoinfo.info['name'];
+      }
+      this.allbuydata = allbuydata;
+      this.cuxiaovisible = false;
+      this.calculatePrice();
+    },
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding:0 20rpx;display:flex;align-items:center;z-index:8}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/comment.vue b/restaurant/shop/comment.vue
new file mode 100644
index 0000000..ebec30e
--- /dev/null
+++ b/restaurant/shop/comment.vue
@@ -0,0 +1,196 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form-content">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.pic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.name}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var ogid = that.opt.ogid;
+			that.loading = true;
+			app.get('ApiRestaurantShop/comment', {ogid: ogid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var ogid = that.opt.ogid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantShop/comment', {ogid: ogid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/commentdp.vue b/restaurant/shop/commentdp.vue
new file mode 100644
index 0000000..8fac6bd
--- /dev/null
+++ b/restaurant/shop/commentdp.vue
@@ -0,0 +1,185 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价店铺</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiRestaurantShop/commentdp', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantShop/commentdp', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/commentlist.vue b/restaurant/shop/commentlist.vue
new file mode 100644
index 0000000..30cbd55
--- /dev/null
+++ b/restaurant/shop/commentlist.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+				<text class="t3">规格：{{item.ggname}}</text>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiRestaurantShop/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/commentps.vue b/restaurant/shop/commentps.vue
new file mode 100644
index 0000000..9ebb888
--- /dev/null
+++ b/restaurant/shop/commentps.vue
@@ -0,0 +1,185 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价配送员</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiRestaurantShop/commentps', {id: id}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var id = that.opt.id;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantShop/commentps', {id: id,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/index.vue b/restaurant/shop/index.vue
new file mode 100644
index 0000000..0293de2
--- /dev/null
+++ b/restaurant/shop/index.vue
@@ -0,0 +1,523 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="view-show">
+			<view class="topbannerbg" :style="business.pic?'background:url('+business.pic+') 100%;background-size:100% auto;':''"></view>
+			<view class="topbannerbg2"></view>
+			<view class="topbanner">
+				<view class="left"><image class="img" :src="business.logo"/></view>
+				<view class="right">
+					<view class="f1">{{business.name}}</view>
+					<view class="f2">{{business.desc}}</view>
+					<!-- <view class="f3"><view class="flex1"></view><view class="t2">收藏<image class="img" :src="event_rul +'/static/img/static/restaurant/like1.png'"/></view></view> -->
+				</view>
+				<image @tap="goSearch" class="searchIcon" :src="event_rul +'/static/img/static/img/search_ico.png'"></image>
+			</view>
+			<view class="navtab">
+				<view class="item" :class="st==0?'on':''" @tap="changetab" data-st="0">点餐<view class="after" :style="{background:t('color1')}"></view></view>
+				<view class="item" :class="st==1?'on':''" @tap="changetab" data-st="1">商家信息<view class="after" :style="{background:t('color1')}"></view></view>
+				<view class="item" :class="st==2?'on':''" @tap="changetab" data-st="2">评价<view class="after" :style="{background:t('color1')}"></view></view>
+			</view>
+			<view v-if="st==0" class="content" style="overflow:hidden;display:flex;margin-top:86rpx"  :style="{height:'calc(100% - '+(menuindex>-1?460:360)+'rpx)'}">
+				<scroll-view class="nav_left" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':''">
+					<block v-for="(item, index) in datalist" :key="index" >
+					<view class="nav_left_items" :class="index===currentActiveIndex?'active':''" @tap="clickRootItem" :data-root-item-id="item.id" :data-root-item-index="index">
+						<view class="before" :style="{background:t('color1')}"></view>
+						{{item.name}}<view class="cartnum" :style="{background:t('color1')}" v-if="numCat[item.id]>0">{{numCat[item.id]}}</view>
+					</view>
+					</block>
+				</scroll-view>
+				<view class="nav_right">
+					<view class="nav_right-content">
+						<scroll-view v-if="datalist && datalist.length > 0" @scroll="scroll" class="detail-list" :scrollIntoView="scrollToViewId" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':''">
+							<view v-for="(detail, index) in datalist" :key="index" class="classification-detail-item">
+								<view class="head" :data-id="detail.id" :id="'detail-' + detail.id">
+									<view class="txt">{{detail.name}}</view>
+									<!-- <view class="show-all" @tap="gotoCatproductPage">查看全部<text class="iconfont iconjiantou"></text></view> -->
+								</view>
+								<view class="product-itemlist">
+									<view class="item" v-for="(item,index) in detail.prolist" :key="item.id" :class="(item.stock <= 0 || item.stock_daily <= item.sales_daily) ? 'soldout' : ''">
+										<view class="product-pic" @click="goto" :data-url="'product?id='+item.id">
+											<image class="image" :src="item.pic" mode="widthFix"/>
+											<view class="overlay"><view class="text">售罄</view></view>
+										</view>
+										<view class="product-info">
+											<view class="p1"><text>{{item.name}}</text></view>
+											<view class="p2">
+												<text class="t1" :style="{color:t('color1')}"><text style="font-size:20rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+												<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+											</view>
+											<view class="p3">
+												<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+												<view class="p3-1" v-if="item.limit_start>0"><text style="overflow:hidden">{{item.limit_start}}件起售</text></view>
+											</view>
+											<!-- <view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" @click.stop="buydialogChange" :data-proid="item.id"><text class="iconfont icon_gouwuche"></text></view> -->
+											<view class="addnum" v-if="item.stock > 0 && item.stock_daily > item.sales_daily">
+												<view v-if="numtotal[item.id]>0" class="minus" @tap.stop="addcart" data-num="-1" :data-proid="item.id" :data-stock="item.stock">-</view>
+												<text v-if="numtotal[item.id]>0" class="i">{{numtotal[item.id]}}</text>
+												<view v-if="item.ggcount>1" class="plus" @tap.stop="buydialogChange" :data-proid="item.id" :data-stock="item.stock">+</view>
+												<view v-else class="plus" @tap.stop="addcart" data-num="1" :data-proid="item.id" :data-ggid="item.gglist[0].id" :data-stock="item.stock">+</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+						<nodata v-if="nodata"></nodata>
+					</view>
+				</view>
+			</view>
+			<view v-if="st==1" class="content1" style="margin-top:86rpx;padding-top:20rpx">
+				<view class="item flex-col">
+					<text class="t1">联系电话</text>
+					<text class="t2"><text v-if="business.tel">{{business.tel}}</text><text v-else>暂无</text></text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">商家地址</text>
+					<text class="t2"><text v-if="business.address">{{business.address}}</text><text v-else>暂无</text></text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">商家简介</text>
+					<text class="t2"><text v-if="business.desc">{{business.desc}}</text><text v-else>暂无</text></text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">营业时间</text>
+					<text class="t2">{{sysset.start_hours}} 至 {{sysset.end_hours}}</text>
+				</view>
+				<view class="item flex-col" v-if="business.zhengming && business.zhengming.length > 0">
+					<text class="t1">证照公示</text>
+					<view id="content_picpreview" class="flex t2" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in business.zhengming" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="st==2" class="content2" style="margin-top:86rpx;padding-top:20rpx">
+				<view class="comment">
+					<block v-if="commentlist.length>0">
+						<view v-for="(item, index) in commentlist" :key="index" class="item">
+							<view class="f1">
+								<image class="t1" :src="item.headimg"/>
+								<view class="t2">{{item.nickname}}</view>
+								<view class="flex1"></view>
+								<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+							</view>
+							<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+							<view class="f2">
+								<text class="t1">{{item.content}}</text>
+								<view class="t2">
+									<block v-if="item.content_pic!=''">
+										<block v-for="(itemp, index) in item.content_pic" :key="index">
+											<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+												<image :src="itemp" mode="widthFix"/>
+											</view>
+										</block>
+									</block>
+								</view>
+							</view>
+							<view class="f3" v-if="item.reply_content">
+								<view class="arrow"></view>
+								<view class="t1">商家回复：{{item.reply_content}}</view>
+							</view>
+						</view>
+					</block>
+					<block v-else>
+						<nodata v-show="comment_nodata"></nodata>
+					</block>
+				</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" @addcart="afteraddcart" :menuindex="menuindex" btntype="1" :needaddcart="false" controller="ApiRestaurantShop"></buydialog>
+		<view style="height:auto;position:relative">
+			<view style="width:100%;height:100rpx"></view>
+			<view class="footer flex" :class="menuindex>-1?'tabbarbot':''">
+				<view class="cart_ico" :style="{background:'linear-gradient(0deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap.stop="handleClickMask"><image class="img" :src="event_rul +'/static/img/static/img/cart.png'"/><view class="cartnum" :style="{background:t('color1')}" v-if="cartList.total>0">{{cartList.total}}</view></view>
+				<view class="text1">合计</view>
+				<view class="text2 flex1" :style="{color:t('color1')}"><text style="font-size:20rpx">￥</text>{{cartList.totalprice}}</view>
+				<view class="op" :style="{background:'linear-gradient(270deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="gopay">下单</view>
+			</view>
+		</view>
+
+		<view v-if="cartListShow" class="popup__container" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':''">
+			<view class="popup__overlay" @tap.stop="handleClickMask" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':''"></view>
+			<view class="popup__modal" style="min-height:400rpx;padding:0">
+				<view class="popup__title" style="border-bottom:1px solid #EFEFEF">
+					<text class="popup__title-text" style="color:#323232;font-weight:bold;font-size:32rpx">购物车</text>
+					<view class="popup__close flex-y-center" @tap.stop="clearShopCartFn" style="color:#999999;font-size:24rpx"><image :src="event_rul +'/static/img/static/img/del.png'" style="width:24rpx;height:24rpx;margin-right:6rpx"/>清空</view>
+				</view>
+				<view class="popup__content" style="padding:0">
+					<scroll-view scroll-y class="prolist">
+						<block v-for="(cart, index) in cartList.list" :key="index">
+							<view class="proitem">
+								<image :src="cart.guige.pic?cart.guige.pic:cart.product.pic" class="pic flex0"></image>
+								<view class="con">
+									<view class="f1">{{cart.product.name}}</view>
+									<view class="f2" v-if="cart.guige.name!='默认规格'">{{cart.guige.name}}</view>
+									<view class="f3" style="color:#ff5555;margin-top:10rpx;font-size:28rpx">￥{{cart.guige.sell_price}}</view>
+								</view>
+								<view class="addnum">
+									<view class="minus"><image class="img" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="addcart" data-num="-1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+									<text class="i">{{cart.num}}</text>
+									<view class="plus"><image class="img" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="addcart" data-num="1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+								</view>
+							</view>
+						</block>
+						<block v-if="!cartList.list.length">
+							<text class="nopro">暂时没有商品喔~</text>
+						</block>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<nomore v-if="nomore"></nomore>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		nomore: false,
+		nodata:false,
+
+		st:0,
+		cartListShow:false,
+		buydialogShow:false,
+		harr:[],
+		business:{},
+		datalist: [],
+		cartList:{},
+		numtotal:[],
+		numCat:{},
+		proid:'',
+		totalprice:'0.00',
+		currentActiveIndex: 0,
+		animation: true,
+		scrollToViewId: "",
+		commentlist:[],
+		comment_nodata:false,
+		comment_nomore:false,
+		sysset:{},
+		tableId:'',
+		type:'index',
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.tableId = this.opt.tableId || '';
+		this.type = this.opt.type || 'index';
+		// this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShow:function(){
+		this.getdata();
+	},
+	onReachBottom: function () {
+		if (this.st == 2) {
+			if (!this.comment_nodata && !this.comment_nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getCommentList(true);
+			}
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantShop/index', {bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				
+				if(res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				
+				that.business = res.business
+				that.datalist = res.data;
+				that.cartList = res.cartList;
+				that.numtotal = res.numtotal;
+				that.numCat = res.numCat;
+				that.sysset = res.sysset;
+
+				//计算每个高度
+				var harr = [];
+				var clientwidth = uni.getSystemInfoSync().windowWidth;
+				var datalist = res.data;
+				if(datalist && datalist.length > 0) {
+					for (var i = 0; i < datalist.length; i++) {
+						var child = datalist[i].prolist;
+						console.log(child)
+						harr.push(Math.ceil(child.length) * 200 / 750 * clientwidth);
+					}
+					that.harr = harr;
+				} else {
+					that.nodata = true;
+				}
+				that.loaded();
+			});
+		},
+		goSearch:function() {
+			var that = this;
+			if(that.opt.bid && that.opt.tableId){
+				app.goto('search?bid=' + that.opt.bid + '&tableId=' + that.opt.tableId);return;
+			}
+			if(that.opt.bid){
+				app.goto('search?bid=' + that.opt.bid);return;
+			}
+			if(that.opt.tableId) {
+				app.goto('search?tableId=' + that.opt.tableId);return;
+			}
+			app.goto('search');
+		},
+		changetab:function(e){
+			this.st = e.currentTarget.dataset.st;
+			this.pagenum = 1;
+			this.commentlist = [];
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+			this.getCommentList();
+		},
+		getCommentList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.commentlist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var st = that.st;
+			that.loading = true;
+			that.comment_nodata = false;
+			that.comment_nomore = false;
+			app.post('ApiRestaurantShop/getdatalist', {id:that.opt.bid,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.commentlist = data;
+          if (data.length == 0) {
+            that.comment_nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.comment_nomore = true;
+          } else {
+            var commentlist = that.commentlist;
+            var newdata = commentlist.concat(data);
+            that.commentlist = newdata;
+          }
+        }
+      });
+		},
+    clickRootItem: function (t) {
+      var e = t.currentTarget.dataset;
+      this.scrollToViewId = 'detail-' + e.rootItemId;
+      this.currentActiveIndex = e.rootItemIndex;
+    },
+		addcart:function(e){
+			var that = this;
+			var ks = that.ks;
+			var num = e.currentTarget.dataset.num;
+			var proid = e.currentTarget.dataset.proid;
+			var ggid = e.currentTarget.dataset.ggid;
+			that.loading = true;
+			app.post('ApiRestaurantShop/addcart', {proid: proid,ggid: ggid,num: num,bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				if (res.status == 1) {
+					that.getdata();
+				} else {
+					app.error(res.msg);
+				}
+			});
+		},
+    //加入购物车弹窗后
+    afteraddcart: function (e) {
+			e.hasoption = false;
+      this.addcart({currentTarget:{dataset:e}});
+    },
+    clearShopCartFn: function () {
+      var that = this;
+      app.post("ApiRestaurantShop/cartclear", {bid:that.opt.bid}, function (res) {
+        that.getdata();
+      });
+    },
+    gopay: function () {
+      var cartList = this.cartList.list;
+      if (cartList.length == 0) {
+        app.alert('请先添加商品到购物车');
+        return;
+      }
+      var prodata = [];
+      for (var i = 0; i < cartList.length; i++) {
+        prodata.push(cartList[i].proid + ',' + cartList[i].ggid + ',' + cartList[i].num);
+      }
+			if(this.tableId==''){
+				app.alert('请先扫描桌台二维码');
+				return;
+			}
+      app.goto('buy?frompage='+this.type+'&tableId='+this.tableId+'&prodata=' + prodata.join('-'));
+    },
+    gotoCatproductPage: function (t) {
+      var e = t.currentTarget.dataset;
+      app.goto('prolist?cid=' + e.id);
+    },
+    scroll: function (e) {
+      var scrollTop = e.detail.scrollTop;
+      var harr = this.harr;
+      var countH = 0;
+      for (var i = 0; i < harr.length; i++) {
+        if (scrollTop >= countH && scrollTop < countH + harr[i]) {
+          this.currentActiveIndex = i;
+          break;
+        }
+        countH += harr[i];
+      }
+    },
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+		handleClickMask:function(){
+			this.cartListShow = !this.cartListShow;
+		}
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 115%;}
+.container{height:100%;overflow:hidden;position: relative;}
+
+.topbannerbg{width:100%;height:264rpx;background:#fff;}
+.topbannerbg2{position:absolute;z-index:7;width:100%;height:264rpx;background:rgba(0,0,0,0.3);top:0}
+.topbanner{position:absolute;z-index:8;width:100%;display:flex;padding:40rpx 20rpx;top:0}
+.topbanner .left{width:160rpx;height:160rpx;flex-shrink:0;margin-right:20rpx}
+.topbanner .left .img{width:100%;height:100%;border-radius:50%}
+.topbanner .right{display:flex;flex-direction:column;padding:20rpx 0}
+.topbanner .right .f1{font-size:36rpx;font-weight:bold;color:#fff}
+.topbanner .right .f2{font-size:22rpx;color:#fff;opacity:0.7;margin-top:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;line-height:30rpx;}
+.topbanner .right .f3{width:100%;display:flex;padding-right:20rpx;margin-top:10rpx}
+.topbanner .right .f3 .t2{display:flex;align-items:center;font-size:24rpx;color:rgba(255,255,255,0.9)}
+.topbanner .right .f3 .img{width:32rpx;height:32rpx;margin-left:10rpx}
+.topbanner .searchIcon {width: 50rpx; height: 50rpx; position: absolute; right: 40rpx; top: 20rpx;}
+
+.navtab{display:flex;width:100%;height:110rpx;background: #fff;position:absolute;z-index:10;padding:0 50rpx;border-radius:24rpx 24rpx 0 0;margin-top:-24rpx;}
+.navtab .item{flex:1;font-size:32rpx; text-align:center; color:#222222; height: 110rpx; line-height: 110rpx;overflow: hidden;position:relative}
+.navtab .item .after{display:none;position:absolute;left:50%;margin-left:-20rpx;bottom:20rpx;height:4px;border-radius:2px;width:40rpx}
+.navtab .on{font-size:36rpx;font-weight:bold}
+.navtab .on .after{display:block}
+
+.content1 .item{display:flex;flex-direction:column;width:100%;padding:0 40rpx;margin-top:40rpx}
+.content1 .item:last-child{ border-bottom: 0;}
+.content1 .item .t1{width:200rpx;color:#2B2B2B;font-weight:bold;font-size:30rpx;height:60rpx;line-height:60rpx}
+.content1 .item .t2{color:#2B2B2B;font-size:24rpx;line-height:30rpx}
+
+.content2 .comment{padding:0 10rpx}
+.content2 .comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.content2 .comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.content2 .comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.content2 .comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.content2 .comment .item .f1 .t3{text-align:right;}
+.content2 .comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.content2 .comment .item .score{ font-size: 24rpx;color:#f99716;}
+.content2 .comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.content2 .comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.content2 .comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.content2 .comment .item .f2 .t2{display:flex;width:100%}
+.content2 .comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.content2 .comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.content2 .comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.content2 .comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.content2 .comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.content2 .comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+.view-show{background-color: white;line-height: 1;width: 100%;height: 100%;}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.nav_left{width: 25%;height:100%;background:#F6F6F6;overflow-y:scroll;padding: 0 0 100rpx 0;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-22rpx;left:0rpx;height:44rpx;border-radius:4rpx;width:6rpx}
+.nav_left .nav_left_items.active .before{display:block}
+.nav_left .nav_left_items .cartnum{position:absolute;top:8rpx;right:8rpx;width:36rpx;height:36rpx;border:1px solid #fff;border-radius:50%;display:flex;align-items:center;justify-content:center;overflow:hidden;font-size:18rpx;color:#fff}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #fff;box-sizing: border-box;padding:0 0 100rpx 0}
+.nav_right-content{background: #ffffff;padding:20rpx 10rpx 20rpx 20rpx;height:100%;position:relative}
+.detail-list {height:100%;overflow:scroll}
+.classification-detail-item {width: 100%;overflow: visible;background:#fff}
+.classification-detail-item .head {height: 82rpx;width: 100%;display: flex;align-items:center;justify-content:space-between;}
+.classification-detail-item .head .txt {color:#222222;font-weight:bold;font-size:28rpx;}
+.classification-detail-item .head .show-all {font-size: 22rpx;color:#949494;display:flex;align-items:center}
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:14rpx 0;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:60rpx}
+.product-itemlist .product-info .p2{margin-top:10rpx;height:36rpx;line-height:36rpx;overflow:hidden;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999; margin-left: 6rpx;}
+.product-itemlist .product-info .p3-1:nth-child(1) {margin: 0;}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.product-itemlist .addnum {position: absolute;right:10rpx;bottom:20rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.product-itemlist .addnum .plus {width:40rpx;height:40rpx;background:#FD4A46;color:#FFFFFF;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .minus {width:40rpx;height:40rpx;background:#FFFFFF;color:#FD4A46;border:1px solid #FD4A46;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .img{width:24rpx;height:24rpx}
+.product-itemlist .addnum .i {padding: 0 20rpx;color:#999999;font-size:28rpx}
+.overlay {background-color: rgba(0,0,0,.5); position: absolute; width:60%; height: 60%; border-radius: 50%; display: none; top: 20%; left: 20%;}
+.overlay .text{ color: #fff; text-align: center; transform: translateY(100%);}
+.product-itemlist .soldout .product-pic .overlay{ display: block;}
+
+.prolist {max-height: 620rpx;min-height: 320rpx;overflow: hidden;padding:0rpx 20rpx;font-size: 28rpx;border-bottom: 1px solid #e6e6e6;}
+.prolist .nopro {text-align: center;font-size: 26rpx;display: block;margin: 80rpx auto;}
+.prolist .proitem{position: relative;padding:10rpx 0;display:flex;border-bottom:1px solid #eee}
+.prolist .proitem .pic{width: 120rpx;height: 120rpx;margin-right: 20rpx;}
+.prolist .proitem .con{padding-right:180rpx;padding-top:10rpx}
+.prolist .proitem .con .f1{color:#323232;font-size:26rpx;line-height:32rpx;margin-bottom: 10rpx;margin-top: -6rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+.prolist .proitem .con .f2{font-size: 24rpx;line-height:28rpx;color: #999;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;}
+.prolist .proitem .addnum {position: absolute;right: 20rpx;bottom:50rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.prolist .proitem .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .img{width:24rpx;height:24rpx}
+.prolist .proitem .addnum .i {padding: 0 20rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx}
+.prolist .tips {font-size: 22rpx;color: #666;text-align: center;line-height: 56rpx;background: #f5f5f5;}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;z-index:8;display:flex;align-items:center;padding:0 20rpx;border-top:1px solid #EFEFEF}
+.footer .cart_ico{width:64rpx;height:64rpx;border-radius: 10rpx;display:flex;align-items:center;justify-content:center;position:relative}
+.footer .cart_ico .img{width:36rpx;height:36rpx;}
+.footer .cart_ico .cartnum{position:absolute;top:-17rpx;right:-17rpx;width:34rpx;height:34rpx;border:1px solid #fff;border-radius:50%;display:flex;align-items:center;justify-content:center;overflow:hidden;font-size:20rpx;font-weight:bold;color:#fff}
+.footer .text1 {height: 100rpx;line-height: 100rpx;color:#555555;font-weight:bold;font-size: 30rpx;margin-left:40rpx;margin-right:10rpx}
+.footer .text2 {font-size: 32rpx;font-weight:bold}
+.footer .op{width: 200rpx;height: 72rpx;line-height:72rpx;border-radius: 36rpx;font-weight:bold;color:#fff;font-size:28rpx;text-align:center}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/logistics.vue b/restaurant/shop/logistics.vue
new file mode 100644
index 0000000..ebe7ce1
--- /dev/null
+++ b/restaurant/shop/logistics.vue
@@ -0,0 +1,299 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<block v-if="express_com=='同城配送'">
+		<map v-if="psorder.status!=0 && psorder.status!=4" class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:psuser.latitude,
+			longitude:psuser.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_qishou.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+		<map v-else class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+
+		<view class="order-box">
+			<view class="head">
+				<view class="f1" v-if="psorder.status==4"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已送达</view>
+				<view class="f1" v-else-if="psorder.leftminute>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">{{psorder.leftminute}}分钟内</text> 送达</view>
+				<view class="f1" v-else-if="psorder.yujitime>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已超时<text class="t1" style="margin-left:10rpx">{{-psorder.leftminute}}分钟</text></view>
+				<view class="f1" v-else><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>配送中</view>
+				<view class="flex1"></view>
+				<view class="f2"><text class="t1">{{orderinfo.freight_price}}</text>元</view>
+			</view>
+			<view class="content" style="border-bottom:0">
+				<view class="f1">
+					<view class="t1"><text class="x1">{{psorder.juli}}</text><text class="x2">{{psorder.juli_unit}}</text></view>
+					<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+					<view class="t3"><text class="x1">{{psorder.juli2}}</text><text class="x2">{{psorder.juli2_unit}}</text></view>
+				</view>
+				<view class="f2">
+					<view class="t1">{{binfo.name}}</view>
+					<view class="t2">{{binfo.address}}</view>
+					<view class="t3">{{orderinfo.address}}</view>
+				</view>
+				<view class="f3" @tap.stop="daohang"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">商品清单({{orderinfo.procount}})</view>
+			<view v-for="(item, idx) in prolist" :key="idx" class="item">
+				<text class="t1 flex1">{{item.name}} {{item.ggname}}</text>
+				<text class="t2 flex0">￥{{item.sell_price}} ×{{item.num}} </text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="psorder.status!=0">
+			<view class="box-title">配送信息</view>
+			<view class="item" v-if="psuser.realname">
+				<text class="t1">配送员</text>
+				<text class="t2"><text style="font-weight:bold">{{psuser.realname}}</text>({{psuser.tel}})</text>
+			</view>
+			<view class="item">
+				<text class="t1">接单时间</text>
+				<text class="t2">{{date(psorder.starttime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.daodiantime">
+				<text class="t1">到店时间</text>
+				<text class="t2">{{date(psorder.daodiantime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.quhuotime">
+				<text class="t1">取货时间</text>
+				<text class="t2">{{date(psorder.quhuotime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.endtime">
+				<text class="t1">送达时间</text>
+				<text class="t2">{{date(psorder.endtime)}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{date(orderinfo.createtime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{date(orderinfo.paytime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{orderinfo.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{orderinfo.product_price}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{orderinfo.totalprice}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{orderinfo.message ? orderinfo.message : '无'}}</text>
+			</view>
+		</view>
+		<view style="width:100%;height:120rpx"></view>
+		<view class="bottom">
+			<view class="f1" v-if="psorder.status!=0 && psuser.tel" @tap="call" :data-tel="psuser.tel"><image :src="event_rul +'/static/img/static/peisong/tel1.png'" class="img"/>联系配送员</view>
+			<view class="f2" v-if="psorder.status!=0" @tap="call" :data-tel="binfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel2.png'" class="img"/>联系商家</view>
+			<view class="btn1" @tap="goto" :data-url="'commentps?id='+psorder.id" v-if="psorder.psid>0 && psorder.status==4">评价配送员</view>
+		</view>
+	</block>
+	<block v-else>
+		<view class="expressinfo">
+			<view class="head">
+				<view class="f1"><image :src="pre_url + '/static/img/feiji.png'"></image></view>
+				<view class="f2">
+					<view class="t1">快递公司：<text style="color:#333">{{express_com}}</text></view>
+					<view class="t2">快递单号：<text style="color:#333">{{express_no}}</text></view>
+				</view>
+			</view>
+			<view class="content">
+				<view v-for="(item, index) in datalist" :key="index" :class="'item ' + (index==0?'on':'')">
+					<view class="f1"><image :src="event_rul +'/static/img/static/img/dot' + (index==0?'2':'1') + '.png'"></image></view>
+					<view class="f2">
+						<text class="t2">{{item.time}}</text>
+						<text class="t1">{{item.context}}</text>
+					</view>
+				</view>
+				<nodata v-if="nodata" text="暂未查找到物流信息"></nodata>
+			</view>
+		</view>
+	</block>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		nodata:false,
+		express_com: '',
+		express_no: '',
+		datalist: [],
+
+		orderinfo: {},
+		prolist: [],
+		binfo: {},
+		psuser: {},
+		psorder: {},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onPullDownRefresh: function () {
+    this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.express_com = that.opt.express_com;
+			that.express_no = that.opt.express_no;
+			that.loading = true;
+			app.get('ApiRestaurantShop/logistics', {express_com: that.express_com,express_no: that.express_no}, function (res) {
+				that.loading = false;
+				if(that.express_com == '同城配送'){
+					that.orderinfo = res.orderinfo;
+					that.prolist = res.prolist;
+					that.binfo = res.binfo;
+					that.psorder = res.psorder;
+					that.psuser = res.psuser;
+					setTimeout(function(){
+						that.getdata();
+					},10000)
+				}else{
+					var datalist = res.datalist;
+					if (datalist.length < 1) {
+						that.nodata = true;
+					}
+					that.datalist = datalist;
+				}
+				that.loaded();
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		}
+  }
+}
+</script>
+<style>
+.expressinfo .head { width:100%;background: #fff; margin:20rpx 0;padding: 20rpx 20rpx;display:flex;align-items:center}
+.expressinfo .head .f1{ width:120rpx;height:120rpx;margin-right:20rpx}
+.expressinfo .head .f1 image{width:100%;height:100%}
+.expressinfo .head .f2{display:flex;flex-direction:column;flex:auto;font-size:30rpx;color:#999999}
+.expressinfo .head .f2 .t1{margin-bottom:8rpx}
+.expressinfo .content{ width: 100%;  background: #fff;display:flex;flex-direction:column;color: #979797;padding:20rpx 40rpx}
+.expressinfo .content .on{color: #23aa5e;}
+.expressinfo .content .item{display:flex;width: 96%;  margin: 0 2%;border-left: 1px #dadada solid;padding:10rpx 0}
+.expressinfo .content .item .f1{ width:40rpx;flex-shrink:0;position:relative}
+.expressinfo .content image{width: 30rpx; height: 30rpx; position: absolute; left: -16rpx; top: 22rpx;}
+/*.content .on image{ top:-1rpx}*/
+.expressinfo .content .item .f1 image{ width: 30rpx; height: 30rpx;}
+
+.expressinfo .content .item .f2{display:flex;flex-direction:column;flex:auto;}
+.expressinfo .content .item .f2 .t1{font-size: 30rpx;}
+.expressinfo .content .item .f2 .t1{font-size: 26rpx;}
+
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;align-items:center;height:100rpx;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/orderdetail.vue b/restaurant/shop/orderdetail.vue
new file mode 100644
index 0000000..cbb33d6
--- /dev/null
+++ b/restaurant/shop/orderdetail.vue
@@ -0,0 +1,424 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.paytypeid != 4">
+				<view class="t1">已成功付款</view>
+			</view>
+			<view class="f1" v-if="detail.status==1 && detail.paytypeid == 4">
+				<view class="t1">请线下支付</view>
+			</view>
+			<view class="f1" v-if="detail.status==12">
+				<view class="t1">商家已接单</view>
+				<view class="t2" v-if="detail.freight_type!=1">请等待配送</view>
+				<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单配送中</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="info">
+				<text class="t1">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" >桌号：{{detail.tableName}}</text>			</view>
+		</view>
+		<view class="btitle flex-y-center">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;" @tap="goto" :data-url="'index?bid=' + detail.bid"></image>
+			<text class="flex1" decode="true" space="true" @tap="goto" :data-url="'index?bid=' + detail.bid" style="padding-left:16rpx">{{detail.binfo.name}}</text>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && item.iscomment==0 && shopset.comment==1" @tap.stop="goto" :data-url="'comment?ogid=' + item.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && item.iscomment==1" @tap.stop="goto" :data-url="'comment?ogid=' + item.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.pack_fee > 0">
+				<text class="t1">打包费</text>
+				<text class="t2 red">+¥{{detail.pack_fee}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.manjian_money > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item" v-if="detail.tea_fee > 0">
+				<text class="t1">{{shopset.tea_fee_text}}</text>
+				<text class="t2 red">+¥{{detail.tea_fee}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.discount_money > 0">
+				<text class="t1">优惠</text>
+				<text class="t2 red">-¥{{detail.discount_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1 && detail.paytypeid != 4">已付款</text>
+				<text class="t2" v-if="detail.status==1 && detail.paytypeid == 4">线下支付</text>
+				<text class="t2" v-if="detail.status==12">商家已接单</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{detail.message ? detail.message : '无'}}</text>
+			</view>
+			<view class="item" v-if="detail.field1">
+				<text class="t1">{{detail.field1data[0]}}</text>
+				<text class="t2 red">{{detail.field1data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field2">
+				<text class="t1">{{detail.field2data[0]}}</text>
+				<text class="t2 red">{{detail.field2data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field3">
+				<text class="t1">{{detail.field3data[0]}}</text>
+				<text class="t2 red">{{detail.field3data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field4">
+				<text class="t1">{{detail.field4data[0]}}</text>
+				<text class="t2 red">{{detail.field4data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field5">
+				<text class="t1">{{detail.field5data[0]}}</text>
+				<text class="t2 red">{{detail.field5data[1]}}</text>
+			</view>
+			<!-- <view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:500rpx;height:500rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+				<text class="flex-x-center">请出示核销码给核销员进行核销</text>
+			</view> -->
+		</view>
+
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+			<!-- <block v-if="detail.status==1">
+				<view class="btn2" @tap="quxiao" :data-id="detail.id">取消订单</view>
+			</block> -->
+			<block v-if="detail.status==12">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+			</block>
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">配送详情</view>
+			</block>
+			<block v-if="detail.status==2">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+			</block>
+			<block v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<!-- <block v-if="detail.status==3 || detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block> -->
+			<block v-if="detail.status==3">
+				<view v-if="iscommentdp==0" class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'commentdp?orderid=' + detail.id">评价店铺</view>
+				<view v-if="iscommentdp==1" class="btn2" @tap="goto" :data-url="'commentdp?orderid=' + detail.id">查看评价</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul + '/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		prodata: '',
+		djs: '',
+		iscommentdp: "0",
+		detail: "",
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantShop/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.iscommentdp = res.iscommentdp,
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				// if (res.lefttime > 0) {
+				// 	interval = setInterval(function () {
+				// 		that.lefttime = that.lefttime - 1;
+				// 		that.getdjs();
+				// 	}, 1000);
+				// }
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiRestaurantShop/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiRestaurantShop/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		quxiao:function(e){
+			var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要取消订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiRestaurantShop/quxiao', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+		},
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('收货中');
+        app.post('ApiRestaurantShop/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/orderlist.vue b/restaurant/shop/orderlist.vue
new file mode 100644
index 0000000..1191fc5
--- /dev/null
+++ b/restaurant/shop/orderlist.vue
@@ -0,0 +1,220 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','已付款','配送中','已完成','退款']" :itemst="['all','0','1','12','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'orderdetail?id=' + item.id">
+					<view class="head">
+						<view class="f1" v-if="item.bid!=0" @tap.stop="goto" :data-url="'/restaurant/shop/index?bid=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+						<view v-else>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1 && item.paytypeid != 4" class="st1">已付款</text>
+						<text v-if="item.status==1 && item.paytypeid == 4" class="st1">线下付款</text>
+						<text v-if="item.status==12" class="st1">已接单</text>
+						<text v-if="item.status==2" class="st2">配送中</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view>
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3"><text class="x1 flex1">￥{{item2.sell_price}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text>共计{{item.procount}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+						<block v-if="item.status==0">
+							<!-- <view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭</view> -->
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'index?tableId='+item.tableid+'&bid='+item.bid">加菜</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+						</block>
+						<block v-if="item.status==12 || item.status==2">
+							<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+						</block>
+						<block v-if="item.status==2">
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id" v-if="item.paytype!='货到付款'">确认收货</view>
+						</block>
+					<!-- 	<block v-if="item.status==3 || item.status==4">
+							<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+						</block> -->
+						<block v-if="item.status==3">
+							<view v-if="item.iscommentdp==0" class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'commentdp?orderid=' + item.id">评价店铺</view>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		codtxt: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiRestaurantShop/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiRestaurantShop/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiRestaurantShop/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+        app.post('ApiRestaurantShop/orderCollect', {orderid: orderid}, function (data) {
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:140rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/product.vue b/restaurant/shop/product.vue
new file mode 100644
index 0000000..1a3141c
--- /dev/null
+++ b/restaurant/shop/product.vue
@@ -0,0 +1,619 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="swiper-container" v-if="isplay==0">
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="500000" @change="swiperChange">
+				<block v-for="(item, index) in product.pics" :key="index">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+					</swiper-item>
+				</block>
+			</swiper>
+			<view class="imageCount">{{current+1}}/{{(product.pics).length}}</view>
+			<view v-if="product.video" class="provideo" @tap="payvideo"><image :src="event_rul +'/static/img/static/img/video.png'"/><view class="txt">{{product.video_duration}}</view></view>
+		</view>
+		<view class="videobox" v-if="isplay==1">
+			<video autoplay="true" class="video" id="video" :src="product.video"></video>
+			<view class="parsevideo" @tap="parsevideo">退出播放</view>
+		</view>
+		<view class="header"> 
+			<view class="price_share">
+				<view class="price">
+					<view class="f1"><text style="font-size:36rpx">￥</text>{{product.sell_price}}</view>
+					<view class="f2" v-if="product.market_price*1 > product.sell_price*1">￥{{product.market_price}}</view>
+				</view>
+				<view class="share" @tap="shareClick"><image class="img" :src="event_rul +'/static/img/static/img/share.png'"/><text class="txt">分享</text></view>
+			</view>
+			<view class="title">{{product.name}}</view>
+			<view class="sales_stock">
+				<view class="f1">销量：{{product.sales}} </view>
+				<view class="f1" v-if="product.limit_start > 0">起售：{{product.limit_start}} </view>
+				<view class="f1" v-if="product.limit_per > 0">限购：{{product.limit_per}} </view>
+				<view class="f2">库存：{{product.stock}}</view>
+			</view>
+			<view class="commission" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="shopset.showcommission==1 && product.commission > 0">分享好友购买可得{{t('佣金')}}：<text style="font-weight:bold;padding:0 2px">{{product.commission}}</text>{{product.commission_desc}}</view>
+		</view>
+		<view class="choose" @tap="buydialogChange" data-btntype="2">
+			<view class="f1 flex1">请选择商品规格及数量</view>
+			<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+		</view>
+		
+		<view class="cuxiaodiv" v-if="product.givescore > 0">
+			<view class="cuxiaopoint">
+				<view class="f0">送{{t('积分')}}</view>
+				<view class="f1" style="font-size:26rpx">购买可得{{t('积分')}}{{product.givescore}}个</view>
+			</view>
+		</view>
+
+		<view class="cuxiaodiv" v-if="cuxiaolist.length>0 || couponlist.length>0">
+			<view class="cuxiaopoint" v-if="cuxiaolist.length>0">
+				<view class="f0">促销</view>
+				<view class="f1" @tap="showcuxiaodetail">
+					<view v-for="(item, index) in cuxiaolist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0">{{item.tip}}</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			<view class="cuxiaopoint" v-if="couponlist.length>0">
+				<view class="f0">优惠</view>
+				<view class="f1" @tap="showcuxiaodetail">
+					<view v-for="(item, index) in couponlist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0" style="padding:0 6px">券</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+		</view>
+		<view v-if="showcuxiaodialog" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidecuxiaodetail"></view>
+			<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">优惠促销</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidecuxiaodetail"/>
+					</view>
+					<view class="popup__content">
+						<view v-for="(item, index) in cuxiaolist" :key="index" class="service-item">
+							<view class="suffix">
+								<view class="type-name"><text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text> <text style="color:#333;margin-left:20rpx">{{item.name}}</text></view>
+							</view>
+						</view>
+						<couponlist :couponlist="couponlist" @getcoupon="getcoupon"></couponlist>
+					</view>
+			</view>
+		</view>
+		<view class="commentbox" v-if="shopset.shop_comment==1 && commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评度 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul +'/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"/></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		<!-- <view class="shop" v-if="shopset.showjd==1">
+			<image :src="business.logo" class="p1"/>
+			<view class="p2 flex1">
+				<view class="t1">{{business.name}}</view>
+				<view class="t2">{{business.desc}}</view>
+			</view>
+			<button class="p4" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="goto" :data-url="product.bid==0?'/pages/index/index':'/pages/business/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+		</view> -->
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+
+		<view style="width:100%;height:140rpx;"></view>
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':''" v-if="product.status==1">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+				<view class="item flex1" @tap="goto" :data-url="'index?bid='+product.bid">
+					<image class="img" :src="event_rul +'/static/img/static/img/gwc.png'"/>
+					<view class="t1">购物车</view>
+					<view class="cartnum" v-if="cartnum>0" :style="{background:'rgba('+t('color1rgb')+',0.8)'}">{{cartnum}}</view>
+				</view>
+				<view class="item" @tap="addfavorite">
+					<image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'"/>
+					<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+				</view>
+			</view>
+			<view class="op" v-if="product.stock > 0 && product.stock_daily > product.sales_daily">
+				<view class="tocart flex-x-center flex-y-center" :style="{background:t('color2')}" @tap="buydialogChange" data-btntype="1" v-if="product.freighttype!=3 && product.freighttype!=4">加入购物车</view>
+			</view>
+			<view class="op" v-else>
+				<view class="tobuy flex-x-center flex-y-center" style="background-color: #ccc;" data-btntype="2">已售罄</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="product.id" :btntype="btntype" @buydialogChange="buydialogChange" @addcart="addcart" :menuindex="menuindex" controller="ApiRestaurantShop"></buydialog>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  
+	data() {
+  
+		return {
+ 
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+
+			isload:false,
+			buydialogShow: false,
+			btntype:1,
+			isfavorite: false,
+			current: 0,
+			isplay: 0,
+			showcuxiaodialog: false,
+			business: "",
+			product: [],
+
+			cartnum: "",
+			commentlist: "",
+			commentcount: "",
+
+			cuxiaolist: "",
+
+			couponlist: "",
+
+			pagecontent: "",
+
+			shopset: "",
+
+			sharetypevisible: false,
+
+			showposter: false,
+
+			posterpic: "",
+
+			scrolltopshow: false,
+			kfurl:'',
+			
+			event_rul: app.globalData.event_url,
+		};
+
+	},
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+
+	onUnload: function () {
+		clearInterval(interval);
+
+	},
+
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.loading = true;
+			app.get('ApiRestaurantShop/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var product = res.product;
+				var pagecontent = JSON.parse(product.detail);
+				that.business = res.business;
+				that.product = product;
+				that.cartnum = res.cartnum;
+				that.commentlist = res.commentlist;
+				that.commentcount = res.commentcount;
+				that.cuxiaolist = res.cuxiaolist;
+				that.couponlist = res.couponlist;
+				that.pagecontent = pagecontent;
+				that.shopset = res.shopset;
+				that.isfavorite = res.isfavorite;
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+				
+				that.kfurl = '/pages/kefu/index?bid='+product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+
+				that.loaded({title:product.name,pic:product.pic});
+			});
+		},
+
+		swiperChange: function (e) {
+
+			var that = this;
+
+			that.current = e.detail.current
+
+		},
+
+		payvideo: function () {
+
+			this.isplay = 1
+;
+			uni.createVideoContext('video').play();
+
+		},
+
+		parsevideo: function () {
+
+			this.isplay = 0
+;
+			uni.createVideoContext('video').stop();
+
+		},
+
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.btntype = e.currentTarget.dataset.btntype
+			}
+
+			this.buydialogShow = !this.buydialogShow;
+
+		},
+		addcart:function(e){
+			this.cartnum += e.num
+		},
+
+		//收藏操作
+
+		addfavorite: function () {
+
+			var that = this;
+
+			var proid = that.product.id;
+
+			app.post('ApiRestaurantShop/addfavorite', {proid: proid,type: 'restaurant'
+}, function (data) {
+
+				if (data.status == 1) {
+
+					that.isfavorite = !that.isfavorite;
+
+				}
+
+
+				app.success(data.msg);
+
+			});
+
+		},
+
+		shareClick: function () {
+
+			this.sharetypevisible = true
+;
+		},
+
+		handleClickMask: function () {
+
+			this.sharetypevisible = false
+
+		},
+
+		showPoster: function () {
+
+			var that = this;
+
+			that.showposter = true;
+			that.sharetypevisible = false;
+			app.showLoading('生成海报中');
+
+			app.post('ApiRestaurantShop/getposter', {
+proid: that.product.id
+}, function (data) {
+
+				app.showLoading(false);
+				if (data.status == 0) {
+
+					app.alert(data.msg);
+
+				} else {
+
+					that.posterpic = data.poster;
+
+				}
+
+			});
+
+		},
+
+		posterDialogClose: function () {
+
+			this.showposter = false;
+
+		},
+
+		showcuxiaodetail: function () {
+
+			this.showcuxiaodialog = true;
+
+		},
+
+		hidecuxiaodetail: function () {
+
+			this.showcuxiaodialog = false
+
+		},
+		getcoupon:function(){
+			this.showcuxiaodialog = false;
+			this.getdata();
+		},
+
+		onPageScroll: function (e) {
+
+			var that = this;
+
+			var scrollY = e.scrollTop;     
+			if (scrollY > 200) {
+				that.scrolltopshow = true
+
+;
+			}
+			if(scrollY < 150) {
+
+				that.scrolltopshow = false
+
+			}
+
+		},
+		
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			that.sharetypevisible = false;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/restaurant/shop/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/restaurant/shop/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+
+	}
+
+};
+</script>
+<style>
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+
+.provideo{background:rgba(255,255,255,0.7);width:160rpx;height:54rpx;padding:0 20rpx 0 4rpx;border-radius:27rpx;position:absolute;bottom:30rpx;left:50%;margin-left:-80rpx;display:flex;align-items:center;justify-content:space-between}
+.provideo image{width:50rpx;height:50rpx;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+
+.videobox{width:100%;height:750rpx;text-align:center;background:#000}
+.videobox .video{width:100%;height:650rpx;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx}
+
+.header {width: 100%;padding: 20rpx 3%;background: #fff;}
+.header .price_share{width:100%;height:100rpx;display:flex;align-items:center;justify-content:space-between}
+.header .price_share .price{display:flex;align-items:flex-end}
+.header .price_share .price .f1{font-size:50rpx;color:#51B539;font-weight:bold}
+.header .price_share .price .f2{font-size:26rpx;color:#C2C2C2;text-decoration:line-through;margin-left:30rpx;padding-bottom:5px}
+.header .price_share .share{display:flex;flex-direction:column;align-items:center;justify-content:center}
+.header .price_share .share .img{width:32rpx;height:32rpx;margin-bottom:2px}
+.header .price_share .share .txt{color:#333333;font-size:20rpx}
+.header .title {color:#000000;font-size:32rpx;line-height:42rpx;font-weight:bold;}
+.header .sales_stock{display:flex;justify-content:space-between;height:60rpx;line-height:60rpx;margin-top:30rpx;font-size:24rpx;color:#777777}
+.header .commission{display:inline-block;margin-top:20rpx;margin-bottom:10rpx;border-radius:10rpx;font-size:20rpx;height:44rpx;line-height:44rpx;padding:0 20rpx}
+
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; }
+.choose .f2{ width: 32rpx; height: 32rpx;}
+
+.cuxiaodiv{background:#fff;margin-top:20rpx;padding: 0 3%;}
+.cuxiaopoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.cuxiaopoint .f0{color:#777777;height:32rpx;font-size:24rpx;padding-right:20rpx;display:flex;justify-content:center;align-items:center}
+.cuxiaopoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.cuxiaopoint .f1 .t{margin-left:10rpx;border-radius:3px;font-size:24rpx;height:40rpx;line-height:40rpx;padding-right:10rpx;flex-shrink:0;overflow:hidden}
+.cuxiaopoint .f1 .t0{display:inline-block;padding:0 5px;}
+.cuxiaopoint .f1 .t1{padding:0 4px}
+.cuxiaopoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.cuxiaopoint .f2 .img{width:32rpx;height:32rpx;}
+.cuxiaodiv .cuxiaopoint{border-bottom:1px solid #E6E6E6;}
+.cuxiaodiv .cuxiaopoint:last-child{border-bottom:0}
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+.service-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.service-item .prefix{padding-top: 2px;}
+.service-item .suffix{padding-left: 10rpx;}
+.service-item .suffix .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:100%;background:#fff;padding:0 3%;margin-top:20rpx}
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{ width: 100%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:100rpx;padding:0 30rpx 0 10rpx;align-items:center;}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:80rpx;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tocart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none; font-size:28rpx;font-weight:bold}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;}
+.bottombar .cartnum{position:absolute;right:4rpx;top:-4rpx;color:#fff;border-radius:50%;width:32rpx;height:32rpx;line-height:32rpx;text-align:center;font-size:22rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/refund.vue b/restaurant/shop/refund.vue
new file mode 100644
index 0000000..2a7220c
--- /dev/null
+++ b/restaurant/shop/refund.vue
@@ -0,0 +1,97 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-content">
+			<view class="form-item">
+				<text class="label">退款原因</text>
+				<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+			</view>
+			<view class="form-item">
+				<text class="label">退款金额(元)</text>
+				<view class="flex"><input name="money" type="number" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: '',
+      totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.orderid = this.opt.orderid,
+		this.totalprice = this.opt.price
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiRestaurantShop/refundinit', {}, function (res) {
+				that.loading = false;
+				that.tmplids = res.tmplids;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+      if (money <= 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantShop/refund', {orderid: orderid,reason: reason,money: money}, function (res) {
+				app.showLoading(false);
+        app.alert(res.msg);
+        if (res.status == 1) {
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goback(true);
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item{ width:100%;padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #f5f5f5 solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/restaurant/shop/search.vue b/restaurant/shop/search.vue
new file mode 100644
index 0000000..3622fd9
--- /dev/null
+++ b/restaurant/shop/search.vue
@@ -0,0 +1,344 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container" :style="history_show?'height:100%;':''">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="搜索菜品" placeholder-style="font-size:24rpx;color:#C2C2C2" @confirm="searchConfirm" @input="searchChange" @focus="searchFocus"></input>
+				</view>
+			</view>
+			<view class="search-history" v-show="history_show">
+				<view>
+					<text class="search-history-title">最近搜索</text>
+					<view class="delete-search-history" @tap="deleteSearchHistory">
+						<image :src="event_rul + '/static/img/static/img/del.png'" style="width:36rpx;height:36rpx"/>
+					</view>
+				</view>
+				<view class="search-history-list">
+					<view v-for="(item, index) in history_list" :key="index" class="search-history-item" :data-value="item" @tap="historyClick">{{item}}
+					</view>
+					<view v-if="!history_list || history_list.length==0" class="flex-y-center"><image :src="event_rul + '/static/img/static/img/tanhao.png'" style="width:36rpx;height:36rpx;margin-right:10rpx"/>暂无记录		</view>
+				</view>
+			</view>
+			<view class="search-navbar" v-show="!history_show">
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="(!field||field=='sort')?'color:'+t('color1'):''" data-field="sort" data-order="desc">综合</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='sales'?'color:'+t('color1'):''" data-field="sales" data-order="desc">销量</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" data-field="sell_price" :data-order="order=='asc'?'desc':'asc'">
+					<text :style="field=='sell_price'?'color:'+t('color1'):''">价格</text>
+					<text class="iconfont iconshangla" :style="field=='sell_price'&&order=='asc'?'color:'+t('color1'):''"></text>
+					<text class="iconfont icon-xia" :style="field=='sell_price'&&order=='desc'?'color:'+t('color1'):''"></text>
+				</view>
+			</view>
+
+			
+		</view>
+		<view class="product-container">
+			<!-- <block v-if="datalist && datalist.length>0">
+				<dp-product-item v-if="productlisttype=='item2'" :data="datalist" :menuindex="menuindex"></dp-product-item>
+				<dp-product-itemlist v-if="productlisttype=='itemlist'" :data="datalist" :menuindex="menuindex"></dp-product-itemlist>
+			</block> -->
+			<view class="product-itemlist" v-if="datalist && datalist.length>0">
+				<view class="item" v-for="(item,index) in datalist" :key="item.id" :class="(item.stock <= 0 || item.stock_daily <= item.sales_daily) ? 'soldout' : ''">
+					<view class="product-pic" @click="goto" :data-url="'product?id='+item.id">
+						<image class="image" :src="item.pic" mode="widthFix"/>
+						<view class="overlay"><view class="text">售罄</view></view>
+					</view>
+					<view class="product-info">
+						<view class="p1"><text>{{item.name}}</text></view>
+						<view class="p2">
+							<text class="t1" :style="{color:t('color1')}"><text style="font-size:20rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+							<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+						</view>
+						<view class="p3">
+							<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+							<view class="p3-1" v-if="item.limit_start>0"><text style="overflow:hidden">{{item.limit_start}}件起售</text></view>
+						</view>
+						<!-- <view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" @click.stop="buydialogChange" :data-proid="item.id"><text class="iconfont icon_gouwuche"></text></view> -->
+						<view class="addnum" v-if="item.stock > 0 && item.stock_daily > item.sales_daily">
+							<view v-if="item.ggcount>1" class="plus" @tap.stop="buydialogChange" :data-proid="item.id" :data-stock="item.stock">+</view>
+							<view v-else class="plus" @tap.stop="addcart" data-num="1" :data-proid="item.id" :data-ggid="item.gglist[0].id" :data-stock="item.stock">+</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" @addcart="afteraddcart" :menuindex="menuindex" btntype="1" :needaddcart="false" controller="ApiRestaurantShop"></buydialog>
+			
+			<nomore text="没有更多菜品了" v-if="nomore"></nomore>
+			<nodata text="没有查找到相关菜品" v-if="nodata"></nodata>
+			<loading v-if="loading"></loading>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+	<popmsg ref="popmsg"></popmsg>
+</view>
+</template>
+
+<script>
+var app = getApp();
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: true,
+		menuindex:-1,
+
+		nomore:false,
+		nodata:false,
+		buydialogShow:false,
+		keyword: '',
+		pagenum: 1,
+		datalist: [],
+		history_list: [],
+		history_show: true,
+		order: '',
+		field:'',
+		oldcid: "",
+		proid:'',
+		cid: "",
+		gid: '',
+		clist: [],
+		clist2: [],
+		glist: [],
+		productlisttype: 'item2',
+		cpid:0,
+		bid:0,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid || '';
+		this.cid = this.opt.cid;
+		this.gid = this.opt.gid;
+		this.cpid = this.opt.cpid || 0;
+		this.bid = this.opt.bid ? this.opt.bid : 0;
+		//console.log(this.bid);
+		if(this.cpid > 0){
+			uni.setNavigationBarTitle({
+				title: '可用菜品列表'
+			});
+		}
+    var productlisttype = app.getCache('productlisttype');
+    if (productlisttype) this.productlisttype = productlisttype;
+		this.history_list = app.getCache('search_history_list_rest_shop');
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getprolist();
+    }
+  },
+  methods: {
+		getdata:function(){
+			var that = this;
+			that.pagenum = 1;
+			that.datalist = [];
+			var cid = that.opt.cid;
+			var gid = that.opt.gid;
+			var bid = that.opt.bid ? that.opt.bid : '';
+			that.loading = true;
+			that.getprolist();
+			that.loaded();
+		},
+    getprolist: function () {
+      var that = this;
+      var pagenum = that.pagenum;
+      var keyword = that.keyword;
+      var order = that.order;
+      var field = that.field;
+      var gid = that.gid;
+      var cid = that.cid;
+      var cpid = that.cpid;
+      that.history_show = false;
+			that.loading = true;
+			that.nodata = false;
+      that.nomore = false;
+			var bid = that.opt.bid ? that.opt.bid : '';
+      app.post('ApiRestaurantShop/getprolist',{pagenum: pagenum,keyword: keyword,field: field,order: order,gid: gid,cid: cid,cpid:cpid,bid:bid}, function (res) {
+				that.loading = false;
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    searchChange: function (e) {
+      this.keyword = e.detail.value;
+      if (e.detail.value == '') {
+        this.history_show = true;
+        this.datalist = [];
+      }
+    },
+		searchFocus: function (e) {
+      this.history_show = true;
+    },
+    searchbtn: function () {
+      var that = this;
+      if (that.history_show) {
+        var keyword = that.keyword;
+        that.searchproduct();
+      } else {
+        if (that.productlisttype == 'itemlist') {
+          that.productlisttype = 'item2';
+          app.setCache('productlisttype', 'item2');
+        } else {
+          that.productlisttype = 'itemlist';
+          app.setCache('productlisttype', 'itemlist');
+        }
+      }
+    },
+    searchConfirm: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword
+      that.searchproduct();
+    },
+    searchproduct: function () {
+      var that = this;
+      that.pagenum = 1;
+      that.datalist = [];
+      that.addHistory();
+      that.getprolist();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.searchproduct();
+    },
+    addHistory: function () {
+      var that = this;
+      var keyword = that.keyword;
+      if (app.isNull(keyword)) return;
+      var historylist = app.getCache('search_history_list_rest_shop');
+      if (app.isNull(historylist)) historylist = [];
+      historylist.unshift(keyword);
+      var newhistorylist = [];
+      for (var i in historylist) {
+        if (historylist[i] != keyword || i == 0) {
+          newhistorylist.push(historylist[i]);
+        }
+      }
+      if (newhistorylist.length > 5) newhistorylist.splice(5, 1);
+      app.setCache('search_history_list_rest_shop', newhistorylist);
+      that.history_list = newhistorylist
+    },
+    historyClick: function (e){
+      var that = this;
+      var keyword = e.currentTarget.dataset.value;
+      if (keyword.length == 0) return;
+      that.keyword = keyword;
+      that.searchproduct();
+    },
+    deleteSearchHistory: function () {
+      var that = this;
+      that.history_list = null;
+      app.removeCache("search_history_list_rest_shop");
+    },
+		
+		addcart:function(e){
+			var that = this;
+			var ks = that.ks;
+			var num = e.currentTarget.dataset.num;
+			var proid = e.currentTarget.dataset.proid;
+			var ggid = e.currentTarget.dataset.ggid;
+			that.loading = true;
+			app.post('ApiRestaurantShop/addcart', {proid: proid,ggid: ggid,num: num,bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				if (res.status == 1) {
+					app.success(res.msg ? res.msg : '添加成功')
+				} else {
+					app.error(res.msg);
+				}
+			});
+		},
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+    //加入购物车弹窗后
+    afteraddcart: function (e) {
+			e.hasoption = false;
+      this.addcart({currentTarget:{dataset:e}});
+    },
+  }
+};
+</script>
+<style>
+.search-container {position: fixed;width: 100%;background: #fff;z-index:9;top:var(--window-top)}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+.topsearch .search-btn{display:flex;align-items:center;color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.search-navbar {display: flex;text-align: center;align-items:center;padding:5rpx 0}
+.search-navbar-item {flex: 1;height: 70rpx;line-height: 70rpx;position: relative;font-size:28rpx;font-weight:bold;color:#323232}
+
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+.search-history {padding: 24rpx 34rpx;}
+.search-history .search-history-title {color: #666;}
+.search-history .delete-search-history {float: right;padding: 15rpx 20rpx;margin-top: -15rpx;}
+.search-history-list {padding: 24rpx 0 0 0;}
+.search-history-list .search-history-item {display: inline-block;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;margin: 0 10rpx 10rpx 0;background: #ddd;border-radius: 10rpx;font-size: 26rpx;}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 30rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.product-container {width: 100%;margin-top: 190rpx;font-size:26rpx;padding:0 24rpx}
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:14rpx 0;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:60rpx}
+.product-itemlist .product-info .p2{margin-top:10rpx;height:36rpx;line-height:36rpx;overflow:hidden;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.product-itemlist .addnum {position: absolute;right:10rpx;bottom:20rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.product-itemlist .addnum .plus {width:40rpx;height:40rpx;background:#FD4A46;color:#FFFFFF;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .minus {width:40rpx;height:40rpx;background:#FFFFFF;color:#FD4A46;border:1px solid #FD4A46;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .img{width:24rpx;height:24rpx}
+.product-itemlist .addnum .i {padding: 0 20rpx;color:#999999;font-size:28rpx}
+.overlay {background-color: rgba(0,0,0,.5); position: absolute; width:60%; height: 60%; border-radius: 50%; display: none; top: 20%; left: 20%;}
+.overlay .text{ color: #fff; text-align: center; transform: translateY(100%);}
+.product-itemlist .soldout .product-pic .overlay{ display: block;}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/blist.vue b/restaurant/takeaway/blist.vue
new file mode 100644
index 0000000..a09de96
--- /dev/null
+++ b/restaurant/takeaway/blist.vue
@@ -0,0 +1,283 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="search-container">
+			<view class="topsearch flex-y-center">
+				<view class="f1 flex-y-center">
+					<image class="img" :src="event_rul + '/static/img/static/img/search_ico.png'"></image>
+					<input :value="keyword" placeholder="搜索你感兴趣的商家" placeholder-style="font-size:24rpx;color:#C2C2C2" confirm-type="search" @confirm="search"></input>
+				</view>
+			</view>
+			<view class="search-navbar">
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='juli'?'color:'+t('color1'):''" data-field="juli" data-order="asc">距离最近</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" :style="field=='comment_score'?'color:'+t('color1'):''" data-field="comment_score" data-order="desc">评分排序</view>
+				<view @tap.stop="sortClick" class="search-navbar-item" data-field="sales" :data-order="order=='asc'?'desc':'asc'">
+					<text :style="field=='sales'?'color:'+t('color1'):''">销量排序</text>
+					<text class="iconfont iconshangla" :style="field=='sales'&&order=='asc'?'color:'+t('color1'):''"></text>
+					<text class="iconfont icon-xia" :style="field=='sales'&&order=='desc'?'color:'+t('color1'):''"></text>
+				</view>
+				<view class="search-navbar-item flex-x-center flex-y-center" @click.stop="showDrawer('showRight')">筛选 <text :class="'iconfont iconshaixuan ' + (showfilter?'active':'')"></text></view>
+			</view>
+		</view>
+		<uni-drawer ref="showRight" mode="right" @change="change($event,'showRight')" :width="280">
+			<view class="filter-scroll-view">
+				<scroll-view class="filter-scroll-view-box" scroll-y="true">
+					<view class="search-filter">
+						<view class="filter-title">筛选</view>
+						<view class="filter-content-title">商家分类</view>
+						<view class="search-filter-content">
+							<view class="filter-item" :style="catchecid==oldcid?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="oldcid">全部</view>
+							<block v-for="(item, index) in clist" :key="index">
+								<view class="filter-item" :style="catchecid==item.id?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.1)':''" @tap.stop="cateClick" :data-cid="item.id">{{item.name}}</view>
+							</block>
+						</view>
+						<view class="search-filter-btn">
+							<view class="btn" @tap="filterReset">重置</view>
+							<view class="btn2" :style="{background:t('color1')}" @tap="filterConfirm">确定</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-drawer>
+		
+		<view class="ind_business">
+			<view class="ind_buslist" id="datalist">
+				<block v-for="(item, index) in datalist" :key="index">
+				<view @tap="goto" :data-url="'index?bid=' + item.id">
+					<view class="ind_busbox flex1 flex-row">
+						<view class="ind_buspic flex0"><image :src="item.logo"></image></view>
+						<view>
+							<view class="bus_title">{{item.name}}</view>
+							<view class="bus_sales">销量：{{item.sales}}</view>
+							<view class="bus_score">
+								<image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.comment_score>item2?'2':'') + '.png'"/>
+								<view class="txt">{{item.comment_score}}分</view>
+							</view>
+							<view class="bus_address"><text class="x1">{{item.address}}</text><text class="x2">{{item.juli}}</text></view>
+							<view class="prolist" v-if="(item.prolist).length > 0">
+								<view v-for="(item2, index2) in item.prolist" :key="index2" class="product" @tap.stop="goto" :data-url="'product?id=' + item2.id">
+									<image class="f1" :src="item2.pic"></image>
+									<view class="f2">￥{{item2.sell_price}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				</block>
+				<nomore v-if="nomore"></nomore>
+				<nodata v-if="nodata"></nodata>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		field: 'juli',
+		order:'asc',
+		oldcid: "",
+		catchecid: "",
+		longitude: '',
+		latitude: '',
+		clist:[],
+		datalist: [],
+		pagenum: 1,
+		keyword: '',
+		cid: '',
+		nomore: false,
+		nodata: false,
+		types: "",
+		showfilter: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.oldcid = this.opt.cid;
+		this.catchecid = this.opt.cid;
+		this.cid = this.opt.cid;
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getDataList(true);
+    }
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/blist', {}, function (res) {
+				that.loading = false;
+				that.clist = res.clist;
+				that.loaded();
+			});
+			app.getLocation(function (res) {
+				var latitude = res.latitude;
+				var longitude = res.longitude;
+				that.longitude = longitude;
+				that.latitude = latitude;
+				that.getDataList();
+			},
+			function () {
+				that.getDataList();
+			});
+		},
+    getDataList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var latitude = that.latitude;
+      var longitude = that.longitude;
+      var keyword = that.keyword;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiRestaurantTakeaway/blist', {pagenum: pagenum,cid: that.cid,field: that.field,order: that.order,longitude: longitude,latitude: latitude,keyword: keyword}, function (res) {
+        that.loading = false;
+				uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+		// 打开窗口
+		showDrawer(e) {
+			console.log(e)
+			this.$refs[e].open()
+		},
+		// 关闭窗口
+		closeDrawer(e) {
+			this.$refs[e].close()
+		},
+		// 抽屉状态发生变化触发
+		change(e, type) {
+			console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+			this[type] = e
+		},
+    cateClick: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+      that.catchecid = cid
+    },
+		filterConfirm(){
+			this.cid = this.catchecid;
+			this.gid = this.catchegid;
+			this.getDataList();
+			this.$refs['showRight'].close()
+		},
+		filterReset(){
+			this.catchecid = this.oldcid;
+			this.catchegid = '';
+		},
+    filterClick: function () {
+      this.showfilter = !this.showfilter
+    },
+    changetab: function (e) {
+      var that = this;
+      var cid = e.currentTarget.dataset.cid;
+      that.cid = cid
+      that.pagenum = 1;
+      that.datalist = [];
+      that.getDataList();
+    },
+    search: function (e) {
+      var that = this;
+      var keyword = e.detail.value;
+      that.keyword = keyword;
+			that.pagenum = 1;
+      that.datalist = [];
+      that.getDataList();
+    },
+    sortClick: function (e) {
+      var that = this;
+      var t = e.currentTarget.dataset;
+      that.field = t.field;
+      that.order = t.order;
+      that.getDataList();
+    },
+    filterClick: function (e) {
+      var that = this;
+      var types = e.currentTarget.dataset.types;
+      that.types = types;
+    }
+  }
+};
+</script>
+<style>
+.search-container {position: fixed;width: 100%;background: #fff;z-index:9;top:var(--window-top)}
+.topsearch{width:100%;padding:16rpx 20rpx;}
+.topsearch .f1{height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.topsearch .f1 .img{width:24rpx;height:24rpx;margin-left:10px}
+.topsearch .f1 input{height:100%;flex:1;padding:0 20rpx;font-size:28rpx;color:#333;}
+.topsearch .search-btn{display:flex;align-items:center;color:#5a5a5a;font-size:30rpx;width:60rpx;text-align:center;margin-left:20rpx}
+.search-navbar {display: flex;text-align: center;align-items:center;padding:5rpx 0}
+.search-navbar-item {flex: 1;height: 70rpx;line-height: 70rpx;position: relative;font-size:28rpx;font-weight:bold;color:#323232}
+.search-navbar-item .iconshangla{position: absolute;top:-4rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .icondaoxu{position: absolute;top: 8rpx;padding: 0 6rpx;font-size: 20rpx;color:#7D7D7D}
+.search-navbar-item .iconshaixuan{margin-left:10rpx;font-size:22rpx;color:#7d7d7d}
+
+.filter-scroll-view{margin-top:var(--window-top)}
+.search-filter{display: flex;flex-direction: column;text-align: left;width:100%;flex-wrap:wrap;padding:0;}
+.filter-content-title{color:#999;font-size:28rpx;height:30rpx;line-height:30rpx;padding:0 30rpx;margin-top:30rpx;margin-bottom:10rpx}
+.filter-title{color:#BBBBBB;font-size:32rpx;background:#F8F8F8;padding:60rpx 0 30rpx 20rpx;}
+.search-filter-content{display: flex;flex-wrap:wrap;padding:10rpx 20rpx;}
+.search-filter-content .filter-item{background:#F4F4F4;border-radius:28rpx;color:#2B2B2B;font-weight:bold;margin:10rpx 10rpx;min-width:140rpx;height:56rpx;line-height:56rpx;text-align:center;font-size: 24rpx;padding:0 30rpx}
+.search-filter-content .close{text-align: right;font-size:24rpx;color:#ff4544;width:100%;padding-right:20rpx}
+.search-filter button .icon{margin-top:6rpx;height:54rpx;}
+.search-filter-btn{display:flex;padding:30rpx 30rpx;justify-content: space-between}
+.search-filter-btn .btn{width:240rpx;height:66rpx;line-height:66rpx;background:#fff;border:1px solid #e5e5e5;border-radius:33rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx;text-align:center}
+.search-filter-btn .btn2{width:240rpx;height:66rpx;line-height:66rpx;border-radius:33rpx;color:#fff;font-weight:bold;font-size:24rpx;text-align:center}
+
+.ind_business {width: 100%;margin-top: 190rpx;font-size:26rpx;padding:0 24rpx}
+.ind_business .ind_busbox{ background: #fff;padding:20rpx;overflow: hidden; margin-bottom:20rpx;border-radius:8rpx;position:relative}
+.ind_business .ind_buspic{ width:120rpx;height:120rpx; margin-right: 28rpx; }
+.ind_business .ind_buspic image{ width: 100%;height:100%;border-radius: 8rpx;object-fit: cover;}
+.ind_business .bus_title{ font-size: 28rpx; color: #222;font-weight:bold;line-height: 40rpx}
+.ind_business .bus_score{font-size: 24rpx;color:#FC5648;display:flex;align-items:center}
+.ind_business .bus_score .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.ind_business .bus_score .txt{margin-left:20rpx}
+.ind_business .indsale_box{ display: flex}
+.ind_business .bus_sales{ font-size: 24rpx; color:#999;position:absolute;top:20rpx;right:28rpx}
+
+.ind_business .bus_address{color:#999;font-size: 24rpx;height:30rpx;line-height: 30rpx;overflow:hidden;margin-top:6rpx}
+.ind_business .bus_address .x2{padding-left:20rpx}
+.ind_business .prolist{width:100%;margin-top:16rpx;overflow:hidden;display:flex;}
+.ind_business .prolist .product{width:108rpx;overflow:hidden;display:flex;flex-direction:column;align-items:center;margin-right:24rpx}
+.ind_business .prolist .product .f1{width:108rpx;height:108rpx;border-radius:8rpx;background:#f6f6f6}
+.ind_business .prolist .product .f2{font-size:22rpx;color:#FC5648;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/buy.vue b/restaurant/takeaway/buy.vue
new file mode 100644
index 0000000..c8a9fff
--- /dev/null
+++ b/restaurant/takeaway/buy.vue
@@ -0,0 +1,754 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view v-if="needaddress==0" class="address-add">
+			<view class="linkitem">
+				<text class="f1">联 系 人：</text>
+				<input type="text" class="input" :value="linkman" placeholder="请输入您的姓名" @input="inputLinkman" placeholder-style="color:#626262;font-size:28rpx"/>
+			</view>
+			<view class="linkitem">
+				<text class="f1">联系电话：</text>
+				<input type="text" class="input" :value="tel" placeholder="请输入您的手机号" @input="inputTel" placeholder-style="color:#626262;font-size:28rpx"/>
+			</view>
+		</view>
+		<view v-else class="address-add flex-y-center" @tap="goto" :data-url="'/pages/address/'+(address.id ? 'address' : 'addressadd')+'?fromPage=buy&type=' + (havetongcheng==1?'1':'0')">
+			<view class="f1"><image class="img" :src="event_rul +'/static/img/static/img/address.png'"/></view>
+			<view class="f2 flex1" v-if="address.id">
+				<view style="font-weight:bold;color:#111111;font-size:30rpx">{{address.name}} {{address.tel}} <text v-if="address.company">{{address.company}}</text></view>
+				<view style="font-size:24rpx">{{address.area}} {{address.address}}</view>
+			</view>
+			<view v-else class="f2 flex1">请选择收货地址</view>
+			<image :src="event_rul +'/static/img/static/img/arrowright.png'" class="f3"></image>
+		</view>
+		<view v-for="(buydata, index) in allbuydata" :key="index" class="buydata">
+			<view class="btitle"><image class="img" :src="event_rul +'/static/img/static/img/ico-shop.png'"/>{{buydata.business.name}}</view>
+			<view class="bcontent">
+				<view class="product">
+					<view v-for="(item, index2) in buydata.prodata" :key="index2" class="item flex">
+						<view class="img" @tap="goto" :data-url="'product?id=' + item.product.id"><image :src="item.product.pic"></image></view>
+						<view class="info flex1">
+							<view class="f1">{{item.product.name}}</view>
+							<view class="f2">规格：{{item.guige.name}}</view>
+							<view class="f3"><text style="font-weight:bold;">￥{{item.guige.sell_price}}</text><text style="padding-left:20rpx"> × {{item.num}}</text></view>
+						</view>
+					</view>
+				</view>
+				<view class="freight">
+					<view class="f1">配送方式</view>
+					<view class="freight-ul">
+						<view class="flex" style="width:100%;overflow-y:hidden;overflow-x:scroll;">
+						 <block v-for="(item, idx2) in buydata.freightList" :key="idx2">
+						 <view class="freight-li" :style="buydata.freightkey==idx2?'color:'+t('color1')+';background:rgba('+t('color1rgb')+',0.2)':''" @tap="changeFreight" :data-bid="buydata.bid" :data-index="idx2">{{item.name}}</view>
+						 </block>
+						</view>
+					</view>
+					<view class="freighttips" v-if="buydata.freightList[buydata.freightkey].minpriceset==1 && buydata.freightList[buydata.freightkey].minprice > 0 && buydata.freightList[buydata.freightkey].minprice > buydata.product_price">满{{buydata.freightList[buydata.freightkey].minprice}}元起送，还差{{buydata.freightList[buydata.freightkey].minprice - buydata.product_price}}元</view>
+					<view class="freighttips" v-if="buydata.freightList[buydata.freightkey].isoutjuli==1">超出配送范围</view>
+				</view>
+
+				<view class="price" v-if="buydata.freightList[buydata.freightkey].pstimeset==1">
+					<view class="f1">{{buydata.freightList[buydata.freightkey].pstype==1?'取货':'配送'}}时间</view>
+					<view class="f2" @tap="choosePstime" :data-bid="buydata.bid">{{buydata.pstimetext==''?'请选择时间':buydata.pstimetext}}<text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+				<view class="storeitem" v-if="buydata.freightList[buydata.freightkey].pstype==1">
+					<view class="panel">
+						<view class="f1">取货地点</view>
+						<view class="f2" @tap="openLocation" :data-bid="buydata.bid" :data-freightkey="buydata.freightkey" :data-storekey="buydata.freightList[buydata.freightkey].storekey"><text class="iconfont icondingwei"></text>{{buydata.freightList[buydata.freightkey].storedata[buydata.freightList[buydata.freightkey].storekey].name}}</view>
+					</view>
+					<block v-for="(item, idx) in buydata.freightList[buydata.freightkey].storedata" :key="idx">
+						<view class="radio-item" @tap.stop="choosestore" :data-bid="buydata.bid" :data-index="idx">
+							<view class="f1">{{item.name}} </view>
+							<text style="color:#f50;">{{item.juli}}</text>
+							<view class="radio" :style="buydata.freightList[buydata.freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</block>
+				</view>
+				<view class="storeitem" v-if="buydata.freightList[buydata.freightkey].pstype==5">
+					<view class="panel">
+						<view class="f1">配送门店</view>
+						<view class="f2" @tap="openMendian" :data-bid="buydata.bid"
+							:data-freightkey="buydata.freightkey"
+							:data-storekey="buydata.freightList[buydata.freightkey].storekey"><text
+								class="iconfont icondingwei"></text>{{buydata.freightList[buydata.freightkey].storedata[buydata.freightList[buydata.freightkey].storekey].name}}
+						</view>
+					</view>
+					<block v-for="(item, idx) in buydata.freightList[buydata.freightkey].storedata" :key="idx">
+						<view class="radio-item" @tap.stop="choosestore" :data-bid="buydata.bid" :data-index="idx" v-if="idx<5 || storeshowall==true">
+							<view class="f1">{{item.name}} </view>
+							<text style="color:#f50;">{{item.juli}}</text>
+							<view class="radio"
+								:style="buydata.freightList[buydata.freightkey].storekey==idx ? 'background:'+t('color1')+';border:0' : ''">
+								<image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'" />
+							</view>
+						</view>
+					</block>
+					<view v-if="storeshowall==false && (buydata.freightList[buydata.freightkey].storedata).length > 5" class="storeviewmore" @tap="doStoreShowAll">- 查看更多 - </view>
+				</view>
+
+				<view class="price">
+					<text class="f1">商品金额</text>
+					<text class="f2">¥{{buydata.product_price}}</text>
+				</view>
+				<view class="price" v-if="buydata.leveldk_money>0">
+					<text class="f1">{{t('会员')}}折扣({{userinfo.discount}}折)</text>
+					<text class="f2">-¥{{buydata.leveldk_money}}</text>
+				</view>
+				<view class="price" v-if="buydata.manjian_money>0">
+					<text class="f1">满减活动</text>
+					<text class="f2">-¥{{buydata.manjian_money}}</text>
+				</view>
+				<view class="price">
+					<text class="f1">{{buydata.freightList[buydata.freightkey].freight_price_txt || '运费'}}</text>
+					<text class="f2">+¥{{buydata.freightList[buydata.freightkey].freight_price}}</text>
+				</view>
+				<view class="price" v-if="buydata.pack_fee>0">
+					<text class="f1">打包费</text>
+					<text class="f2">+¥{{buydata.pack_fee}}</text>
+				</view>
+				<view class="price">
+					<view class="f1">{{t('优惠券')}}</view>
+					<view v-if="buydata.couponCount > 0" class="f2" @tap="showCouponList" :data-bid="buydata.bid"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{buydata.couponrid!=0?buydata.couponList[buydata.couponkey].couponname:buydata.couponCount+'张可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+					<text class="f2" v-else style="color:#999">无可用{{t('优惠券')}}</text>
+				</view>
+				<view class="price" v-if="buydata.cuxiaoCount > 0">
+					<view class="f1">促销活动</view>
+					<view class="f2" @tap="showCuxiaoList" :data-bid="buydata.bid"><text style="color:#fff;padding:4rpx 16rpx;font-weight:normal;border-radius:8rpx;font-size:24rpx" :style="{background:t('color1')}">{{buydata.cuxiaoname?buydata.cuxiaoname:buydata.cuxiaoCount+'个可用'}}</text><text class="iconfont iconjiantou" style="color:#999;font-weight:normal"></text></view>
+				</view>
+				<block v-for="(item,idx) in buydata.freightList[buydata.freightkey].field_list">
+				<view class="remark" v-if="item.isshow==1">
+					<text class="f1">{{item.name}}</text>
+					<input type="text" class="flex1" :placeholder="item.tips || '请输入'+item.name" @input="inputfield" :data-field="idx" :data-bid="buydata.bid" placeholder-style="color:#cdcdcd;font-size:28rpx"></input>
+				</view>
+				</block>
+			</view>
+		</view>
+		
+		<view class="scoredk" v-if="userinfo.score2money>0 && (userinfo.scoremaxtype==0 || (userinfo.scoremaxtype==1 && userinfo.scoredkmaxmoney>0))">
+			<checkbox-group @change="scoredk" class="flex" style="width:100%">
+				<view class="f1">
+					<view>{{userinfo.score*1}} {{t('积分')}}可抵扣 <text style="color:#e94745">{{userinfo.scoredk_money*1}}</text> 元</view>
+					<view style="font-size:22rpx;color:#999" v-if="userinfo.scoremaxtype==0 && userinfo.scoredkmaxpercent > 0 && userinfo.scoredkmaxpercent<100">最多可抵扣订单金额的{{userinfo.scoredkmaxpercent}}%</view>
+					<view style="font-size:22rpx;color:#999" v-else-if="userinfo.scoremaxtype==1">最多可抵扣{{userinfo.scoredkmaxmoney}}元</view>
+				</view>
+				<view class="f2">使用{{t('积分')}}抵扣
+					<checkbox value="1" style="margin-left:6px;transform:scale(.8)"></checkbox>
+				</view>
+			</checkbox-group>
+		</view>
+		<view style="width: 100%; height:110rpx;"></view>
+		<view class="footer flex">
+			<view class="text1 flex1">总计：
+				<text style="font-weight:bold;font-size:36rpx">￥{{alltotalprice}}</text>
+			</view>
+			<view class="op" @tap="topay" :style="{background:'linear-gradient(-90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}">提交订单</view>
+		</view>
+
+		<view v-if="couponvisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{t('优惠券')}}</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<couponlist :couponlist="allbuydata[bid].couponList" :choosecoupon="true" :selectedrid="allbuydata[bid].couponrid" :bid="bid" @chooseCoupon="chooseCoupon"></couponlist>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="pstimeDialogShow" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidePstimeDialog"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">请选择{{allbuydata[nowbid].freightList[allbuydata[nowbid].freightkey].pstype==1?'取货':'配送'}}时间</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view>
+				<view class="popup__content">
+					<view class="pstime-item" v-for="(item, index) in allbuydata[nowbid].freightList[allbuydata[nowbid].freightkey].pstimeArr" :key="index" @tap="pstimeRadioChange" :data-index="index">
+						<view class="flex1">{{item.title}}</view>
+						<view class="radio" :style="allbuydata[nowbid].freight_time==item.value ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="cuxiaovisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal">
+				<view class="popup__title">
+					<text class="popup__title-text">优惠促销</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="handleClickMask"/>
+				</view>
+				<view class="popup__content">
+					<view class="cuxiao-desc">
+						<view class="cuxiao-item" @tap="changecx" data-id="0">
+							<view class="type-name"><text style="color:#333">不使用促销</text></view>
+							<view class="radio" :style="cxid==0 ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+						<view v-for="(item, index) in allbuydata[bid].cuxiaolist" :key="index" class="cuxiao-item" @tap="changecx" :data-id="item.id">
+							<view class="type-name"><text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text> <text style="color:#333;padding-left:20rpx">{{item.name}}</text></view>
+							<view class="radio" :style="cxid==item.id ? 'background:'+t('color1')+';border:0' : ''"><image class="radio-img" :src="event_rul +'/static/img/static/img/checkd.png'"/></view>
+						</view>
+					</view>
+					<view id="cxproinfo" v-if="cuxiaoinfo.product" style="padding:0 40rpx">
+						<view class="product">
+							<view class="item flex" style="background:#f5f5f5">
+								<view class="img" @tap="goto" :data-url="'product?id=' + cuxiaoinfo.product.id"><image :src="cuxiaoinfo.product.pic"></image></view>
+								<view class="info flex1">
+									<view class="f1">{{cuxiaoinfo.product.name}}</view>
+									<view class="f2">规格：{{cuxiaoinfo.guige.name}}</view>
+									<view class="f3"><text style="font-weight:bold;">￥{{cuxiaoinfo.guige.sell_price}}</text><text style="padding-left:20rpx"> × 1</text></view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view style="width:100%; height:120rpx;"></view>
+					<view style="width:100%;position:absolute;bottom:0;padding:20rpx 5%;background:#fff">
+						<view style="width:100%;height:80rpx;line-height:80rpx;border-radius:40rpx;text-align:center;color:#fff;" :style="{background:t('color1')}" @tap="chooseCuxiao">确 定</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		havetongcheng:0,
+		address: [],
+		usescore: 0,
+		scoredk_money: 0,
+		totalprice: '0.00',
+		couponvisible: false,
+		cuxiaovisible: false,
+		bid: 0,
+		nowbid: 0,
+		needaddress: 1,
+		linkman: '',
+		tel: '',
+		userinfo:{},
+		pstimeDialogShow: false,
+		pstimeIndex: -1,
+		manjian_money: 0,
+		cxid: 0,
+		latitude: "",
+		longitude: "",
+		allbuydata: "",
+		alltotalprice: "",
+		cuxiaoinfo: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/buy', {prodata: that.opt.prodata}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					if (res.msg) {
+						app.alert(res.msg, function () {
+							if (res.url) {
+								app.goto(res.url);
+							} else {
+								app.goback();
+							}
+						});
+					} else if (res.url) {
+						app.goto(res.url);
+					} else {
+						app.alert('您没有权限购买该商品');
+					}
+					return;
+				}
+				that.havetongcheng = res.havetongcheng;
+				that.address = res.address;
+				that.linkman = res.linkman;
+				that.tel = res.tel;
+				that.userinfo = res.userinfo;
+				that.allbuydata = res.allbuydata;
+				that.needLocation = res.needLocation;
+				that.scorebdkyf = res.scorebdkyf;
+				that.calculatePrice();
+				that.loaded();
+
+				if (res.needLocation == 1) {
+					app.getLocation(function (res) {
+						var latitude = res.latitude;
+						var longitude = res.longitude;
+						that.latitude = latitude;
+						that.longitude = longitude;
+						var allbuydata = that.allbuydata;
+						for (var i in allbuydata) {
+							var freightList = allbuydata[i].freightList;
+							for (var j in freightList) {
+								if (freightList[j].pstype == 1 || freightList[j].pstype == 5) {
+									var storedata = freightList[j].storedata;
+									if (storedata) {
+										for (var x in storedata) {
+											if (latitude && longitude && storedata[x].latitude && storedata[x].longitude) {
+												var juli = that.getDistance(latitude, longitude, storedata[x].latitude, storedata[x].longitude);
+												storedata[x].juli = juli;
+											}
+										}
+										storedata.sort(function (a, b) {
+											return a["juli"] - b["juli"];
+										});
+										for (var x in storedata) {
+											if (storedata[x].juli) {
+												storedata[x].juli = storedata[x].juli + '千米';
+											}
+										}
+										allbuydata[i].freightList[j].storedata = storedata;
+									}
+								}
+							}
+						}
+						that.allbuydata = allbuydata;
+					});
+				}
+			});
+		},
+    //积分抵扣
+    scoredk: function (e) {
+      var usescore = e.detail.value[0];
+      if (!usescore) usescore = 0;
+      this.usescore = usescore;
+      this.calculatePrice();
+    },
+    inputLinkman: function (e) {
+      this.linkman = e.detail.value;
+    },
+    inputTel: function (e) {
+      this.tel = e.detail.value;
+    },
+    inputfield: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+			var field = e.currentTarget.dataset.field;
+      allbuydata[bid][field] = e.detail.value;
+      this.allbuydata = allbuydata;
+    },
+    //选择收货地址
+    chooseAddress: function () {
+      app.goto('/pages/address/address?fromPage=buy&type=' + (this.havetongcheng == 1 ? '1' : '0'));
+    },
+    //计算价格
+    calculatePrice: function () {
+      var that = this;
+      var address = that.address;
+      var allbuydata = that.allbuydata;
+      var alltotalprice = 0;
+      var allfreight_price = 0;
+      var needaddress = 0;
+
+      for (var k in allbuydata) {
+        var product_price = parseFloat(allbuydata[k].product_price);
+        var leveldk_money = parseFloat(allbuydata[k].leveldk_money); //会员折扣
+        var manjian_money = parseFloat(allbuydata[k].manjian_money); //满减活动
+        var coupon_money = parseFloat(allbuydata[k].coupon_money); //-优惠券抵扣 
+        var cuxiao_money = parseFloat(allbuydata[k].cuxiao_money); //+促销活动  
+        var pack_fee = parseFloat(allbuydata[k].pack_fee); //+打包费
+        //算运费
+        var freightdata = allbuydata[k].freightList[allbuydata[k].freightkey];
+        var freight_price = freightdata['freight_price'];
+        if (freightdata.pstype != 1 && freightdata.pstype != 3 && freightdata.pstype != 4) {
+          needaddress = 1;
+        }
+        if (allbuydata[k].coupontype == 4) {
+          freight_price = 0;
+          coupon_money = 0;
+        }
+        var totalprice = product_price + pack_fee - leveldk_money - manjian_money - coupon_money + cuxiao_money;
+        if (totalprice < 0) totalprice = 0; //优惠券不抵扣运费
+
+        totalprice = totalprice + freight_price;
+        allbuydata[k].freight_price = freight_price.toFixed(2);
+        allbuydata[k].totalprice = totalprice.toFixed(2);
+        alltotalprice += totalprice;
+        allfreight_price += freight_price;
+      }
+      that.needaddress = needaddress;
+
+      if (that.usescore) {
+        var scoredk_money = parseFloat(that.userinfo.scoredk_money); //-积分抵扣
+      } else {
+        var scoredk_money = 0;
+      }
+
+      var oldalltotalprice = alltotalprice;
+      alltotalprice = alltotalprice - scoredk_money;
+      if (alltotalprice < 0) alltotalprice = 0;
+
+      if (that.scorebdkyf == '1' && scoredk_money > 0 && alltotalprice < allfreight_price) {
+        //积分不抵扣运费
+        alltotalprice = allfreight_price;
+        scoredk_money = oldalltotalprice - allfreight_price;
+      }
+      var scoredkmaxpercent = parseFloat(that.userinfo.scoredkmaxpercent); //最大抵扣比例
+      var scoremaxtype = parseInt(that.userinfo.scoremaxtype);
+      var scoredkmaxmoney = parseFloat(that.userinfo.scoredkmaxmoney);
+
+      if (scoremaxtype == 0 && scoredk_money > 0 && scoredkmaxpercent > 0 && scoredkmaxpercent < 100 && scoredk_money > oldalltotalprice * scoredkmaxpercent * 0.01) {
+        scoredk_money = oldalltotalprice * scoredkmaxpercent * 0.01;
+        alltotalprice = oldalltotalprice - scoredk_money;
+      } else if (scoremaxtype == 1 && scoredk_money > scoredkmaxmoney) {
+        scoredk_money = scoredkmaxmoney;
+        alltotalprice = oldalltotalprice - scoredk_money;
+      }
+
+      if (alltotalprice < 0) alltotalprice = 0;
+      alltotalprice = alltotalprice.toFixed(2);
+      that.alltotalprice = alltotalprice;
+      that.allbuydata = allbuydata;
+    },
+    changeFreight: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+      var index = e.currentTarget.dataset.index;
+      var freightList = allbuydata[bid].freightList;
+			console.log(allbuydata);
+			console.log(freightList[index]);
+			if(freightList[index].pstype==1 && freightList[index].storedata.length < 1) {
+				app.error('无可自提门店');return;
+			}
+			if(freightList[index].pstype==5 && freightList[index].storedata.length < 1) {
+				app.error('无可配送门店');return;
+			}
+			allbuydata[bid].freightkey = index;
+			that.allbuydata = allbuydata;
+			that.calculatePrice();
+    },
+    chooseFreight: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+      console.log(bid);
+      console.log(allbuydata);
+      var freightList = allbuydata[bid].freightList;
+      var itemlist = [];
+
+      for (var i = 0; i < freightList.length; i++) {
+        itemlist.push(freightList[i].name);
+      }
+
+      uni.showActionSheet({
+        itemList: itemlist,
+        success: function (res) {
+					if(res.tapIndex >= 0){
+						allbuydata[bid].freightkey = res.tapIndex;
+						that.allbuydata = allbuydata;
+						that.calculatePrice();
+					}
+        }
+      });
+    },
+    choosePstime: function (e) {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = e.currentTarget.dataset.bid;
+      var freightkey = allbuydata[bid].freightkey;
+      var freightList = allbuydata[bid].freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+      var itemlist = [];
+      for (var i = 0; i < pstimeArr.length; i++) {
+        itemlist.push(pstimeArr[i].title);
+      }
+      if (itemlist.length == 0) {
+        app.alert('当前没有可选' + (freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间段');
+        return;
+      }
+      that.nowbid = bid;
+      that.pstimeDialogShow = true;
+      that.pstimeIndex = -1;
+    },
+    pstimeRadioChange: function (e) {
+      var that = this;
+			var allbuydata = that.allbuydata;
+      var pstimeIndex = e.currentTarget.dataset.index;
+			console.log(pstimeIndex)
+			var nowbid = that.nowbid;
+      var freightkey = allbuydata[nowbid].freightkey;
+      var freightList = allbuydata[nowbid].freightList;
+      var freight = freightList[freightkey];
+      var pstimeArr = freightList[freightkey].pstimeArr;
+			var choosepstime = pstimeArr[pstimeIndex];
+      allbuydata[nowbid].pstimetext = choosepstime.title;
+      allbuydata[nowbid].freight_time = choosepstime.value;
+      that.allbuydata = allbuydata
+      that.pstimeDialogShow = false;
+    },
+    hidePstimeDialog: function () {
+      this.pstimeDialogShow = false;
+    },
+		chooseCoupon:function(e){
+      var allbuydata = this.allbuydata;
+			var bid = e.bid;
+			var couponrid = e.rid;
+      var couponkey = e.key;
+			if (couponrid == allbuydata[bid].couponrid) {
+        allbuydata[bid].couponkey = 0;
+        allbuydata[bid].couponrid = 0;
+        allbuydata[bid].coupontype = 1;
+        allbuydata[bid].coupon_money = 0;
+        this.allbuydata = allbuydata;
+        this.couponvisible = false;
+      } else {
+        var couponList = allbuydata[bid].couponList;
+        var coupon_money = couponList[couponkey]['money'];
+        var coupontype = couponList[couponkey]['type'];
+        allbuydata[bid].couponkey = couponkey;
+        allbuydata[bid].couponrid = couponrid;
+        allbuydata[bid].coupontype = coupontype;
+        allbuydata[bid].coupon_money = coupon_money;
+        this.allbuydata = allbuydata;
+        this.couponvisible = false;
+      }
+      this.calculatePrice();
+		},
+    choosestore: function (e) {
+      var bid = e.currentTarget.dataset.bid;
+			var storekey = e.currentTarget.dataset.index;
+			var allbuydata = this.allbuydata;
+      var buydata = allbuydata[bid];
+			var freightkey = buydata.freightkey
+			allbuydata[bid].freightList[freightkey].storekey = storekey
+      this.allbuydata = allbuydata;
+    },
+    //提交并支付
+    topay: function () {
+      var that = this;
+      var needaddress = that.needaddress;
+      var addressid = this.address.id;
+      var linkman = this.linkman;
+      var tel = this.tel;
+      var usescore = this.usescore;
+      var frompage = that.opt.frompage ? that.opt.frompage : '';
+      var allbuydata = that.allbuydata;
+      if (needaddress == 0) addressid = 0;
+
+      if (needaddress == 1 && addressid == undefined) {
+        app.error('请选择收货地址');
+        return;
+      }
+      var buydata = [];
+      for (var i in allbuydata) {
+				var freightkey = allbuydata[i].freightkey;
+        if (allbuydata[i].freightList[freightkey].pstimeset == 1 && allbuydata[i].freight_time == '') {
+          app.error('请选择' + (allbuydata[i].freightList[freightkey].pstype == 1 ? '取货' : '配送') + '时间');
+          return;
+        }
+				if (allbuydata[i].freightList[freightkey].pstype == 1 || allbuydata[i].freightList[freightkey].pstype == 5) {
+					var storekey = allbuydata[i].freightList[freightkey].storekey;
+					var storeid = allbuydata[i].freightList[freightkey].storedata[storekey].id;
+				}else{
+					var storeid = 0;
+				}
+
+        buydata.push({
+          bid: allbuydata[i].bid,
+          prodata: allbuydata[i].prodatastr,
+          cuxiaoid: allbuydata[i].cuxiaoid,
+          couponrid: allbuydata[i].couponrid,
+          freight_id: allbuydata[i].freightList[freightkey].id,
+          freight_time: allbuydata[i].freight_time,
+          storeid: storeid,
+          message: allbuydata[i].message,
+          field1: allbuydata[i].field1,
+          field2: allbuydata[i].field2,
+          field3: allbuydata[i].field3,
+          field4: allbuydata[i].field4,
+          field5: allbuydata[i].field5
+        });
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantTakeaway/createOrder', {frompage: frompage,buydata: buydata,addressid: addressid,linkman: linkman,tel: tel,usescore: usescore}, function (res) {
+				app.showLoading(false);
+        if (res.status == 0) {
+          //that.showsuccess(res.data.msg);
+          app.error(res.msg);
+          return;
+        }
+        app.goto('/pages/pay/pay?id=' + res.payorderid, 'redirect');
+      });
+    },
+    showCouponList: function (e) {
+      this.couponvisible = true;
+      this.bid = e.currentTarget.dataset.bid;
+    },
+    handleClickMask: function () {
+      this.couponvisible = false;
+      this.cuxiaovisible = false;
+    },
+    showCuxiaoList: function (e) {
+      this.cuxiaovisible = true;
+      this.bid = e.currentTarget.dataset.bid;
+    },
+    changecx: function (e) {
+      var that = this;
+      var cxid = e.currentTarget.dataset.id;
+      console.log(cxid);
+      that.cxid = cxid;
+      if (cxid == 0) {
+        that.cuxiaoinfo = false;
+        return;
+      }
+      app.post("ApiRestaurantTakeaway/getcuxiaoinfo", {id: cxid}, function (res) {
+        that.cuxiaoinfo = res;
+      });
+    },
+    chooseCuxiao: function () {
+      var that = this;
+      var allbuydata = that.allbuydata;
+      var bid = that.bid;
+      var cxid = that.cxid;
+      if (cxid == 0) {
+        allbuydata[bid].cuxiaoid = '';
+        allbuydata[bid].cuxiao_money = 0;
+        allbuydata[bid].cuxiaoname = '不使用促销';
+      } else {
+        var cxtype = that.cuxiaoinfo.info.type;
+				console.log(cxtype);
+        if (cxtype == 1 || cxtype == 6) {
+          //满额立减 满件立减
+          allbuydata[bid].cuxiao_money = that.cuxiaoinfo.info['money'] * -1;
+        } else if (cxtype == 2) {
+          //满额赠送
+          allbuydata[bid].cuxiao_money = 0;
+        } else if (cxtype == 3) {
+          //加价换购
+          allbuydata[bid].cuxiao_money = that.cuxiaoinfo.info['money'];
+        } else if (cxtype == 4 || cxtype == 5) {
+					var product_price = parseFloat(allbuydata[bid].product_price);
+					var leveldk_money = parseFloat(allbuydata[bid].leveldk_money); //会员折扣
+					var manjian_money = parseFloat(allbuydata[bid].manjian_money); //满减活动
+          //满额打折 满件打折
+          allbuydata[bid].cuxiao_money = (1 - that.cuxiaoinfo.info['zhekou'] * 0.1) * (product_price - leveldk_money - manjian_money) * -1;
+        }
+        allbuydata[bid].cuxiaoid = cxid;
+        allbuydata[bid].cuxiaotype = cxtype;
+        allbuydata[bid].cuxiaoname = that.cuxiaoinfo.info['name'];
+      }
+      this.allbuydata = allbuydata;
+      this.cuxiaovisible = false;
+      this.calculatePrice();
+    },
+		openLocation:function(e){
+			var allbuydata = this.allbuydata
+			var bid = e.currentTarget.dataset.bid;
+			var freightkey = e.currentTarget.dataset.freightkey;
+			var storekey = e.currentTarget.dataset.storekey;
+			var frightinfo = allbuydata[bid].freightList[freightkey]
+			var storeinfo = frightinfo.storedata[storekey];
+			console.log(storeinfo)
+			var latitude = parseFloat(storeinfo.latitude);
+			var longitude = parseFloat(storeinfo.longitude);
+			var address = storeinfo.name;
+			uni.openLocation({
+			 latitude:latitude,
+			 longitude:longitude,
+			 name:address,
+			 scale: 13
+			})
+		}
+  }
+}
+</script>
+<style>
+.address-add{ width:94%;margin:20rpx 3%;background:#fff;border-radius:20rpx;padding: 20rpx 3%;min-height:140rpx;}
+.address-add .f1{margin-right:20rpx}
+.address-add .f1 .img{ width: 66rpx; height: 66rpx; }
+.address-add .f2{ color: #666; }
+.address-add .f3{ width: 26rpx; height: 26rpx;}
+
+.linkitem{width: 100%;padding:1px 0;background: #fff;display:flex;align-items:center}
+.linkitem .f1{width:160rpx;color:#111111}
+.linkitem .input{height:50rpx;padding-left:10rpx;color:#222222;font-weight:bold;font-size:28rpx;flex:1}
+
+.buydata{width:94%;margin:0 3%;background:#fff;margin-bottom:20rpx;border-radius:20rpx;}
+
+.btitle{width:100%;padding:20rpx 20rpx;display:flex;align-items:center;color:#111111;font-weight:bold;font-size:30rpx}
+.btitle .img{width:34rpx;height:34rpx;margin-right:10rpx}
+
+.bcontent{width:100%;padding:0 20rpx}
+
+.product{width:100%;border-bottom:1px solid #f4f4f4} 
+.product .item{width:100%; padding:20rpx 0;background:#fff;border-bottom:1px #ededed dashed;}
+.product .item:last-child{border:none}
+.product .info{padding-left:20rpx;}
+.product .info .f1{color: #222222;font-weight:bold;font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .info .f2{color: #999999; font-size:24rpx}
+.product .info .f3{color: #FF4C4C; font-size:28rpx;display:flex;align-items:center;margin-top:10rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.freight{width:100%;padding:20rpx 0;background:#fff;display:flex;flex-direction:column;}
+.freight .f1{color:#333;margin-bottom:10rpx}
+.freight .f2{color: #111111;text-align:right;flex:1}
+.freight .f3{width: 24rpx;height:28rpx;}
+.freighttips{color:red;font-size:24rpx;}
+
+.freight-ul{width:100%;display:flex;}
+.freight-li{flex-shrink:0;display:flex;background:#F5F6F8;border-radius:24rpx;color:#6C737F;font-size:24rpx;text-align: center;height:48rpx; line-height:48rpx;padding:0 28rpx;margin:12rpx 10rpx 12rpx 0}
+
+
+.price{width:100%;padding:20rpx 0;background:#fff;display:flex;align-items:center}
+.price .f1{color:#333}
+.price .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.price .f3{width: 24rpx;height:24rpx;}
+
+.scoredk{width:94%;margin:0 3%;margin-bottom:20rpx;border-radius:20rpx;padding:24rpx 20rpx; background: #fff;display:flex;align-items:center}
+.scoredk .f1{color:#333333}
+.scoredk .f2{ color: #999999;text-align:right;flex:1}
+
+.remark{width: 100%;padding:16rpx 0;background: #fff;display:flex;align-items:center}
+.remark .f1{color:#333;width:200rpx}
+.remark input{ border:0px solid #eee;height:70rpx;padding-left:10rpx;text-align:right}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;padding:0 20rpx;display:flex;align-items:center;z-index:8}
+.footer .text1 {height:110rpx;line-height:110rpx;color: #2a2a2a;font-size: 30rpx;}
+.footer .text1  text{color: #e94745;font-size: 32rpx;}
+.footer .op{width: 200rpx;height:80rpx;line-height:80rpx;color: #fff;text-align: center;font-size: 30rpx;border-radius:44rpx}
+
+.storeitem{width: 100%;padding:20rpx 0;display:flex;flex-direction:column;color:#333}
+.storeitem .panel{width: 100%;height:60rpx;line-height:60rpx;font-size:28rpx;color:#333;margin-bottom:10rpx;display:flex}
+.storeitem .panel .f1{color:#333}
+.storeitem .panel .f2{ color:#111;font-weight:bold;text-align:right;flex:1}
+.storeitem .radio-item{display:flex;width:100%;color:#000;align-items: center;background:#fff;border-bottom:0 solid #eee;padding:8rpx 20rpx;}
+.storeitem .radio-item:last-child{border:0}
+.storeitem .radio-item .f1{color:#666;flex:1}
+.storeitem .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-left:30rpx}
+.storeitem .radio .radio-img{width:100%;height:100%}
+
+.pstime-item{display:flex;border-bottom: 1px solid #f5f5f5;padding:20rpx 30rpx;}
+.pstime-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.pstime-item .radio .radio-img{width:100%;height:100%}
+
+.cuxiao-desc{width:100%}
+.cuxiao-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.cuxiao-item .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;flex:1}
+.cuxiao-item .radio{flex-shrink:0;width: 32rpx;height: 32rpx;background: #FFFFFF;border: 2rpx solid #BFBFBF;border-radius: 50%;margin-right:30rpx}
+.cuxiao-item .radio .radio-img{width:100%;height:100%}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/comment.vue b/restaurant/takeaway/comment.vue
new file mode 100644
index 0000000..3b67ea7
--- /dev/null
+++ b/restaurant/takeaway/comment.vue
@@ -0,0 +1,196 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+		<view class="form-content">
+			<view class="form-item1">
+				<view class="label">商品信息</view>
+				<view class="product flex">
+					<view class="img"><image :src="og.pic"></image></view>
+					<view class="info flex1">
+						<view class="f1">{{og.name}}</view>
+						<view class="f2">{{og.ggname}}</view>
+						<view class="f3">￥{{og.sell_price}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="form-item2 flex flex-y-center">
+				<view class="label">您的打分</view>
+				<view class="i-rate" @touchmove="handleTouchMove">
+					<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+					<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+							<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+							<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+					</view>
+					<view class="i-rate-text"></view>
+				</view>
+			</view>
+			<view class="form-item3 flex-col">
+				<view class="label">您的评价</view>
+				<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+			</view>
+			
+			<view class="form-item4 flex-col">
+				<view class="label">上传图片</view>
+				<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+					<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+						<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+						<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+					</view>
+					<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+				</view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}" v-if="!comment.id">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var ogid = that.opt.ogid;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/comment', {ogid: ogid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var ogid = that.opt.ogid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantTakeaway/comment', {ogid: ogid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding: 8rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/commentdp.vue b/restaurant/takeaway/commentdp.vue
new file mode 100644
index 0000000..78fd454
--- /dev/null
+++ b/restaurant/takeaway/commentdp.vue
@@ -0,0 +1,185 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价店铺</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var orderid = that.opt.orderid;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/commentdp', {orderid: orderid}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.opt.orderid;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantTakeaway/commentdp', {orderid: orderid,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/commentlist.vue b/restaurant/takeaway/commentlist.vue
new file mode 100644
index 0000000..d38a048
--- /dev/null
+++ b/restaurant/takeaway/commentlist.vue
@@ -0,0 +1,126 @@
+<template>
+<view class="container">
+	<view class="comment">
+		<view v-for="(item, index) in datalist" :key="index" class="item">
+			<view class="f1">
+				<image class="t1" :src="item.headimg"/>
+				<view class="t2">{{item.nickname}}</view>
+				<view class="flex1"></view>
+				<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+			</view>
+			<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+			<view class="f2">
+				<text class="t1">{{item.content}}</text>
+				<view class="t2">
+					<block v-if="item.content_pic!=''">
+						<block v-for="(itemp, index) in item.content_pic" :key="index">
+							<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+								<image :src="itemp" mode="widthFix"/>
+							</view>
+						</block>
+					</block>
+				</view>
+				<text class="t3">规格：{{item.ggname}}</text>
+			</view>
+			<view class="f3" v-if="item.reply_content">
+				<view class="arrow"></view>
+				<view class="t1">商家回复：{{item.reply_content}}</view>
+			</view>
+		</view>
+  </view>
+	
+	<nomore v-if="nomore"></nomore>
+	<nodata v-if="nodata" text="暂无评价~"></nodata>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+			that.loading = true;
+			that.nodata = false;
+			that.nomore = false;
+      app.post('ApiRestaurantTakeaway/commentlist', {proid: that.opt.proid,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				var data = res.data;
+				if (pagenum == 1) {
+          that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+						var datalist = that.datalist;
+						var newdata = datalist.concat(data);
+						that.datalist = newdata;
+					}
+				}
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{background:#fff}
+.comment{display:flex;flex-direction:column;padding:10rpx 0;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/commentps.vue b/restaurant/takeaway/commentps.vue
new file mode 100644
index 0000000..5fc8d3c
--- /dev/null
+++ b/restaurant/takeaway/commentps.vue
@@ -0,0 +1,185 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit">
+			<view class="form-box">
+				<view class="form-item1" style="font-weight:bold">评价配送员</view>
+				<view class="form-item2 flex flex-y-center">
+					<view class="label">您的打分</view>
+					<view class="i-rate" @touchmove="handleTouchMove">
+						<input type="text" name="score" :value="score" class="i-rate-hide-input"></input>
+						<view v-for="(item, index) in 5" :key="index" class="i-rate-star" :class="( index < score ? 'i-rate-current':'' )" :data-index="index" @tap="handleClick">
+								<image v-if="index < score" :src="event_rul + '/static/img/static/img/star2.png'"></image>
+								<image v-else :src="event_rul + '/static/img/static/img/star.png'"></image>
+						</view>
+						<view class="i-rate-text"></view>
+					</view>
+				</view>
+				<view class="form-item3 flex-col">
+					<view class="label">您的评价</view>
+					<textarea placeholder="输入您的评价内容" placeholder-style="color:#ccc;" name="content" :value="comment.content" style="height:200rpx" :disabled="comment.id?true:false"></textarea>
+				</view>
+				
+				<view class="form-item4 flex-col">
+					<view class="label">上传图片</view>
+					<view id="content_picpreview" class="flex" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in content_pic" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-close" @tap="removeimg" :data-index="index" data-field="content_pic" v-if="!comment.id"><image :src="event_rul + '/static/img/static/img/ico-del.png'"></image></view>
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+							<!-- <view class="layui-imgbox-repeat" bindtap="xuanzhuan" data-index="{{index}}" data-field="content_pic" wx:if="{{!comment.id}}"><text class="fa fa-repeat"></text></view> -->
+						</view>
+						<view class="uploadbtn" :style="'background:url('+pre_url+'/static/img/shaitu_icon.png) no-repeat 60rpx;background-size:80rpx 80rpx;background-color:#F3F3F3;'" @tap="uploadimg" data-field="content_pic" v-if="!comment.id && content_pic.length<5"></view>
+					</view>
+				</view>
+			</view>
+			<button class="subbtn" form-type="submit" v-if="!comment.id" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		og:{},
+		comment:{},
+		score: 0,
+		content_pic: [],
+		tempFilePaths: "",
+		
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			var id = that.opt.id;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/commentps', {id: id}, function (res) {
+				that.loading = false;
+				that.og = res.og;
+				if (res.comment){
+					that.comment = res.comment;
+					that.score = res.comment.score;
+					var content_pic = res.comment.content_pic;
+					that.content_pic = content_pic.split(',');
+				}
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var id = that.opt.id;
+      var score = e.detail.value.score;
+      var content = e.detail.value.content;
+      var content_pic = that.content_pic;
+      if (score == 0) {
+        app.error('请打分');
+        return;
+      }
+      if (content == '') {
+        app.error('请填写评价内容');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantTakeaway/commentps', {id: id,content: content,content_pic: content_pic.join(','),score: score}, function (data) {
+				app.showLoading(false);
+        app.success(data.msg);
+        setTimeout(function () {
+          app.goback(true);
+        }, 2000);
+      });
+    },
+    handleClick: function (e) {
+      if (this.comment && this.comment.id) return;
+      var index = e.currentTarget.dataset.index;
+      this.score = index + 1;
+    },
+    handleTouchMove: function (e) {
+      if (this.comment && this.comment.id) return;
+      var clientWidth = uni.getSystemInfoSync().windowWidth;
+      if (!e.changedTouches[0]) return;
+      var movePageX = e.changedTouches[0].pageX;
+      var space = movePageX - 150 / 750 * clientWidth;
+      if (space <= 0) return;
+      var starwidth = 60 / 750 * clientWidth;
+      var setIndex = Math.ceil(space / starwidth);
+      setIndex = setIndex > 5 ? 5 : setIndex;
+      this.score = setIndex;
+    },
+		uploadimg:function(e){
+			var that = this;
+			var field= e.currentTarget.dataset.field
+			var pics = that[field]
+			if(!pics) pics = [];
+			app.chooseImage(function(urls){
+				for(var i=0;i<urls.length;i++){
+					pics.push(urls[i]);
+				}
+				if(field == 'pic') that.pic = pics;
+				if(field == 'pics') that.pics = pics;
+				if(field == 'zhengming') that.zhengming = pics;
+			},1)
+		},
+  }
+};
+</script>
+<style>
+.form-box{width:94%;margin:16rpx 3%;border-radius:16rpx;overflow:hidden}
+.form-item1{ width:100%;background: #fff; padding:18rpx 20rpx;}
+.form-item1 .label{ width:100%;height:60rpx;line-height:60rpx}
+.product{ width: 100%; background: #fff; }
+.product .info{padding-left:20rpx;}
+.product .info .f2{color: #a4a4a4; font-size:24rpx}
+.product .info .f3{color: #ff0d51; font-size:28rpx}
+.product image{ width:140rpx;height:140rpx}
+
+.form-item2{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item2 .label{ width:150rpx;height:60rpx;line-height:60rpx}
+
+.form-item3{width:100%;background: #fff; padding: 8rpx 20rpx;margin-top:1px}
+.form-item3 .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item3 textarea{width: 100%;border: 1px #dedede solid; border-radius: 10rpx; padding: 10rpx;height: 120rpx;}
+
+
+.form-item4{width:100%;background: #fff; padding: 20rpx 20rpx;margin-top:1px}
+.form-item4 .label{ width:150rpx;}
+/*.form-item4 image{ width: 100rpx; height: 100rpx;background:#eee;margin-right:6rpx}
+.form-item4 .imgbox{height:100rpx}*/
+
+.subbtn{ width: 90%; margin: 0 5%;margin-top:40rpx; height: 90rpx; line-height: 90rpx; color: #fff; background: #e94745;border-radius:16rpx}
+
+.i-rate{margin:0;padding:0;display:inline-block;vertical-align:middle;}
+.i-rate-hide-input{display:none}
+.i-rate-star{display:inline-block;color:#e9e9e9;padding:0 10rpx}
+.i-rate-star image{width:50rpx;height:50rpx}
+.i-rate-current{color:#f5a623}
+.i-rate-text{display:inline-block;vertical-align:middle;margin-left:6px;font-size:14px}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+.layui-imgbox-repeat{position: absolute;display: block;width:32rpx;height:32rpx;line-height:28rpx;right: 2px;bottom:2px;color:#999;font-size:30rpx;background:#fff}
+.uploadbtn{position:relative;height:200rpx;width:200rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/index.vue b/restaurant/takeaway/index.vue
new file mode 100644
index 0000000..9e5d2b1
--- /dev/null
+++ b/restaurant/takeaway/index.vue
@@ -0,0 +1,506 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="view-show">
+			<view class="topbannerbg" :style="business.pic?'background:url('+business.pic+') center no-repeat;background-size:cover;':''"></view>
+			<view class="topbannerbg2"></view>
+			<view class="topbanner">
+				<view class="left"><image class="img" :src="business.logo"/></view>
+				<view class="right">
+					<view class="f1">{{business.name}}</view>
+					<view class="f2">{{business.desc}}</view>
+					<!-- <view class="f3"><view class="flex1"></view><view class="t2">收藏<image class="img" :src="event_rul +'/static/img/static/restaurant/like1.png'"/></view></view> -->
+				</view>
+			</view>
+			<view class="navtab">
+				<view class="item" :class="st==0?'on':''" @tap="changetab" data-st="0">点外卖<view class="after" :style="{background:t('color1')}"></view></view>
+				<view class="item" :class="st==1?'on':''" @tap="changetab" data-st="1">商家信息<view class="after" :style="{background:t('color1')}"></view></view>
+				<view class="item" :class="st==2?'on':''" @tap="changetab" data-st="2">评价<view class="after" :style="{background:t('color1')}"></view></view>
+			</view>
+			<view v-if="st==0" class="content" style="overflow:hidden;display:flex;margin-top:86rpx" :style="{height:'calc(100% - '+(menuindex>-1?460:360)+'rpx)'}">
+				<scroll-view v-if="datalist && datalist.length > 0" class="nav_left" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':''">
+					<block v-for="(item, index) in datalist" :key="index" >
+					<view class="nav_left_items" :class="index===currentActiveIndex?'active':''" @tap="clickRootItem" :data-root-item-id="item.id" :data-root-item-index="index">
+						<view class="before" :style="{background:t('color1')}"></view>
+						{{item.name}}<view class="cartnum" :style="{background:t('color1')}" v-if="numCat[item.id]>0">{{numCat[item.id]}}</view>
+					</view>
+					</block>
+				</scroll-view>
+				<view class="nav_right">
+					<view class="nav_right-content">
+						<scroll-view @scroll="scroll" class="detail-list" :scrollIntoView="scrollToViewId" :scrollWithAnimation="animation" scroll-y="true" :class="menuindex>-1?'tabbarbot':''">
+							<view v-for="(detail, index) in datalist" :key="index" class="classification-detail-item">
+								<view class="head" :data-id="detail.id" :id="'detail-' + detail.id">
+									<view class="txt">{{detail.name}}</view>
+									<!-- <view class="show-all" @tap="gotoCatproductPage">查看全部<text class="iconfont iconjiantou"></text></view> -->
+								</view>
+								<view class="product-itemlist">
+									<view class="item" v-for="(item,index) in detail.prolist" :key="item.id" :class="(item.stock <= 0 || item.stock_daily <= item.sales_daily) ? 'soldout' : ''">
+										<view class="product-pic" @click="goto" :data-url="'product?id='+item.id">
+											<image class="image" :src="item.pic" mode="widthFix"/>
+											<view class="overlay"><view class="text">售罄</view></view>
+										</view>
+										<view class="product-info">
+											<view class="p1"><text>{{item.name}}</text></view>
+											<view class="p2">
+												<text class="t1" :style="{color:t('color1')}"><text style="font-size:20rpx;padding-right:1px">￥</text>{{item.sell_price}}</text>
+												<text class="t2" v-if="item.market_price*1 > item.sell_price*1">￥{{item.market_price}}</text>
+											</view>
+											<view class="p3">
+												<view class="p3-1" v-if="item.sales>0"><text style="overflow:hidden">已售{{item.sales}}件</text></view>
+												<view class="p3-1" v-if="item.limit_start>0"><text style="overflow:hidden">{{item.limit_start}}件起售</text></view>
+											</view>
+											<!-- <view class="p4" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" @click.stop="buydialogChange" :data-proid="item.id"><text class="iconfont icon_gouwuche"></text></view> -->
+											<view class="addnum" v-if="item.stock > 0 && item.stock_daily > item.sales_daily">
+												<view v-if="numtotal[item.id]>0" class="minus" @tap.stop="addcart" data-num="-1" :data-proid="item.id" :data-stock="item.stock">-</view>
+												<text v-if="numtotal[item.id]>0" class="i">{{numtotal[item.id]}}</text>
+												<view v-if="item.ggcount>1" class="plus" @tap.stop="buydialogChange" :data-proid="item.id" :data-stock="item.stock">+</view>
+												<view v-else class="plus" @tap.stop="addcart" data-num="1" :data-proid="item.id" :data-ggid="item.gglist[0].id" :data-stock="item.stock">+</view>
+											</view>
+
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+						<nodata v-if="nodata"></nodata>
+					</view>
+				</view>
+			</view>
+			<view v-if="st==1" class="content1" style="margin-top:86rpx;padding-top:20rpx">
+				<view class="item flex-col">
+					<text class="t1">联系电话</text>
+					<text class="t2"><text v-if="business.tel">{{business.tel}}</text><text v-else>暂无</text></text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">商家地址</text>
+					<text class="t2"><text v-if="business.address">{{business.address}}</text><text v-else>暂无</text></text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">商家简介</text>
+					<text class="t2"><text v-if="business.desc">{{business.desc}}</text><text v-else>暂无</text></text>
+				</view>
+				<view class="item flex-col">
+					<text class="t1">营业时间</text>
+					<text class="t2">{{sysset.start_hours}} 至 {{sysset.end_hours}}</text>
+				</view>
+				<view class="item flex-col" v-if="business.zhengming && business.zhengming.length > 0">
+					<text class="t1">证照公示</text>
+					<view id="content_picpreview" class="flex t2" style="flex-wrap:wrap;padding-top:20rpx">
+						<view v-for="(item, index) in business.zhengming" :key="index" class="layui-imgbox">
+							<view class="layui-imgbox-img"><image :src="item" @tap="previewImage" :data-url="item" mode="widthFix"></image></view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="st==2" class="content2" style="margin-top:86rpx;padding-top:20rpx">
+				<view class="comment">
+					<block v-if="commentlist.length>0">
+						<view v-for="(item, index) in commentlist" :key="index" class="item">
+							<view class="f1">
+								<image class="t1" :src="item.headimg"/>
+								<view class="t2">{{item.nickname}}</view>
+								<view class="flex1"></view>
+								<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (item.score>item2?'2':'') + '.png'"/></view>
+							</view>
+							<view style="color:#777;font-size:22rpx;">{{item.createtime}}</view>
+							<view class="f2">
+								<text class="t1">{{item.content}}</text>
+								<view class="t2">
+									<block v-if="item.content_pic!=''">
+										<block v-for="(itemp, index) in item.content_pic" :key="index">
+											<view @tap="previewImage" :data-url="itemp" :data-urls="item.content_pic">
+												<image :src="itemp" mode="widthFix"/>
+											</view>
+										</block>
+									</block>
+								</view>
+							</view>
+							<view class="f3" v-if="item.reply_content">
+								<view class="arrow"></view>
+								<view class="t1">商家回复：{{item.reply_content}}</view>
+							</view>
+						</view>
+					</block>
+					<block v-else>
+						<nodata v-show="comment_nodata"></nodata>
+					</block>
+				</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="proid" @buydialogChange="buydialogChange" @addcart="afteraddcart" :menuindex="menuindex" btntype="1" :needaddcart="false" controller="ApiRestaurantTakeaway"></buydialog>
+		<view style="height:auto;position:relative">
+			<view style="width:100%;height:100rpx"></view>
+			<view class="footer flex" :class="menuindex>-1?'tabbarbot':''">
+				<view class="cart_ico" :style="{background:'linear-gradient(0deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap.stop="handleClickMask"><image class="img" :src="event_rul +'/static/img/static/img/cart.png'"/><view class="cartnum" :style="{background:t('color1')}" v-if="cartList.total>0">{{cartList.total}}</view></view>
+				<view class="text1">合计</view>
+				<view class="text2 flex1" :style="{color:t('color1')}"><text style="font-size:20rpx">￥</text>{{totalprice}}</view>
+				<view v-if="cartList.leftprice > 0" class="op" :style="{background:'#888',width:'220rpx'}">差{{cartList.leftprice}}元起送</view>
+				<view v-else class="op" :style="{background:'linear-gradient(270deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="gopay">去结算</view>
+			</view>
+		</view>
+
+		<view v-if="cartListShow" class="popup__container" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':''">
+			<view class="popup__overlay" @tap.stop="handleClickMask" style="margin-bottom:100rpx" :class="menuindex>-1?'tabbarbot':''"></view>
+			<view class="popup__modal" style="min-height:400rpx;padding:0">
+				<view class="popup__title" style="border-bottom:1px solid #EFEFEF">
+					<text class="popup__title-text" style="color:#323232;font-weight:bold;font-size:32rpx">购物车</text>
+					<view class="popup__close flex-y-center" @tap.stop="clearShopCartFn" style="color:#999999;font-size:24rpx"><image :src="event_rul +'/static/img/static/img/del.png'" style="width:24rpx;height:24rpx;margin-right:6rpx"/>清空</view>
+				</view>
+				<view class="popup__content" style="padding:0">
+					<scroll-view scroll-y class="prolist">
+						<block v-for="(cart, index) in cartList.list" :key="index">
+							<view class="proitem">
+								<image :src="cart.guige.pic?cart.guige.pic:cart.product.pic" class="pic flex0"></image>
+								<view class="con">
+									<view class="f1">{{cart.product.name}}</view>
+									<view class="f2" v-if="cart.guige.name!='默认规格'">{{cart.guige.name}}</view>
+									<view class="f3" style="color:#ff5555;margin-top:10rpx;font-size:28rpx">￥{{cart.guige.sell_price}}</view>
+								</view>
+								<view class="addnum">
+									<view class="minus"><image class="img" :src="event_rul +'/static/img/static/img/cart-minus.png'" @tap="addcart" data-num="-1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+									<text class="i">{{cart.num}}</text>
+									<view class="plus"><image class="img" :src="event_rul +'/static/img/static/img/cart-plus.png'" @tap="addcart" data-num="1" :data-proid="cart.proid" :data-ggid="cart.ggid" :data-stock="cart.guige.stock"/></view>
+								</view>
+							</view>
+						</block>
+						<block v-if="!cartList.list.length">
+							<text class="nopro">暂时没有商品喔~</text>
+						</block>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+		nomore: false,
+		nodata:false,
+
+		st:0,
+		cartListShow:false,
+		buydialogShow:false,
+		harr:[],
+		business:{},
+		datalist: [],
+		cartList:{},
+		numtotal:[],
+		numCat:{},
+		proid:'',
+		totalprice:0.00,
+		minprice:0.00,
+		currentActiveIndex: 0,
+		animation: true,
+		scrollToViewId: "",
+		commentlist:[],
+		comment_nodata:false,
+		comment_nomore:false,
+		sysset:{},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		// this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShow:function(){
+		this.getdata();
+	},
+	onReachBottom: function () {
+		if (this.st == 2) {
+			if (!this.comment_nodata && !this.comment_nomore) {
+				this.pagenum = this.pagenum + 1;
+				this.getCommentList(true);
+			}
+		}
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/index', {bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				if(res.status==0){
+					app.alert(res.msg,function(){
+						app.goback();
+					});
+				}
+				that.business = res.business
+				that.datalist = res.data;
+				that.cartList = res.cartList;
+				that.numtotal = res.numtotal;
+				that.numCat = res.numCat;
+				that.sysset = res.sysset;
+				that.totalprice = parseFloat(res.cartList.totalprice);
+				that.minprice = parseFloat(res.sysset.min_price);
+
+				//计算每个高度
+				var harr = [];
+				var clientwidth = uni.getSystemInfoSync().windowWidth;
+				var datalist = res.data;
+				if(datalist && datalist.length > 0) {
+					console.log(datalist.length)
+					for (var i = 0; i < datalist.length; i++) {
+						var child = datalist[i].prolist;
+						console.log(child)
+						harr.push(Math.ceil(child.length) * 200 / 750 * clientwidth);
+					}
+				} else {
+					that.nodata = true;
+				}
+				
+				that.harr = harr;
+				that.loaded();
+			});
+		},
+		changetab:function(e){
+			this.st = e.currentTarget.dataset.st;
+			this.pagenum = 1;
+			this.commentlist = [];
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+			this.getCommentList();
+		},
+		getCommentList: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.commentlist = [];
+			}
+			var that = this;
+			var pagenum = that.pagenum;
+			var st = that.st;
+			that.loading = true;
+			that.comment_nodata = false;
+			that.comment_nomore = false;
+			app.post('ApiRestaurantTakeaway/getdatalist', {id:that.opt.bid,st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+				uni.stopPullDownRefresh();
+        var data = res.data;
+        if (pagenum == 1) {
+          that.commentlist = data;
+          if (data.length == 0) {
+            that.comment_nodata = true;
+          }
+        }else{
+          if (data.length == 0) {
+            that.comment_nomore = true;
+          } else {
+            var commentlist = that.commentlist;
+            var newdata = commentlist.concat(data);
+            that.commentlist = newdata;
+          }
+        }
+      });
+		},
+    clickRootItem: function (t) {
+      var e = t.currentTarget.dataset;
+      this.scrollToViewId = 'detail-' + e.rootItemId;
+      this.currentActiveIndex = e.rootItemIndex;
+    },
+		addcart:function(e){
+			var that = this;
+			var ks = that.ks;
+			var num = e.currentTarget.dataset.num;
+			var proid = e.currentTarget.dataset.proid;
+			var ggid = e.currentTarget.dataset.ggid;
+			that.loading = true;
+			app.post('ApiRestaurantTakeaway/addcart', {proid: proid,ggid: ggid,num: num,bid:that.opt.bid}, function (res) {
+				that.loading = false;
+				if (res.status == 1) {
+					that.getdata();
+				} else {
+					app.error(res.msg);
+				}
+			});
+		},
+    //加入购物车弹窗后
+    afteraddcart: function (e) {
+			e.hasoption = false;
+      this.addcart({currentTarget:{dataset:e}});
+    },
+    clearShopCartFn: function () {
+      var that = this;
+      app.post("ApiRestaurantTakeaway/cartclear", {bid:that.opt.bid}, function (res) {
+        that.getdata();
+      });
+    },
+    gopay: function () {
+      var cartList = this.cartList.list;
+      if (cartList.length == 0) {
+        app.alert('请先添加商品到购物车');
+        return;
+      }
+      var prodata = [];
+      for (var i = 0; i < cartList.length; i++) {
+        prodata.push(cartList[i].proid + ',' + cartList[i].ggid + ',' + cartList[i].num);
+      }
+      app.goto('buy?frompage=fastbuy&prodata=' + prodata.join('-'));
+    },
+    gotoCatproductPage: function (t) {
+      var e = t.currentTarget.dataset;
+      app.goto('prolist?cid=' + e.id);
+    },
+    scroll: function (e) {
+      var scrollTop = e.detail.scrollTop;
+      var harr = this.harr;
+      var countH = 0;
+      for (var i = 0; i < harr.length; i++) {
+        if (scrollTop >= countH && scrollTop < countH + harr[i]) {
+          this.currentActiveIndex = i;
+          break;
+        }
+        countH += harr[i];
+      }
+    },
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.proid = e.currentTarget.dataset.proid
+			}
+			this.buydialogShow = !this.buydialogShow;
+		},
+		handleClickMask:function(){
+			this.cartListShow = !this.cartListShow;
+		}
+  }
+};
+</script>
+<style>
+page {position: relative;width: 100%;height: 115%;}
+.container{height:100%;overflow:hidden;position: relative;}
+
+.topbannerbg{width:100%;height:264rpx;background:#fff;}
+.topbannerbg2{position:absolute;z-index:7;width:100%;height:264rpx;background:rgba(0,0,0,0.3);top:0}
+.topbanner{position:absolute;z-index:8;width:100%;display:flex;padding:40rpx 20rpx;top:0}
+.topbanner .left{width:160rpx;height:160rpx;flex-shrink:0;margin-right:20rpx}
+.topbanner .left .img{width:100%;height:100%;border-radius:50%}
+.topbanner .right{display:flex;flex-direction:column;padding:20rpx 0}
+.topbanner .right .f1{font-size:36rpx;font-weight:bold;color:#fff}
+.topbanner .right .f2{font-size:22rpx;color:#fff;opacity:0.7;margin-top:20rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;line-height:30rpx;}
+.topbanner .right .f3{width:100%;display:flex;padding-right:20rpx;margin-top:10rpx}
+.topbanner .right .f3 .t2{display:flex;align-items:center;font-size:24rpx;color:rgba(255,255,255,0.9)}
+.topbanner .right .f3 .img{width:32rpx;height:32rpx;margin-left:10rpx}
+
+.navtab{display:flex;width:100%;height:110rpx;background: #fff;position:absolute;z-index:10;padding:0 50rpx;border-radius:24rpx 24rpx 0 0;margin-top:-24rpx;}
+.navtab .item{flex:1;font-size:32rpx; text-align:center; color:#222222; height: 110rpx; line-height: 110rpx;overflow: hidden;position:relative}
+.navtab .item .after{display:none;position:absolute;left:50%;margin-left:-20rpx;bottom:20rpx;height:4px;border-radius:2px;width:40rpx}
+.navtab .on{font-size:36rpx;font-weight:bold}
+.navtab .on .after{display:block}
+
+.content1 .item{display:flex;flex-direction:column;width:100%;padding:0 40rpx;margin-top:40rpx}
+.content1 .item:last-child{ border-bottom: 0;}
+.content1 .item .t1{width:200rpx;color:#2B2B2B;font-weight:bold;font-size:30rpx;height:60rpx;line-height:60rpx}
+.content1 .item .t2{color:#2B2B2B;font-size:24rpx;line-height:30rpx}
+
+.content2 .comment{padding:0 10rpx}
+.content2 .comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.content2 .comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.content2 .comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.content2 .comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.content2 .comment .item .f1 .t3{text-align:right;}
+.content2 .comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.content2 .comment .item .score{ font-size: 24rpx;color:#f99716;}
+.content2 .comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.content2 .comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.content2 .comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.content2 .comment .item .f2 .t2{display:flex;width:100%}
+.content2 .comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.content2 .comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.content2 .comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.content2 .comment .item .f3{width:100%;padding:10rpx 0;position:relative}
+.content2 .comment .item .f3 .arrow{width: 16rpx;height: 16rpx;background:#eee;transform: rotate(45deg);position:absolute;top:0rpx;left:36rpx}
+.content2 .comment .item .f3 .t1{width:100%;border-radius:10rpx;padding:10rpx;font-size:22rpx;color:#888;background:#eee}
+
+
+.view-show{background-color: white;line-height: 1;width: 100%;height: 100%;}
+.search-container {width: 100%;height: 94rpx;padding: 16rpx 23rpx 14rpx 23rpx;background-color: #fff;position: relative;overflow: hidden;border-bottom:1px solid #f5f5f5}
+.search-box {display:flex;align-items:center;height:60rpx;border-radius:30rpx;border:0;background-color:#f7f7f7;flex:1}
+.search-box .img{width:24rpx;height:24rpx;margin-right:10rpx;margin-left:30rpx}
+.search-box .search-text {font-size:24rpx;color:#C2C2C2;width: 100%;}
+
+.nav_left{width: 25%;height:100%;background:#F6F6F6;overflow-y:scroll;padding: 0 0 100rpx 0;}
+.nav_left .nav_left_items{line-height:50rpx;color:#999999;border-bottom:0px solid #E6E6E6;font-size:24rpx;position: relative;border-right:0 solid #E6E6E6;padding:25rpx 30rpx;}
+.nav_left .nav_left_items.active{background: #fff;color:#222222;font-size:28rpx;font-weight:bold}
+.nav_left .nav_left_items .before{display:none;position:absolute;top:50%;margin-top:-22rpx;left:0rpx;height:44rpx;border-radius:4rpx;width:6rpx}
+.nav_left .nav_left_items.active .before{display:block}
+.nav_left .nav_left_items .cartnum{position:absolute;top:8rpx;right:8rpx;width:36rpx;height:36rpx;border:1px solid #fff;border-radius:50%;display:flex;align-items:center;justify-content:center;overflow:hidden;font-size:18rpx;color:#fff}
+
+.nav_right{width: 75%;height:100%;display:flex;flex-direction:column;background: #fff;box-sizing: border-box;padding:0 0 100rpx 0}
+.nav_right-content{background: #ffffff;padding:20rpx 10rpx 20rpx 20rpx;height:100%;position:relative}
+.detail-list {height:100%;overflow:scroll}
+.classification-detail-item {width: 100%;overflow: visible;background:#fff}
+.classification-detail-item .head {height: 82rpx;width: 100%;display: flex;align-items:center;justify-content:space-between;}
+.classification-detail-item .head .txt {color:#222222;font-weight:bold;font-size:28rpx;}
+.classification-detail-item .head .show-all {font-size: 22rpx;color:#949494;display:flex;align-items:center}
+
+.product-itemlist{height: auto; position: relative;overflow: hidden; padding: 0px; display:flex;flex-wrap:wrap}
+.product-itemlist .item{width:100%;display: inline-block;position: relative;margin-bottom: 12rpx;background: #fff;display:flex;padding:14rpx 0;border-radius:10rpx;border-bottom:1px solid #F8F8F8}
+.product-itemlist .product-pic {width: 30%;height:0;overflow:hidden;background: #ffffff;padding-bottom: 30%;position: relative;border-radius:4px;}
+.product-itemlist .product-pic .image{position:absolute;top:0;left:0;width: 100%;height:auto}
+.product-itemlist .product-pic .saleimg{ position: absolute;width: 120rpx;height: auto; top: -6rpx; left:-6rpx;}
+.product-itemlist .product-info {width: 70%;padding:0 10rpx 5rpx 20rpx;position: relative;}
+.product-itemlist .product-info .p1 {color:#323232;font-weight:bold;font-size:26rpx;line-height:30rpx;margin-bottom:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;height:60rpx}
+.product-itemlist .product-info .p2{margin-top:10rpx;height:36rpx;line-height:36rpx;overflow:hidden;}
+.product-itemlist .product-info .p2 .t1{font-size:32rpx;}
+.product-itemlist .product-info .p2 .t2 {margin-left:10rpx;font-size:24rpx;color: #aaa;text-decoration: line-through;/*letter-spacing:-1px*/}
+.product-itemlist .product-info .p3{display:flex;align-items:center;overflow:hidden;margin-top:10rpx}
+.product-itemlist .product-info .p3-1{font-size:20rpx;height:30rpx;line-height:30rpx;text-align:right;color:#999; margin-left: 6rpx;}
+.product-itemlist .product-info .p3-1:nth-child(1) {margin: 0;}
+.product-itemlist .product-info .p4{width:48rpx;height:48rpx;border-radius:50%;position:absolute;display:relative;bottom:6rpx;right:4rpx;text-align:center;}
+.product-itemlist .product-info .p4 .icon_gouwuche{font-size:28rpx;height:48rpx;line-height:48rpx}
+.product-itemlist .addnum {position: absolute;right:10rpx;bottom:20rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.product-itemlist .addnum .plus {width:40rpx;height:40rpx;background:#FD4A46;color:#FFFFFF;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .minus {width:40rpx;height:40rpx;background:#FFFFFF;color:#FD4A46;border:1px solid #FD4A46;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:28rpx}
+.product-itemlist .addnum .img{width:24rpx;height:24rpx}
+.product-itemlist .addnum .i {padding: 0 20rpx;color:#999999;font-size:28rpx}
+.overlay {background-color: rgba(0,0,0,.5); position: absolute; width:60%; height: 60%; border-radius: 50%; display: none; top: 20%; left: 20%;}
+.overlay .text{ color: #fff; text-align: center; transform: translateY(100%);}
+.product-itemlist .soldout .product-pic .overlay{ display: block;}
+
+.prolist {max-height: 620rpx;min-height: 320rpx;overflow: hidden;padding:0rpx 20rpx;font-size: 28rpx;border-bottom: 1px solid #e6e6e6;}
+.prolist .nopro {text-align: center;font-size: 26rpx;display: block;margin: 80rpx auto;}
+.prolist .proitem{position: relative;padding:10rpx 0;display:flex;border-bottom:1px solid #eee}
+.prolist .proitem .pic{width: 120rpx;height: 120rpx;margin-right: 20rpx;}
+.prolist .proitem .con{padding-right:180rpx;padding-top:10rpx}
+.prolist .proitem .con .f1{color:#323232;font-size:26rpx;line-height:32rpx;margin-bottom: 10rpx;margin-top: -6rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+.prolist .proitem .con .f2{font-size: 24rpx;line-height:28rpx;color: #999;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;}
+.prolist .proitem .addnum {position: absolute;right: 20rpx;bottom:50rpx;font-size: 30rpx;color: #666;width: auto;display:flex;align-items:center}
+.prolist .proitem .addnum .plus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .minus {width:48rpx;height:36rpx;background:#F6F8F7;display:flex;align-items:center;justify-content:center}
+.prolist .proitem .addnum .img{width:24rpx;height:24rpx}
+.prolist .proitem .addnum .i {padding: 0 20rpx;color:#2B2B2B;font-weight:bold;font-size:24rpx}
+.prolist .tips {font-size: 22rpx;color: #666;text-align: center;line-height: 56rpx;background: #f5f5f5;}
+
+.footer {width: 100%;background: #fff;margin-top: 5px;position: fixed;left: 0px;bottom: 0px;z-index:8;display:flex;align-items:center;padding:0 20rpx;border-top:1px solid #EFEFEF}
+.footer .cart_ico{width:64rpx;height:64rpx;border-radius: 10rpx;display:flex;align-items:center;justify-content:center;position:relative}
+.footer .cart_ico .img{width:36rpx;height:36rpx;}
+.footer .cart_ico .cartnum{position:absolute;top:-17rpx;right:-17rpx;width:34rpx;height:34rpx;border:1px solid #fff;border-radius:50%;display:flex;align-items:center;justify-content:center;overflow:hidden;font-size:20rpx;font-weight:bold;color:#fff}
+.footer .text1 {height: 100rpx;line-height: 100rpx;color:#555555;font-weight:bold;font-size: 30rpx;margin-left:40rpx;margin-right:10rpx}
+.footer .text2 {font-size: 32rpx;font-weight:bold}
+.footer .op{width: 200rpx;height: 72rpx;line-height:72rpx;border-radius: 36rpx;font-weight:bold;color:#fff;font-size:28rpx;text-align:center}
+
+.layui-imgbox{margin-right:16rpx;margin-bottom:10rpx;font-size:24rpx;position: relative;}
+.layui-imgbox-close{position: absolute;display: block;width:32rpx;height:32rpx;right:-16rpx;top:-16rpx;color:#999;font-size:32rpx;background:#fff}
+.layui-imgbox-close image{width:100%;height:100%}
+.layui-imgbox-img{display: block;width:200rpx;height:200rpx;padding:2px;border: #d3d3d3 1px solid;background-color: #f6f6f6;overflow:hidden}
+.layui-imgbox-img>image{max-width:100%;}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/logistics.vue b/restaurant/takeaway/logistics.vue
new file mode 100644
index 0000000..e3ccdf7
--- /dev/null
+++ b/restaurant/takeaway/logistics.vue
@@ -0,0 +1,299 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+	<block v-if="express_com=='同城配送'">
+		<map v-if="psorder.status!=0 && psorder.status!=4" class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:psuser.latitude,
+			longitude:psuser.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_qishou.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+		<map v-else class="map" :longitude="binfo.longitude" :latitude="binfo.latitude" scale="14" :markers="[{
+			id:0,
+			latitude:binfo.latitude,
+			longitude:binfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_business.png',
+			width:'44',
+			height:'54'
+		},{
+			id:0,
+			latitude:orderinfo.latitude,
+			longitude:orderinfo.longitude,
+			iconPath: event_rul +'/static/img/static/peisong/marker_kehu.png',
+			width:'44',
+			height:'54'
+		}]"></map>
+
+		<view class="order-box">
+			<view class="head">
+				<view class="f1" v-if="psorder.status==4"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已送达</view>
+				<view class="f1" v-else-if="psorder.leftminute>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/><text class="t1">{{psorder.leftminute}}分钟内</text> 送达</view>
+				<view class="f1" v-else-if="psorder.yujitime>0"><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>已超时<text class="t1" style="margin-left:10rpx">{{-psorder.leftminute}}分钟</text></view>
+				<view class="f1" v-else><image :src="event_rul +'/static/img/static/peisong/ps_time.png'" class="img"/>配送中</view>
+				<view class="flex1"></view>
+				<view class="f2"><text class="t1">{{orderinfo.freight_price}}</text>元</view>
+			</view>
+			<view class="content" style="border-bottom:0">
+				<view class="f1">
+					<view class="t1"><text class="x1">{{psorder.juli}}</text><text class="x2">{{psorder.juli_unit}}</text></view>
+					<view class="t2"><image :src="event_rul +'/static/img/static/peisong/ps_juli.png'" class="img"/></view>
+					<view class="t3"><text class="x1">{{psorder.juli2}}</text><text class="x2">{{psorder.juli2_unit}}</text></view>
+				</view>
+				<view class="f2">
+					<view class="t1">{{binfo.name}}</view>
+					<view class="t2">{{binfo.address}}</view>
+					<view class="t3">{{orderinfo.address}}</view>
+				</view>
+				<view class="f3" @tap.stop="daohang"><image :src="event_rul +'/static/img/static/peisong/ps_daohang.png'" class="img"/></view>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">商品清单({{orderinfo.procount}})</view>
+			<view v-for="(item, idx) in prolist" :key="idx" class="item">
+				<text class="t1 flex1">{{item.name}} {{item.ggname}}</text>
+				<text class="t2 flex0">￥{{item.sell_price}} ×{{item.num}} </text>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="psorder.status!=0">
+			<view class="box-title">配送信息</view>
+			<view class="item" v-if="psuser.realname">
+				<text class="t1">配送员</text>
+				<text class="t2"><text style="font-weight:bold">{{psuser.realname}}</text>({{psuser.tel}})</text>
+			</view>
+			<view class="item">
+				<text class="t1">接单时间</text>
+				<text class="t2">{{date(psorder.starttime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.daodiantime">
+				<text class="t1">到店时间</text>
+				<text class="t2">{{date(psorder.daodiantime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.quhuotime">
+				<text class="t1">取货时间</text>
+				<text class="t2">{{date(psorder.quhuotime)}}</text>
+			</view>
+			<view class="item" v-if="psorder.endtime">
+				<text class="t1">送达时间</text>
+				<text class="t2">{{date(psorder.endtime)}}</text>
+			</view>
+		</view>
+
+		<view class="orderinfo">
+			<view class="box-title">订单信息</view>
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{orderinfo.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{date(orderinfo.createtime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{date(orderinfo.paytime)}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{orderinfo.paytype}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{orderinfo.product_price}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{orderinfo.totalprice}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{orderinfo.message ? orderinfo.message : '无'}}</text>
+			</view>
+		</view>
+		<view style="width:100%;height:120rpx"></view>
+		<view class="bottom">
+			<view class="f1" v-if="psorder.status!=0 && psuser.tel" @tap="call" :data-tel="psuser.tel"><image :src="event_rul +'/static/img/static/peisong/tel1.png'" class="img"/>联系配送员</view>
+			<view class="f2" v-if="psorder.status!=0" @tap="call" :data-tel="binfo.tel"><image :src="event_rul +'/static/img/static/peisong/tel2.png'" class="img"/>联系商家</view>
+			<view class="btn1" @tap="goto" :data-url="'commentps?id='+psorder.id" v-if="psorder.psid>0 && psorder.status==4">评价配送员</view>
+		</view>
+	</block>
+	<block v-else>
+		<view class="expressinfo">
+			<view class="head">
+				<view class="f1"><image :src="pre_url + '/static/img/feiji.png'"></image></view>
+				<view class="f2">
+					<view class="t1">快递公司：<text style="color:#333">{{express_com}}</text></view>
+					<view class="t2">快递单号：<text style="color:#333">{{express_no}}</text></view>
+				</view>
+			</view>
+			<view class="content">
+				<view v-for="(item, index) in datalist" :key="index" :class="'item ' + (index==0?'on':'')">
+					<view class="f1"><image :src="event_rul +'/static/img/static/img/dot' + (index==0?'2':'1') + '.png'"></image></view>
+					<view class="f2">
+						<text class="t2">{{item.time}}</text>
+						<text class="t1">{{item.context}}</text>
+					</view>
+				</view>
+				<nodata v-if="nodata" text="暂未查找到物流信息"></nodata>
+			</view>
+		</view>
+	</block>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		nodata:false,
+		express_com: '',
+		express_no: '',
+		datalist: [],
+
+		orderinfo: {},
+		prolist: [],
+		binfo: {},
+		psuser: {},
+		psorder: {},
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onPullDownRefresh: function () {
+    this.getdata();
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.express_com = that.opt.express_com;
+			that.express_no = that.opt.express_no;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/logistics', {express_com: that.express_com,express_no: that.express_no}, function (res) {
+				that.loading = false;
+				if(that.express_com == '同城配送'){
+					that.orderinfo = res.orderinfo;
+					that.prolist = res.prolist;
+					that.binfo = res.binfo;
+					that.psorder = res.psorder;
+					that.psuser = res.psuser;
+					setTimeout(function(){
+						that.getdata();
+					},10000)
+				}else{
+					var datalist = res.datalist;
+					if (datalist.length < 1) {
+						that.nodata = true;
+					}
+					that.datalist = datalist;
+				}
+				that.loaded();
+			});
+		},
+		call:function(e){
+			var tel = e.currentTarget.dataset.tel;
+			uni.makePhoneCall({
+				phoneNumber: tel
+			});
+		}
+  }
+}
+</script>
+<style>
+.expressinfo .head { width:100%;background: #fff; margin:20rpx 0;padding: 20rpx 20rpx;display:flex;align-items:center}
+.expressinfo .head .f1{ width:120rpx;height:120rpx;margin-right:20rpx}
+.expressinfo .head .f1 image{width:100%;height:100%}
+.expressinfo .head .f2{display:flex;flex-direction:column;flex:auto;font-size:30rpx;color:#999999}
+.expressinfo .head .f2 .t1{margin-bottom:8rpx}
+.expressinfo .content{ width: 100%;  background: #fff;display:flex;flex-direction:column;color: #979797;padding:20rpx 40rpx}
+.expressinfo .content .on{color: #23aa5e;}
+.expressinfo .content .item{display:flex;width: 96%;  margin: 0 2%;border-left: 1px #dadada solid;padding:10rpx 0}
+.expressinfo .content .item .f1{ width:40rpx;flex-shrink:0;position:relative}
+.expressinfo .content image{width: 30rpx; height: 30rpx; position: absolute; left: -16rpx; top: 22rpx;}
+/*.content .on image{ top:-1rpx}*/
+.expressinfo .content .item .f1 image{ width: 30rpx; height: 30rpx;}
+
+.expressinfo .content .item .f2{display:flex;flex-direction:column;flex:auto;}
+.expressinfo .content .item .f2 .t1{font-size: 30rpx;}
+.expressinfo .content .item .f2 .t1{font-size: 26rpx;}
+
+
+.map{width:100%;height:500rpx;overflow:hidden}
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.order-box{ width: 94%;margin:20rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f5f5f5 solid; height:88rpx; line-height:88rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#222222}
+.order-box .head .f1 .img{width:24rpx;height:24rpx;margin-right:4px}
+.order-box .head .f1 .t1{color:#06A051;margin-right:10rpx}
+.order-box .head .f2{color:#FF6F30}
+.order-box .head .f2 .t1{font-size:36rpx;margin-right:4rpx}
+
+.order-box .content{display:flex;justify-content:space-between;width: 100%; padding:16rpx 0px;border-bottom: 1px solid #f5f5f5;position:relative}
+.order-box .content .f1{width:100rpx;display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t1 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t1 .x2{color:#999999;font-size:24rpx;margin-bottom:8rpx}
+.order-box .content .f1 .t2 .img{width:12rpx;height:36rpx}
+
+.order-box .content .f1 .t3{display:flex;flex-direction:column;align-items:center}
+.order-box .content .f1 .t3 .x1{color:#FF6F30;font-size:28rpx;font-weight:bold}
+.order-box .content .f1 .t3 .x2{color:#999999;font-size:24rpx}
+.order-box .content .f2{}
+.order-box .content .f2 .t1{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-bottom:6rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t2{font-size:24rpx;color:#222222;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f2 .t3{font-size:36rpx;color:#222222;font-weight:bold;line-height:50rpx;margin-top:30rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;}
+.order-box .content .f3 .img{width:72rpx;height:168rpx}
+
+.orderinfo{width: 94%;margin:20rpx 3%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;border-radius:8px}
+.orderinfo .box-title{color:#161616;font-size:30rpx;height:80rpx;line-height:80rpx;font-weight:bold}
+.orderinfo .item{display:flex;width:100%;padding:10rpx 0;}
+.orderinfo .item .t1{width:200rpx;color:#161616}
+.orderinfo .item .t2{flex:1;text-align:right;color:#222222}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;align-items:center;height:100rpx;}
+.bottom .f1{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55;border-right:1px solid #EAEEED}
+.bottom .f1 .img{width:44rpx;height:44rpx}
+.bottom .f2{width:188rpx;display:flex;align-items:center;flex-direction:column;font-size:20rpx;color:#373C55}
+.bottom .f2 .img{width:44rpx;height:44rpx}
+.bottom .btn1{flex:1;background:linear-gradient(-90deg, #06A051 0%, #03B269 100%);height:100rpx;line-height:100rpx;color:#fff;text-align:center;font-size:32rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/orderdetail.vue b/restaurant/takeaway/orderdetail.vue
new file mode 100644
index 0000000..1ea2a77
--- /dev/null
+++ b/restaurant/takeaway/orderdetail.vue
@@ -0,0 +1,425 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<view class="ordertop" :style="'background:url(' + pre_url + '/static/img/ordertop.png);background-size:100%'">
+			<view class="f1" v-if="detail.status==0">
+				<view class="t1">等待买家付款</view>
+				<view class="t2" v-if="djs">剩余时间：{{djs}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==1">
+				<view class="t1">已成功付款，待商家接单</view>
+			</view>
+			<view class="f1" v-if="detail.status==12">
+				<view class="t1">商家已接单</view>
+				<view class="t2" v-if="detail.freight_type!=1">请等待配送</view>
+				<view class="t2" v-if="detail.freight_type==1">请尽快前往自提地点取货</view>
+			</view>
+			<view class="f1" v-if="detail.status==2">
+				<view class="t1">订单配送中</view>
+				<view class="t2" v-if="detail.freight_type!=3">发货信息：{{detail.express}} {{detail.express_no}}</view>
+			</view>
+			<view class="f1" v-if="detail.status==3">
+				<view class="t1">订单已完成</view>
+			</view>
+			<view class="f1" v-if="detail.status==4">
+				<view class="t1">订单已取消</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="img">
+				<image :src="event_rul +'/static/img/static/img/address3.png'"></image>
+			</view>
+			<view class="info">
+				<text class="t1">{{detail.linkman}} {{detail.tel}}</text>
+				<text class="t2" v-if="detail.freight_type!=1 && detail.freight_type!=3">地址：{{detail.area}}{{detail.address}}</text>
+				<text class="t2" v-if="detail.freight_type==1" @tap="openLocation" :data-address="storeinfo.address" :data-latitude="storeinfo.latitude" :data-longitude="storeinfo.longitude">取货地点：{{storeinfo.name}} - {{storeinfo.address}}</text>
+			</view>
+		</view>
+		<view class="btitle flex-y-center">
+			<image :src="detail.binfo.logo" style="width:36rpx;height:36rpx;" @tap="goto" :data-url="'index?bid=' + detail.bid"></image>
+			<text class="flex1" decode="true" space="true" @tap="goto" :data-url="'index?bid=' + detail.bid" style="padding-left:16rpx">{{detail.binfo.name}}</text>
+		</view>
+		<view class="product">
+			<view v-for="(item, idx) in prolist" :key="idx" class="content">
+				<view @tap="goto" :data-url="'product?id=' + item.proid">
+					<image :src="item.pic"></image>
+				</view>
+				<view class="detail">
+					<text class="t1">{{item.name}}</text>
+					<text class="t2">{{item.ggname}}</text>
+					<view class="t3"><text class="x1 flex1">￥{{item.sell_price}}</text><text class="x2">×{{item.num}}</text></view>
+				</view>
+				<view class="btn3" v-if="detail.status==3 && item.iscomment==0 && shopset.comment==1" @tap.stop="goto" :data-url="'comment?ogid=' + item.id">去评价</view>
+				<view class="btn3" v-if="detail.status==3 && item.iscomment==1" @tap.stop="goto" :data-url="'comment?ogid=' + item.id">查看评价</view>
+			</view>
+		</view>
+		
+		<view class="orderinfo" v-if="(detail.status==3 || detail.status==2) && (detail.freight_type==3 || detail.freight_type==4)">
+			<view class="item flex-col">
+				<text class="t1" style="color:#111">发货信息</text>
+				<text class="t2" style="text-align:left;margin-top:10rpx;padding:0 10rpx" user-select="true" selectable="true">{{detail.freight_content}}</text>
+			</view>
+		</view>
+		
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">订单编号</text>
+				<text class="t2" user-select="true" selectable="true">{{detail.ordernum}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">下单时间</text>
+				<text class="t2">{{detail.createtime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytype!='货到付款' && detail.paytime">
+				<text class="t1">支付时间</text>
+				<text class="t2">{{detail.paytime}}</text>
+			</view>
+			<view class="item" v-if="detail.status>0 && detail.paytime">
+				<text class="t1">支付方式</text>
+				<text class="t2">{{detail.paytype == '货到付款' ? codtxt : detail.paytype}}</text>
+			</view>
+			<view class="item" v-if="detail.status>1 && detail.send_time">
+				<text class="t1">发货时间</text>
+				<text class="t2">{{detail.send_time}}</text>
+			</view>
+			<view class="item" v-if="detail.status==3 && detail.collect_time">
+				<text class="t1">收货时间</text>
+				<text class="t2">{{detail.collect_time}}</text>
+			</view>
+		</view>
+		<view class="orderinfo">
+			<view class="item">
+				<text class="t1">商品金额</text>
+				<text class="t2 red">¥{{detail.product_price}}</text>
+			</view>
+			<view class="item" v-if="detail.pack_fee > 0">
+				<text class="t1">打包费</text>
+				<text class="t2 red">+¥{{detail.pack_fee}}</text>
+			</view>
+			<view class="item" v-if="detail.disprice > 0">
+				<text class="t1">{{t('会员')}}折扣</text>
+				<text class="t2 red">-¥{{detail.leveldk_money}}</text>
+			</view>
+			<view class="item" v-if="detail.manjian_money > 0">
+				<text class="t1">满减活动</text>
+				<text class="t2 red">-¥{{detail.manjian_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">配送方式</text>
+				<text class="t2">{{detail.freight_text}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_type==1 && detail.freightprice > 0">
+				<text class="t1">服务费</text>
+				<text class="t2 red">+¥{{detail.freight_price}}</text>
+			</view>
+			<view class="item" v-if="detail.freight_time">
+				<text class="t1">{{detail.freight_type!=1?'配送':'提货'}}时间</text>
+				<text class="t2">{{detail.freight_time}}</text>
+			</view>
+			<view class="item" v-if="detail.couponmoney > 0">
+				<text class="t1">{{t('优惠券')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.coupon_money}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.scoredk > 0">
+				<text class="t1">{{t('积分')}}抵扣</text>
+				<text class="t2 red">-¥{{detail.scoredk_money}}</text>
+			</view>
+			<view class="item">
+				<text class="t1">实付款</text>
+				<text class="t2 red">¥{{detail.totalprice}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">订单状态</text>
+				<text class="t2" v-if="detail.status==0">未付款</text>
+				<text class="t2" v-if="detail.status==1">已付款</text>
+				<text class="t2" v-if="detail.status==12">商家已接单</text>
+				<text class="t2" v-if="detail.status==2">已发货</text>
+				<text class="t2" v-if="detail.status==3">已收货</text>
+				<text class="t2" v-if="detail.status==4">已关闭</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款状态</text>
+				<text class="t2 red" v-if="detail.refund_status==1">审核中,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==2">已退款,¥{{detail.refund_money}}</text>
+				<text class="t2 red" v-if="detail.refund_status==3">已驳回,¥{{detail.refund_money}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_status>0">
+				<text class="t1">退款原因</text>
+				<text class="t2 red">{{detail.refund_reason}}</text>
+			</view>
+			<view class="item" v-if="detail.refund_checkremark">
+				<text class="t1">审核备注</text>
+				<text class="t2 red">{{detail.refund_checkremark}}</text>
+			</view>
+			
+			<view class="item" v-if="detail.isfuwu && detail.fuwuendtime > 0">
+				<text class="t1">到期时间</text>
+				<text class="t2 red">{{_.date(detail.fuwuendtime,'Y-m-d H:i')}}</text>
+			</view>
+
+			<view class="item">
+				<text class="t1">备注</text>
+				<text class="t2 red">{{detail.message ? detail.message : '无'}}</text>
+			</view>
+			<view class="item" v-if="detail.field1">
+				<text class="t1">{{detail.field1data[0]}}</text>
+				<text class="t2 red">{{detail.field1data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field2">
+				<text class="t1">{{detail.field2data[0]}}</text>
+				<text class="t2 red">{{detail.field2data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field3">
+				<text class="t1">{{detail.field3data[0]}}</text>
+				<text class="t2 red">{{detail.field3data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field4">
+				<text class="t1">{{detail.field4data[0]}}</text>
+				<text class="t2 red">{{detail.field4data[1]}}</text>
+			</view>
+			<view class="item" v-if="detail.field5">
+				<text class="t1">{{detail.field5data[0]}}</text>
+				<text class="t2 red">{{detail.field5data[1]}}</text>
+			</view>
+			<!-- <view class="item flex-col" v-if="(detail.status==1 || detail.status==2) && detail.freight_type==1">
+				<text class="t1">核销码</text>
+				<view class="flex-x-center">
+					<image :src="detail.hexiao_qr" style="width:500rpx;height:500rpx" @tap="previewImage" :data-url="detail.hexiao_qr"></image>
+				</view>
+				<text class="flex-x-center">请出示核销码给核销员进行核销</text>
+			</view> -->
+		</view>
+
+		<view style="width:100%;height:120rpx"></view>
+
+		<view class="bottom">
+			<block v-if="detail.status==0">
+				<view class="btn2" @tap="toclose" :data-id="detail.id">关闭订单</view>
+				<view class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'/pages/pay/pay?id=' + detail.payorderid">去付款</view>
+			</block>
+			<block v-if="detail.status==1">
+				<view class="btn2" @tap="quxiao" :data-id="detail.id">取消订单</view>
+			</block>
+			<block v-if="detail.status==12">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+			</block>
+			<block v-if="detail.status==2 || detail.status==3">
+				<view class="btn2" @tap="goto" :data-url="'logistics?express_com=' + detail.express_com + '&express_no=' + detail.express_no" v-if="detail.freight_type!=3 && detail.freight_type!=4">配送详情</view>
+			</block>
+			<block v-if="detail.status==2">
+				<view v-if="detail.refund_status==0 || detail.refund_status==3" class="btn2" @tap="goto" :data-url="'refund?orderid=' + detail.id + '&price=' + detail.totalprice">申请退款</view>
+			</block>
+			<block v-if="(detail.status==1 || detail.status==2 || detail.status==12) && detail.freight_type==1">
+				<view class="btn2" @tap="showhxqr">核销码</view>
+			</block>
+			<block v-if="detail.status==3 || detail.status==4">
+				<view class="btn2" @tap="todel" :data-id="detail.id">删除订单</view>
+			</block>
+			<block v-if="detail.status==3">
+				<view v-if="iscommentdp==0" class="btn1" :style="{background:t('color1')}" @tap="goto" :data-url="'commentdp?orderid=' + detail.id">评价店铺</view>
+				<view v-if="iscommentdp==1" class="btn2" @tap="goto" :data-url="'commentdp?orderid=' + detail.id">查看评价</view>
+			</block>
+		</view>
+		<uni-popup id="dialogHxqr" ref="dialogHxqr" type="dialog">
+			<view class="hxqrbox">
+				<image :src="detail.hexiao_qr" @tap="previewImage" :data-url="detail.hexiao_qr" class="img"/>
+				<view class="txt">请出示核销码给核销员进行核销</view>
+				<view class="close" @tap="closeHxqr">
+					<image :src="event_rul + '/static/img/static/img/close2.png'" style="width:100%;height:100%"/>
+				</view>
+			</view>
+		</uni-popup>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		pre_url:app.globalData.pre_url,
+		prodata: '',
+		djs: '',
+		iscommentdp: "0",
+		detail: "",
+		prolist: "",
+		shopset: "",
+		storeinfo: "",
+		lefttime: "",
+		codtxt: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onUnload: function () {
+    clearInterval(interval);
+  },
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/orderdetail', {id: that.opt.id}, function (res) {
+				that.loading = false;
+				that.iscommentdp = res.iscommentdp,
+				that.detail = res.detail;
+				that.prolist = res.prolist;
+				that.shopset = res.shopset;
+				that.storeinfo = res.storeinfo;
+				that.lefttime = res.lefttime;
+				that.codtxt = res.codtxt;
+				if (res.lefttime > 0) {
+					interval = setInterval(function () {
+						that.lefttime = that.lefttime - 1;
+						that.getdjs();
+					}, 1000);
+				}
+				that.loaded();
+			});
+		},
+    getdjs: function () {
+      var that = this;
+      var totalsec = that.lefttime;
+
+      if (totalsec <= 0) {
+        that.djs = '00时00分00秒';
+      } else {
+        var houer = Math.floor(totalsec / 3600);
+        var min = Math.floor((totalsec - houer * 3600) / 60);
+        var sec = totalsec - houer * 3600 - min * 60;
+        var djs = (houer < 10 ? '0' : '') + houer + '时' + (min < 10 ? '0' : '') + min + '分' + (sec < 10 ? '0' : '') + sec + '秒';
+        that.djs = djs;
+      }
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiRestaurantTakeaway/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            app.goback(true);
+          }, 1000);
+        });
+      });
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiRestaurantTakeaway/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		quxiao:function(e){
+			var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要取消订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiRestaurantTakeaway/quxiao', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+		},
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+				app.showLoading('收货中');
+        app.post('ApiRestaurantTakeaway/orderCollect', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		showhxqr:function(){
+			this.$refs.dialogHxqr.open();
+		},
+		closeHxqr:function(){
+			this.$refs.dialogHxqr.close();
+		}
+  }
+};
+</script>
+<style>
+.ordertop{width:100%;height:220rpx;padding:50rpx 0 0 70rpx}
+.ordertop .f1{color:#fff}
+.ordertop .f1 .t1{font-size:32rpx;height:60rpx;line-height:60rpx}
+.ordertop .f1 .t2{font-size:24rpx}
+
+.address{ display:flex;width: 100%; padding: 20rpx 3%; background: #FFF;margin-bottom:20rpx;}
+.address .img{width:40rpx}
+.address image{width:40rpx; height:40rpx;}
+.address .info{flex:1;display:flex;flex-direction:column;}
+.address .info .t1{font-size:28rpx;font-weight:bold;color:#333}
+.address .info .t2{font-size:24rpx;color:#999}
+
+.product{width:100%; padding: 14rpx 3%;background: #FFF;}
+.product .content{display:flex;position:relative;width: 100%; padding:16rpx 0px;border-bottom: 1px #e5e5e5 dashed;}
+.product .content:last-child{ border-bottom: 0; }
+.product .content image{ width: 140rpx; height: 140rpx;}
+.product .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.product .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.product .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.product .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.product .content .detail .x1{ flex:1}
+.product .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+.product .content .comment{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc702 solid; border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.product .content .comment2{position:absolute;top:64rpx;right:10rpx;border: 1px #ffc7c2 solid; border-radius:10rpx;background:#fff; color: #ffc7c2;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.orderinfo{ width:100%;margin-top:10rpx;padding: 14rpx 3%;background: #FFF;}
+.orderinfo .item{display:flex;width:100%;padding:20rpx 0;border-bottom:1px dashed #ededed;}
+.orderinfo .item:last-child{ border-bottom: 0;}
+.orderinfo .item .t1{width:200rpx;}
+.orderinfo .item .t2{flex:1;text-align:right}
+.orderinfo .item .red{color:red}
+
+.bottom{ width: 100%; padding: 16rpx 20rpx;background: #fff; position: fixed; bottom: 0px;left: 0px;display:flex;justify-content:flex-end;align-items:center;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+.btn3{position:absolute;top:60rpx;right:10rpx;font-size:24rpx;width:120rpx;height:50rpx;line-height:50rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+.btitle{ width:100%;height:100rpx;background:#fff;padding:0 20rpx;border-bottom:1px solid #f5f5f5}
+.btitle .comment{border: 1px #ffc702 solid;border-radius:10rpx;background:#fff; color: #ffc702;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+.btitle .comment2{border: 1px #ffc7c0 solid;border-radius:10rpx;background:#fff; color: #ffc7c0;  padding: 0 10rpx; height: 46rpx; line-height: 46rpx;}
+
+.hxqrbox{background:#fff;padding:50rpx;position:relative;border-radius:20rpx}
+.hxqrbox .img{width:400rpx;height:400rpx}
+.hxqrbox .txt{color:#666;margin-top:20rpx;font-size:26rpx;text-align:center}
+.hxqrbox .close{width:50rpx;height:50rpx;position:absolute;bottom:-100rpx;left:50%;margin-left:-25rpx;border:1px solid rgba(255,255,255,0.5);border-radius:50%;padding:8rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/orderlist.vue b/restaurant/takeaway/orderlist.vue
new file mode 100644
index 0000000..087ee14
--- /dev/null
+++ b/restaurant/takeaway/orderlist.vue
@@ -0,0 +1,237 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<dd-tab :itemdata="['全部','待付款','已付款','配送中','已完成','退款']" :itemst="['all','0','1','12','2','3','10']" :st="st" :isfixed="true" @changetab="changetab"></dd-tab>
+		<view class="order-content">
+			<block v-for="(item, index) in datalist" :key="index">
+				<view class="order-box" @tap="goto" :data-url="'orderdetail?id=' + item.id">
+					<view class="head">
+						<view class="f1" v-if="item.bid!=0 && item.binfo" @tap.stop="goto" :data-url="'/restaurant/takeaway/index?bid=' + item.bid"><image :src="event_rul + '/static/img/static/img/ico-shop.png'"></image> {{item.binfo.name}}</view>
+						<view v-else>订单号：{{item.ordernum}}</view>
+						<view class="flex1"></view>
+						<text v-if="item.status==0" class="st0">待付款</text>
+						<text v-if="item.status==1" class="st1">已付款</text>
+						<text v-if="item.status==12" class="st1">已接单</text>
+						<text v-if="item.status==2" class="st2">配送中</text>
+						<text v-if="item.status==3" class="st3">已完成</text>
+						<text v-if="item.status==4" class="st4">已关闭</text>
+					</view>
+
+					<block v-for="(item2, idx) in item.prolist" :key="idx">
+						<view class="content" :style="idx+1==item.procount?'border-bottom:none':''">
+							<view>
+								<image :src="item2.pic"></image>
+							</view>
+							<view class="detail">
+								<text class="t1">{{item2.name}}</text>
+								<text class="t2">{{item2.ggname}}</text>
+								<view class="t3"><text class="x1 flex1">￥{{item2.sell_price}}</text><text class="x2">×{{item2.num}}</text></view>
+							</view>
+						</view>
+					</block>
+					<view class="bottom">
+						<text>共计{{item.procount}}件商品 实付:￥{{item.totalprice}}</text>
+						<text v-if="item.refund_status==1" style="color:red"> 退款中￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==2" style="color:red"> 已退款￥{{item.refund_money}}</text>
+						<text v-if="item.refund_status==3" style="color:red"> 退款申请已驳回</text>
+					</view>
+					<view class="op">
+						<view @tap.stop="goto" :data-url="'orderdetail?id=' + item.id" class="btn2">详情</view>
+						<block v-if="item.status==0">
+							<view class="btn2" @tap.stop="toclose" :data-id="item.id">关闭订单</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'/pages/pay/pay?id=' + item.payorderid">去付款</view>
+						</block>
+						<block v-if="item.status==1">
+							<view class="btn2" @tap.stop="quxiao" :data-id="item.id">取消订单</view>
+						</block>
+						<block v-if="item.status==12 || item.status==2">
+							<view v-if="item.refund_status==0 || item.refund_status==3" class="btn2" @tap.stop="goto" :data-url="'refund?orderid=' + item.id + '&price=' + item.totalprice">申请退款</view>
+						</block>
+						<block v-if="item.status==2">
+							<view class="btn2" @tap.stop="goto" :data-url="'logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">配送详情</view>
+							<view class="btn1" :style="{background:t('color1')}" @tap.stop="orderCollect" :data-id="item.id" v-if="item.paytype!='货到付款'">确认收货</view>
+						</block>
+						<block v-if="item.status==3 || item.status==4">
+							<view class="btn2" @tap.stop="todel" :data-id="item.id">删除订单</view>
+						</block>
+						<block v-if="item.status==3">
+							<view class="btn2" @tap.stop="goto" :data-url="'logistics?express_com=' + item.express_com + '&express_no=' + item.express_no" v-if="item.freight_type!=3 && item.freight_type!=4">配送详情</view>
+							<view v-if="item.iscommentdp==0" class="btn1" :style="{background:t('color1')}" @tap.stop="goto" :data-url="'commentdp?orderid=' + item.id">评价店铺</view>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		<nomore v-if="nomore"></nomore>
+		<nodata v-if="nodata"></nodata>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+		opt:{},
+		loading:false,
+		isload: false,
+		menuindex:-1,
+
+		st: 'all',
+		datalist: [],
+		pagenum: 1,
+		nomore: false,
+		nodata:false,
+		codtxt: "",
+
+		event_rul: app.globalData.event_url,
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		if(this.opt && this.opt.st){
+			this.st = this.opt.st;
+		}
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  onReachBottom: function () {
+    if (!this.nodata && !this.nomore) {
+      this.pagenum = this.pagenum + 1;
+      this.getdata(true);
+    }
+  },
+  methods: {
+    getdata: function (loadmore) {
+			if(!loadmore){
+				this.pagenum = 1;
+				this.datalist = [];
+			}
+      var that = this;
+      var pagenum = that.pagenum;
+      var st = that.st;
+			that.nodata = false;
+			that.nomore = false;
+			that.loading = true;
+      app.post('ApiRestaurantTakeaway/orderlist', {st: st,pagenum: pagenum}, function (res) {
+				that.loading = false;
+        var data = res.datalist;
+        if (pagenum == 1) {
+					that.datalist = data;
+          if (data.length == 0) {
+            that.nodata = true;
+          }
+					that.loaded();
+        }else{
+          if (data.length == 0) {
+            that.nomore = true;
+          } else {
+            var datalist = that.datalist;
+            var newdata = datalist.concat(data);
+            that.datalist = newdata;
+          }
+        }
+      });
+    },
+    changetab: function (st) {
+      this.st = st;
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 0
+      });
+      this.getdata();
+    },
+    toclose: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要关闭该订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiRestaurantTakeaway/closeOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+    todel: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要删除该订单吗?', function () {
+				app.showLoading('删除中');
+        app.post('ApiRestaurantTakeaway/delOrder', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    },
+		quxiao:function(e){
+			var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要取消订单吗?', function () {
+				app.showLoading('提交中');
+        app.post('ApiRestaurantTakeaway/quxiao', {orderid: orderid}, function (data) {
+					app.showLoading(false);
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+		},
+    orderCollect: function (e) {
+      var that = this;
+      var orderid = e.currentTarget.dataset.id;
+      app.confirm('确定要收货吗?', function () {
+        app.post('ApiRestaurantTakeaway/orderCollect', {orderid: orderid}, function (data) {
+          app.success(data.msg);
+          setTimeout(function () {
+            that.getdata();
+          }, 1000);
+        });
+      });
+    }
+  }
+};
+</script>
+<style>
+.container{ width:100%;margin-top:90rpx}
+.order-content{display:flex;flex-direction:column}
+.order-box{ width: 94%;margin:10rpx 3%;padding:6rpx 3%; background: #fff;border-radius:8px}
+.order-box .head{ display:flex;width:100%; border-bottom: 1px #f4f4f4 solid; height: 70rpx; line-height: 70rpx; overflow: hidden; color: #999;}
+.order-box .head .f1{display:flex;align-items:center;color:#333}
+.order-box .head .f1 image{width:34rpx;height:34rpx;margin-right:4px}
+.order-box .head .st0{ width: 140rpx; color: #ff8758; text-align: right; }
+.order-box .head .st1{ width: 140rpx; color: #ffc702; text-align: right; }
+.order-box .head .st2{ width: 140rpx; color: #ff4246; text-align: right; }
+.order-box .head .st3{ width: 140rpx; color: #999; text-align: right; }
+.order-box .head .st4{ width: 140rpx; color: #bbb; text-align: right; }
+
+.order-box .content{display:flex;width: 100%; padding:16rpx 0px;border-bottom: 1px #f4f4f4 dashed;position:relative}
+.order-box .content:last-child{ border-bottom: 0; }
+.order-box .content image{ width: 140rpx; height: 140rpx;}
+.order-box .content .detail{display:flex;flex-direction:column;margin-left:14rpx;flex:1}
+.order-box .content .detail .t1{font-size:26rpx;line-height:36rpx;margin-bottom:10rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;}
+.order-box .content .detail .t2{height: 46rpx;line-height: 46rpx;color: #999;overflow: hidden;font-size: 26rpx;}
+.order-box .content .detail .t3{display:flex;height:40rpx;line-height:40rpx;color: #ff4246;}
+.order-box .content .detail .x1{ flex:1}
+.order-box .content .detail .x2{ width:100rpx;font-size:32rpx;text-align:right;margin-right:8rpx}
+
+.order-box .bottom{ width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+.order-box .op{ display:flex;justify-content:flex-end;align-items:center;width:100%; padding: 10rpx 0px; border-top: 1px #f4f4f4 solid; color: #555;}
+
+.btn1{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#fff;border-radius:3px;text-align:center}
+.btn2{margin-left:20rpx;width:160rpx;height:60rpx;line-height:60rpx;color:#333;background:#fff;border:1px solid #cdcdcd;border-radius:3px;text-align:center}
+
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/product.vue b/restaurant/takeaway/product.vue
new file mode 100644
index 0000000..47abde2
--- /dev/null
+++ b/restaurant/takeaway/product.vue
@@ -0,0 +1,618 @@
+<template>
+<view>
+	<block v-if="isload">
+		<view class="swiper-container" v-if="isplay==0">
+			<swiper class="swiper" :indicator-dots="false" :autoplay="true" :interval="500000" @change="swiperChange">
+				<block v-for="(item, index) in product.pics" :key="index">
+					<swiper-item class="swiper-item">
+						<view class="swiper-item-view"><image class="img" :src="item" mode="widthFix"/></view>
+					</swiper-item>
+				</block>
+			</swiper>
+			<view class="imageCount">{{current+1}}/{{(product.pics).length}}</view>
+			<view v-if="product.video" class="provideo" @tap="payvideo"><image :src="event_rul +'/static/img/static/img/video.png'"/><view class="txt">{{product.video_duration}}</view></view>
+		</view>
+		<view class="videobox" v-if="isplay==1">
+			<video autoplay="true" class="video" id="video" :src="product.video"></video>
+			<view class="parsevideo" @tap="parsevideo">退出播放</view>
+		</view>
+		<view class="header"> 
+			<view class="price_share">
+				<view class="price">
+					<view class="f1"><text style="font-size:36rpx">￥</text>{{product.sell_price}}</view>
+					<view class="f2" v-if="product.market_price*1 > product.sell_price*1">￥{{product.market_price}}</view>
+				</view>
+				<view class="share" @tap="shareClick"><image class="img" :src="event_rul +'/static/img/static/img/share.png'"/><text class="txt">分享</text></view>
+			</view>
+			<view class="title">{{product.name}}</view>
+			<view class="sales_stock">
+				<view class="f1">销量：{{product.sales}} </view>
+				<view class="f1" v-if="product.limit_start > 0">起售：{{product.limit_start}} </view>
+				<view class="f1" v-if="product.limit_per > 0">限购：{{product.limit_per}} </view>
+				<view class="f2">库存：{{product.stock}}</view>
+			</view>
+			<view class="commission" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}" v-if="shopset.showcommission==1 && product.commission > 0">分享好友购买可得{{t('佣金')}}：<text style="font-weight:bold;padding:0 2px">{{product.commission}}</text>{{product.commission_desc}}</view>
+		</view>
+		<view class="choose" @tap="buydialogChange" data-btntype="2">
+			<view class="f1 flex1">请选择商品规格及数量</view>
+			<image class="f2" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+		</view>
+		
+		<view class="cuxiaodiv" v-if="product.givescore > 0">
+			<view class="cuxiaopoint">
+				<view class="f0">送{{t('积分')}}</view>
+				<view class="f1" style="font-size:26rpx">购买可得{{t('积分')}}{{product.givescore}}个</view>
+			</view>
+		</view>
+
+		<view class="cuxiaodiv" v-if="cuxiaolist.length>0 || couponlist.length>0">
+			<view class="cuxiaopoint" v-if="cuxiaolist.length>0">
+				<view class="f0">促销</view>
+				<view class="f1" @tap="showcuxiaodetail">
+					<view v-for="(item, index) in cuxiaolist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0">{{item.tip}}</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+			<view class="cuxiaopoint" v-if="couponlist.length>0">
+				<view class="f0">优惠</view>
+				<view class="f1" @tap="showcuxiaodetail">
+					<view v-for="(item, index) in couponlist" :key="index" class="t" :style="{background:'rgba('+t('color1rgb')+',0.1)',color:t('color1')}"><text class="t0" style="padding:0 6px">券</text><text class="t1">{{item.name}}</text></view>
+				</view>
+				<view class="f2" @tap="showcuxiaodetail">
+					<image class="img" :src="event_rul +'/static/img/static/img/arrowright.png'"/>
+				</view>
+			</view>
+		</view>
+		<view v-if="showcuxiaodialog" class="popup__container">
+			<view class="popup__overlay" @tap.stop="hidecuxiaodetail"></view>
+			<view class="popup__modal">
+					<view class="popup__title">
+						<text class="popup__title-text">优惠促销</text>
+						<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidecuxiaodetail"/>
+					</view>
+					<view class="popup__content">
+						<view v-for="(item, index) in cuxiaolist" :key="index" class="service-item">
+							<view class="suffix">
+								<view class="type-name"><text style="border-radius:4px;border:1px solid #f05423;color: #ff550f;font-size:20rpx;padding:2px 5px">{{item.tip}}</text> <text style="color:#333;margin-left:20rpx">{{item.name}}</text></view>
+							</view>
+						</view>
+						<couponlist :couponlist="couponlist" @getcoupon="getcoupon"></couponlist>
+					</view>
+			</view>
+		</view>
+		<view class="commentbox" v-if="shopset.takeaway_comment==1 && commentcount > 0">
+			<view class="title">
+				<view class="f1">评价({{commentcount}})</view>
+				<view class="f2" @tap="goto" :data-url="'commentlist?proid=' + product.id">好评度 <text :style="{color:t('color1')}">{{product.comment_haopercent}}%</text><image style="width:32rpx;height:32rpx;" :src="event_rul +'/static/img/static/img/arrowright.png'"/></view>
+			</view>
+			<view class="comment">
+				<view class="item" v-if="commentlist.length>0">
+					<view class="f1">
+						<image class="t1" :src="commentlist[0].headimg"/>
+						<view class="t2">{{commentlist[0].nickname}}</view>
+						<view class="flex1"></view>
+						<view class="t3"><image class="img" v-for="(item2,index2) in [0,1,2,3,4]" :src="event_rul +'/static/img/static/img/star' + (commentlist[0].score>item2?'2':'') + '.png'"/></view>
+					</view>
+					<view class="f2">
+						<text class="t1">{{commentlist[0].content}}</text>
+						<view class="t2">
+							<block v-if="commentlist[0].content_pic!=''">
+								<block v-for="(itemp, index) in commentlist[0].content_pic" :key="index">
+									<view @tap="previewImage" :data-url="itemp" :data-urls="commentlist[0].content_pic">
+										<image :src="itemp" mode="widthFix"/>
+									</view>
+								</block>
+							</block>
+						</view>
+					</view>
+					<view class="f3" @tap="goto" :data-url="'commentlist?proid=' + product.id">查看全部评价</view>
+				</view>
+				<view v-else class="nocomment">暂无评价~</view>
+			</view>
+		</view>
+		
+		<!-- <view class="shop" v-if="shopset.showjd==1">
+			<image :src="business.logo" class="p1"/>
+			<view class="p2 flex1">
+				<view class="t1">{{business.name}}</view>
+				<view class="t2">{{business.desc}}</view>
+			</view>
+			<button class="p4" :style="{background:'linear-gradient(90deg,'+t('color1')+' 0%,rgba('+t('color1rgb')+',0.8) 100%)'}" @tap="goto" :data-url="product.bid==0?'/pages/index/index':'/pages/business/index?id='+product.bid" data-opentype="reLaunch">进入店铺</button>
+		</view> -->
+		<view class="detail_title"><view class="t1"></view><view class="t2"></view><view class="t0">商品描述</view><view class="t2"></view><view class="t1"></view></view>
+		<view class="detail">
+			<dp :pagecontent="pagecontent"></dp>
+		</view>
+
+		<view style="width:100%;height:140rpx;"></view>
+		<view class="bottombar flex-row" :class="menuindex>-1?'tabbarbot':''" v-if="product.status==1">
+			<view class="f1">
+				<view class="item" @tap="goto" :data-url="kfurl" v-if="kfurl!='contact::'">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</view>
+				<button class="item" v-else open-type="contact">
+					<image class="img" :src="event_rul +'/static/img/static/img/kefu.png'"/>
+					<view class="t1">客服</view>
+				</button>
+				<view class="item flex1" @tap="goto" :data-url="'index?bid='+product.bid">
+					<image class="img" :src="event_rul +'/static/img/static/img/gwc.png'"/>
+					<view class="t1">购物车</view>
+					<view class="cartnum" v-if="cartnum>0" :style="{background:'rgba('+t('color1rgb')+',0.8)'}">{{cartnum}}</view>
+				</view>
+				<view class="item" @tap="addfavorite">
+					<image class="img" :src="event_rul +'/static/img/static/img/shoucang.png'"/>
+					<view class="t1">{{isfavorite?'已收藏':'收藏'}}</view>
+				</view>
+			</view>
+			<view class="op" v-if="product.stock > 0 && product.stock_daily > product.sales_daily">
+				<view class="tocart flex-x-center flex-y-center" :style="{background:t('color2')}" @tap="buydialogChange" data-btntype="1" v-if="product.freighttype!=3 && product.freighttype!=4">加入购物车</view>
+			</view>
+			<view class="op" v-else>
+				<view class="tobuy flex-x-center flex-y-center" style="background-color: #ccc;" data-btntype="2">已售罄</view>
+			</view>
+		</view>
+		<buydialog v-if="buydialogShow" :proid="product.id" :btntype="btntype" @buydialogChange="buydialogChange" @addcart="addcart" :menuindex="menuindex" controller="ApiRestaurantTakeaway"></buydialog>
+		<scrolltop :isshow="scrolltopshow"></scrolltop>
+
+		
+		<view v-if="sharetypevisible" class="popup__container">
+			<view class="popup__overlay" @tap.stop="handleClickMask"></view>
+			<view class="popup__modal" style="height:320rpx;min-height:320rpx">
+				<!-- <view class="popup__title">
+					<text class="popup__title-text">请选择分享方式</text>
+					<image :src="event_rul +'/static/img/static/img/close.png'" class="popup__close" style="width:36rpx;height:36rpx" @tap.stop="hidePstimeDialog"/>
+				</view> -->
+				<view class="popup__content">
+					<view class="sharetypecontent">
+						<view class="f1" @tap="shareapp" v-if="getplatform() == 'app'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'mp'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<view class="f1" @tap="sharemp" v-else-if="getplatform() == 'h5'">
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</view>
+						<button class="f1" open-type="share" v-else>
+							<image class="img" :src="event_rul +'/static/img/static/img/weixin.png'"/>
+							<text class="t1">分享给好友</text>
+						</button>
+						<view class="f2" @tap="showPoster">
+							<image class="img" :src="event_rul +'/static/img/static/img/sharepic.png'"/>
+							<text class="t1">生成分享图片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="posterDialog" v-if="showposter">
+			<view class="main">
+				<view class="close" @tap="posterDialogClose"><image class="img" :src="event_rul +'/static/img/static/img/close.png'"/></view>
+				<view class="content">
+					<image class="img" :src="posterpic" mode="widthFix" @tap="previewImage" :data-url="posterpic"></image>
+				</view>
+			</view>
+		</view>
+
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt" @getmenuindex="getmenuindex"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+var interval = null;
+
+export default {
+  
+	data() {
+  
+		return {
+				
+			opt:{},
+			loading:false,
+			isload: false,
+			menuindex:-1,
+
+			isload:false,
+			buydialogShow: false,
+			btntype:1,
+			isfavorite: false,
+			current: 0,
+			isplay: 0,
+			showcuxiaodialog: false,
+			business: "",
+			product: [],
+
+			cartnum: "",
+			commentlist: "",
+			commentcount: "",
+
+			cuxiaolist: "",
+
+			couponlist: "",
+
+			pagecontent: "",
+
+			shopset: "",
+
+			sharetypevisible: false,
+
+			showposter: false,
+
+			posterpic: "",
+
+			scrolltopshow: false,
+			kfurl:'',
+
+			event_rul: app.globalData.event_url,
+		};
+
+	},
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+	onShareAppMessage:function(){
+		return this._sharewx({title:this.product.name,pic:this.product.pic});
+	},
+
+	onUnload: function () {
+		clearInterval(interval);
+
+	},
+
+	methods: {
+		getdata:function(){
+			var that = this;
+			var id = this.opt.id || 0;
+			that.loading = true;
+			app.get('ApiRestaurantTakeaway/product', {id: id}, function (res) {
+				that.loading = false;
+				if (res.status == 0) {
+					app.alert(res.msg);
+					return;
+				}
+				var product = res.product;
+				var pagecontent = JSON.parse(product.detail);
+				that.business = res.business;
+				that.product = product;
+				that.cartnum = res.cartnum;
+				that.commentlist = res.commentlist;
+				that.commentcount = res.commentcount;
+				that.cuxiaolist = res.cuxiaolist;
+				that.couponlist = res.couponlist;
+				that.pagecontent = pagecontent;
+				that.shopset = res.shopset;
+				that.isfavorite = res.isfavorite;
+				uni.setNavigationBarTitle({
+					title: product.name
+				});
+
+				that.kfurl = '/pages/kefu/index?bid='+product.bid;
+				if(app.globalData.initdata.kfurl != ''){
+					that.kfurl = app.globalData.initdata.kfurl;
+				}
+				that.loaded({title:product.name,pic:product.pic});
+			});
+		},
+
+		swiperChange: function (e) {
+
+			var that = this;
+
+			that.current = e.detail.current
+
+		},
+
+		payvideo: function () {
+
+			this.isplay = 1
+;
+			uni.createVideoContext('video').play();
+
+		},
+
+		parsevideo: function () {
+
+			this.isplay = 0
+;
+			uni.createVideoContext('video').stop();
+
+		},
+
+		buydialogChange: function (e) {
+			if(!this.buydialogShow){
+				this.btntype = e.currentTarget.dataset.btntype
+			}
+
+			this.buydialogShow = !this.buydialogShow;
+
+		},
+		addcart:function(e){
+			this.cartnum += e.num
+		},
+
+		//收藏操作
+
+		addfavorite: function () {
+
+			var that = this;
+
+			var proid = that.product.id;
+
+			app.post('ApiRestaurantTakeaway/addfavorite', {proid: proid,type: 'restaurant'
+}, function (data) {
+
+				if (data.status == 1) {
+
+					that.isfavorite = !that.isfavorite;
+
+				}
+
+
+				app.success(data.msg);
+
+			});
+
+		},
+
+		shareClick: function () {
+
+			this.sharetypevisible = true
+;
+		},
+
+		handleClickMask: function () {
+
+			this.sharetypevisible = false
+
+		},
+
+		showPoster: function () {
+
+			var that = this;
+
+			that.showposter = true;
+			that.sharetypevisible = false;
+			app.showLoading('生成海报中');
+
+			app.post('ApiRestaurantTakeaway/getposter', {
+proid: that.product.id
+}, function (data) {
+
+				app.showLoading(false);
+				if (data.status == 0) {
+
+					app.alert(data.msg);
+
+				} else {
+
+					that.posterpic = data.poster;
+
+				}
+
+			});
+
+		},
+
+		posterDialogClose: function () {
+
+			this.showposter = false;
+
+		},
+
+		showcuxiaodetail: function () {
+
+			this.showcuxiaodialog = true;
+
+		},
+
+		hidecuxiaodetail: function () {
+
+			this.showcuxiaodialog = false
+
+		},
+		getcoupon:function(){
+			this.showcuxiaodialog = false;
+			this.getdata();
+		},
+
+		onPageScroll: function (e) {
+
+			var that = this;
+
+			var scrollY = e.scrollTop;     
+			if (scrollY > 200) {
+				that.scrolltopshow = true
+
+;
+			}
+			if(scrollY < 150) {
+
+				that.scrolltopshow = false
+
+			}
+
+		},
+		
+		sharemp:function(){
+			app.error('点击右上角发送给好友或分享到朋友圈');
+			this.sharetypevisible = false
+		},
+		shareapp:function(){
+			var that = this;
+			that.sharetypevisible = false;
+			uni.showActionSheet({
+        itemList: ['发送给微信好友', '分享到微信朋友圈'],
+        success: function (res){
+					if(res.tapIndex >= 0){
+						var scene = 'WXSceneSession';
+						if (res.tapIndex == 1) {
+							scene = 'WXSenceTimeline';
+						}
+						var sharedata = {};
+						sharedata.provider = 'weixin';
+						sharedata.type = 0;
+						sharedata.scene = scene;
+						sharedata.title = that.product.name;
+						//sharedata.summary = app.globalData.initdata.desc;
+						sharedata.href = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#/restaurant/takeaway/product?scene=id_'+that.product.id+'-pid_' + app.globalData.mid;
+						sharedata.imageUrl = that.product.pic;
+						var sharelist = app.globalData.initdata.sharelist;
+						if(sharelist){
+							for(var i=0;i<sharelist.length;i++){
+								if(sharelist[i]['indexurl'] == '/restaurant/takeaway/product'){
+									sharedata.title = sharelist[i].title;
+									sharedata.summary = sharelist[i].desc;
+									sharedata.imageUrl = sharelist[i].pic;
+									if(sharelist[i].url){
+										var sharelink = sharelist[i].url;
+										if(sharelink.indexOf('/') === 0){
+											sharelink = app.globalData.pre_url +'/h5/'+app.globalData.aid+'.html#'+ sharelink;
+										}
+										if(app.globalData.mid>0){
+											 sharelink += (sharelink.indexOf('?') === -1 ? '?' : '&') + 'pid='+app.globalData.mid;
+										}
+										sharedata.href = sharelink;
+									}
+								}
+							}
+						}
+						uni.share(sharedata);
+					}
+        }
+      });
+		}
+
+	}
+
+};
+</script>
+<style>
+.swiper-container{position:relative}
+.swiper {width: 100%;height: 750rpx;overflow: hidden;}
+.swiper-item-view{width: 100%;height: 750rpx;}
+.swiper .img {width: 100%;height: 750rpx;overflow: hidden;}
+
+.imageCount {width:100rpx;height:50rpx;background-color: rgba(0, 0, 0, 0.3);border-radius:40rpx;line-height:50rpx;color:#fff;text-align:center;font-size:26rpx;position:absolute;right:13px;bottom:20rpx;}
+
+.provideo{background:rgba(255,255,255,0.7);width:160rpx;height:54rpx;padding:0 20rpx 0 4rpx;border-radius:27rpx;position:absolute;bottom:30rpx;left:50%;margin-left:-80rpx;display:flex;align-items:center;justify-content:space-between}
+.provideo image{width:50rpx;height:50rpx;}
+.provideo .txt{flex:1;text-align:center;padding-left:10rpx;font-size:24rpx;color:#333}
+
+.videobox{width:100%;height:750rpx;text-align:center;background:#000}
+.videobox .video{width:100%;height:650rpx;}
+.videobox .parsevideo{margin:0 auto;margin-top:20rpx;height:40rpx;line-height:40rpx;color:#333;background:#ccc;width:140rpx;border-radius:25rpx;font-size:24rpx}
+
+.header {width: 100%;padding: 20rpx 3%;background: #fff;}
+.header .price_share{width:100%;height:100rpx;display:flex;align-items:center;justify-content:space-between}
+.header .price_share .price{display:flex;align-items:flex-end}
+.header .price_share .price .f1{font-size:50rpx;color:#51B539;font-weight:bold}
+.header .price_share .price .f2{font-size:26rpx;color:#C2C2C2;text-decoration:line-through;margin-left:30rpx;padding-bottom:5px}
+.header .price_share .share{display:flex;flex-direction:column;align-items:center;justify-content:center}
+.header .price_share .share .img{width:32rpx;height:32rpx;margin-bottom:2px}
+.header .price_share .share .txt{color:#333333;font-size:20rpx}
+.header .title {color:#000000;font-size:32rpx;line-height:42rpx;font-weight:bold;}
+.header .sales_stock{display:flex;justify-content:space-between;height:60rpx;line-height:60rpx;margin-top:30rpx;font-size:24rpx;color:#777777}
+.header .commission{display:inline-block;margin-top:20rpx;margin-bottom:10rpx;border-radius:10rpx;font-size:20rpx;height:44rpx;line-height:44rpx;padding:0 20rpx}
+
+.choose{ display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; height: 88rpx; line-height: 88rpx;padding: 0 3%; color: #333; }
+.choose .f2{ width: 32rpx; height: 32rpx;}
+
+.cuxiaodiv{background:#fff;margin-top:20rpx;padding: 0 3%;}
+.cuxiaopoint{width:100%;font-size:24rpx;color:#333;height:88rpx;line-height:88rpx;padding:12rpx 0;display:flex;align-items:center}
+.cuxiaopoint .f0{color:#777777;height:32rpx;font-size:24rpx;padding-right:20rpx;display:flex;justify-content:center;align-items:center}
+.cuxiaopoint .f1{margin-right:20rpx;flex:1;display:flex;flex-wrap:nowrap;overflow:hidden}
+.cuxiaopoint .f1 .t{margin-left:10rpx;border-radius:3px;font-size:24rpx;height:40rpx;line-height:40rpx;padding-right:10rpx;flex-shrink:0;overflow:hidden}
+.cuxiaopoint .f1 .t0{display:inline-block;padding:0 5px;}
+.cuxiaopoint .f1 .t1{padding:0 4px}
+.cuxiaopoint .f2{flex-shrink:0;display:flex;align-items:center;width:32rpx;height: 32rpx;}
+.cuxiaopoint .f2 .img{width:32rpx;height:32rpx;}
+.cuxiaodiv .cuxiaopoint{border-bottom:1px solid #E6E6E6;}
+.cuxiaodiv .cuxiaopoint:last-child{border-bottom:0}
+
+.popup__container{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height:auto;z-index:10;background:#fff}
+.popup__overlay{position: fixed;bottom: 0;left: 0;right: 0;width:100%;height: 100%;z-index: 11;opacity:0.3;background:#000}
+.popup__modal{width: 100%;position: absolute;bottom: 0;color: #3d4145;overflow-x: hidden;overflow-y: hidden;opacity:1;padding-bottom:20rpx;background: #fff;border-radius:20rpx 20rpx 0 0;z-index:12;min-height:600rpx;max-height:1000rpx;}
+.popup__title{text-align: center;padding:30rpx;position: relative;position:relative}
+.popup__title-text{font-size:32rpx}
+.popup__close{position:absolute;top:34rpx;right:34rpx}
+.popup__content{width:100%;max-height:880rpx;overflow-y:scroll;padding:20rpx 0;}
+.service-item{display: flex;padding:0 40rpx 20rpx 40rpx;}
+.service-item .prefix{padding-top: 2px;}
+.service-item .suffix{padding-left: 10rpx;}
+.service-item .suffix .type-name{font-size:28rpx; color: #49aa34;margin-bottom: 10rpx;}
+
+
+.shop{display:flex;align-items:center;width: 100%; background: #fff;  margin-top: 20rpx; padding: 20rpx 3%;position: relative; min-height: 100rpx;}
+.shop .p1{width:90rpx;height:90rpx;border-radius:6rpx;flex-shrink:0}
+.shop .p2{padding-left:10rpx}
+.shop .p2 .t1{width: 100%;height:40rpx;line-height:40rpx;overflow: hidden;color: #111;font-weight:bold;font-size:30rpx;}
+.shop .p2 .t2{width: 100%;height:30rpx;line-height:30rpx;overflow: hidden;color: #999;font-size:24rpx;margin-top:8rpx}
+.shop .p4{height:64rpx;line-height:64rpx;color:#FFFFFF;border-radius:32rpx;margin-left:20rpx;flex-shrink:0;padding:0 30rpx;font-size:24rpx;font-weight:bold}
+
+.detail{min-height:200rpx;}
+
+.detail_title{width:100%;display:flex;align-items:center;justify-content:center;margin-top:60rpx;margin-bottom:30rpx}
+.detail_title .t0{font-size:28rpx;font-weight:bold;color:#222222;margin:0 20rpx}
+.detail_title .t1{width:12rpx;height:12rpx;background:rgba(253, 74, 70, 0.2);transform:rotate(45deg);margin:0 4rpx;margin-top:6rpx}
+.detail_title .t2{width:18rpx;height:18rpx;background:rgba(253, 74, 70, 0.4);transform:rotate(45deg);margin:0 4rpx}
+
+.commentbox{width:100%;background:#fff;padding:0 3%;margin-top:20rpx}
+.commentbox .title{height:90rpx;line-height:90rpx;border-bottom:1px solid #DDDDDD;display:flex}
+.commentbox .title .f1{flex:1;color:#111111;font-weight:bold;font-size:30rpx}
+.commentbox .title .f2{color:#333;font-weight:bold;font-size:28rpx;display:flex;align-items:center}
+.commentbox .nocomment{height:100rpx;line-height:100rpx}
+
+.comment{display:flex;flex-direction:column;min-height:200rpx;}
+.comment .item{background-color:#fff;padding:10rpx 20rpx;display:flex;flex-direction:column;}
+.comment .item .f1{display:flex;width:100%;align-items:center;padding:10rpx 0;}
+.comment .item .f1 .t1{width:70rpx;height:70rpx;border-radius:50%;}
+.comment .item .f1 .t2{padding-left:10rpx;color:#333;font-weight:bold;font-size:30rpx;}
+.comment .item .f1 .t3{text-align:right;}
+.comment .item .f1 .t3 .img{width:24rpx;height:24rpx;margin-left:10rpx}
+.comment .item .score{ font-size: 24rpx;color:#f99716;}
+.comment .item .score image{ width: 140rpx; height: 50rpx; vertical-align: middle;  margin-bottom:6rpx; margin-right: 6rpx;}
+.comment .item .f2{display:flex;flex-direction:column;width:100%;padding:10rpx 0;}
+.comment .item .f2 .t1{color:#333;font-size:28rpx;}
+.comment .item .f2 .t2{display:flex;width:100%}
+.comment .item .f2 .t2 image{width:100rpx;height:100rpx;margin:10rpx;}
+.comment .item .f2 .t3{color:#aaa;font-size:24rpx;}
+.comment .item .f3{margin:20rpx auto;padding:0 30rpx;height:60rpx;line-height:60rpx;border:1px solid #E6E6E6;border-radius:30rpx;color:#111111;font-weight:bold;font-size:26rpx}
+
+.bottombar{ width: 100%; position: fixed;bottom: 0px; left: 0px; background: #fff;display:flex;height:100rpx;padding:0 30rpx 0 10rpx;align-items:center;}
+.bottombar .f1{flex:1;display:flex;align-items:center;margin-right:30rpx}
+.bottombar .f1 .item{display:flex;flex-direction:column;align-items:center;width:80rpx;position:relative}
+.bottombar .f1 .item .img{ width:44rpx;height:44rpx}
+.bottombar .f1 .item .t1{font-size:18rpx;color:#222222;height:30rpx;line-height:30rpx;margin-top:6rpx}
+.bottombar .op{width:60%;border-radius:36rpx;overflow:hidden;display:flex;}
+.bottombar .tocart{flex:1;height:72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none; font-size:28rpx;font-weight:bold}
+.bottombar .tobuy{flex:1;height: 72rpx; line-height: 72rpx;color: #fff; border-radius: 0px; border: none;}
+.bottombar .cartnum{position:absolute;right:4rpx;top:-4rpx;color:#fff;border-radius:50%;width:32rpx;height:32rpx;line-height:32rpx;text-align:center;font-size:22rpx;}
+
+.sharetypecontent{ height:250rpx;width:710rpx;margin:20rpx;display:flex;padding:50rpx;align-items:flex-end}
+.sharetypecontent .f1{ color:#51c332;width:50%;height:150rpx;display:flex;flex-direction:column;align-items:center;background:#fff;font-size:28rpx;border:0}
+.sharetypecontent button::after{border:0}
+.sharetypecontent .f1 .img{width:90rpx;height:90rpx}
+.sharetypecontent .f2{ color:#51c332;width:50%;display:flex;flex-direction:column;align-items:center}
+.sharetypecontent .f2 .img{width:90rpx;height:90rpx}
+.sharetypecontent .t1{height:60rpx;line-height:60rpx;color:#666}
+
+.posterDialog{ position:fixed;z-index:9;width:100%;height:100%;background:rgba(0,0,0,0.8);top:var(--window-top);left:0}
+.posterDialog .main{ width:80%;margin:60rpx 10% 30rpx 10%;background:#fff;position:relative;border-radius:20rpx}
+.posterDialog .close{ position:absolute;padding:20rpx;top:0;right:0}
+.posterDialog .close .img{ width:40rpx;height:40rpx;}
+.posterDialog .content{ width:100%;padding:70rpx 20rpx 30rpx 20rpx;color:#333;font-size:30rpx;text-align:center}
+.posterDialog .content .img{width:540rpx;height:960rpx}
+</style>
\ No newline at end of file
diff --git a/restaurant/takeaway/refund.vue b/restaurant/takeaway/refund.vue
new file mode 100644
index 0000000..2d0921e
--- /dev/null
+++ b/restaurant/takeaway/refund.vue
@@ -0,0 +1,97 @@
+<template>
+<view class="container">
+	<block v-if="isload">
+		<form @submit="formSubmit" @reset="formReset" report-submit="true">
+		<view class="form-content">
+			<view class="form-item">
+				<text class="label">退款原因</text>
+				<view class="input-item"><textarea placeholder="请输入退款原因" placeholder-style="color:#999;" name="reason"></textarea></view>
+			</view>
+			<view class="form-item">
+				<text class="label">退款金额(元)</text>
+				<view class="flex"><input name="money" type="number" :value="totalprice" placeholder="请输入退款金额" placeholder-style="color:#999;"></input></view>
+			</view>
+		</view>
+		<button class="btn" form-type="submit" :style="{background:t('color1')}">确定</button>
+		</form>
+	</block>
+	<loading v-if="loading"></loading>
+	<dp-tabbar :opt="opt"></dp-tabbar>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
+export default {
+  data() {
+    return {
+			opt:{},
+			loading:false,
+      isload: false,
+			menuindex:-1,
+
+      orderid: '',
+      totalprice: 0
+    };
+  },
+
+  onLoad: function (opt) {
+		this.opt = app.getopts(opt);
+		this.orderid = this.opt.orderid,
+		this.totalprice = this.opt.price
+		this.getdata();
+  },
+	onPullDownRefresh: function () {
+		this.getdata();
+	},
+  methods: {
+		getdata: function () {
+			var that = this;
+			that.loading = true;
+			app.post('ApiRestaurantTakeaway/refundinit', {}, function (res) {
+				that.loading = false;
+				that.tmplids = res.tmplids;
+				that.loaded();
+			});
+		},
+    formSubmit: function (e) {
+      var that = this;
+      var orderid = that.orderid;
+      var reason = e.detail.value.reason;
+      var money = parseFloat(e.detail.value.money);
+
+      if (reason == '') {
+        app.alert('请填写退款原因');
+        return;
+      }
+      if (money <= 0 || money > parseFloat(that.totalprice)) {
+        app.alert('退款金额有误');
+        return;
+      }
+			app.showLoading('提交中');
+      app.post('ApiRestaurantTakeaway/refund', {orderid: orderid,reason: reason,money: money}, function (res) {
+				app.showLoading(false);
+        app.alert(res.msg);
+        if (res.status == 1) {
+          that.subscribeMessage(function () {
+            setTimeout(function () {
+              app.goback(true);
+            }, 1000);
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style>
+.form-content{width:94%;margin:10rpx 3%;border-radius:10rpx;display:flex;flex-direction:column;background:#fff;overflow:hidden}
+.form-item{ width:100%;padding: 32rpx 20rpx;}
+.form-item .label{ width:100%;height:60rpx;line-height:60rpx}
+.form-item .input-item{ width:100%;}
+.form-item textarea{ width:100%;height:200rpx;border: 1px #eee solid;padding: 20rpx;}
+.form-item input{ width:100%;border: 1px #f5f5f5 solid;padding: 10rpx;height:80rpx}
+.form-item .mid{ height:80rpx;line-height:80rpx;padding:0 20rpx;}
+.btn{ height:100rpx;line-height: 100rpx;width:90%;margin:0 auto;border-radius:50rpx;margin-top:50rpx;color: #fff;font-size: 30rpx;font-weight:bold}
+</style>
\ No newline at end of file
diff --git a/siteinfo.js b/siteinfo.js
new file mode 100644
index 0000000..f785d64
--- /dev/null
+++ b/siteinfo.js
@@ -0,0 +1 @@
+var siteinfo = {"uniacid":"1","siteroot":"https://jh.xingtongworld.com"};module.exports = siteinfo;
diff --git a/sitemap.json b/sitemap.json
new file mode 100644
index 0000000..ca02add
--- /dev/null
+++ b/sitemap.json
@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}
\ No newline at end of file
diff --git a/static/che.png b/static/che.png
new file mode 100644
index 0000000..42324f9
Binary files /dev/null and b/static/che.png differ
diff --git a/static/css/iconfont.css b/static/css/iconfont.css
new file mode 100644
index 0000000..48429b0
--- /dev/null
+++ b/static/css/iconfont.css
@@ -0,0 +1,316 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3283948 */
+  src:  url('@/static/css/iconfont.ttf?t=1664274166791') format('truetype');
+}
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-shouye2:before {
+  content: "\e8c6";
+}
+
+.icon-kefu1:before {
+  content: "\e753";
+}
+
+.icon-jian:before {
+  content: "\e636";
+}
+
+.icon-shouye1:before {
+  content: "\e61e";
+}
+
+.icon-a-Fill11:before {
+  content: "\e611";
+}
+
+.icon-pailie:before {
+  content: "\e663";
+}
+
+.icon-shipailie:before {
+  content: "\e7a9";
+}
+
+.icon-nvsheng:before {
+  content: "\e633";
+}
+
+.icon-wode:before {
+  content: "\e634";
+}
+
+.icon-dianpuguanli:before {
+  content: "\e635";
+}
+
+.icon-wode1:before {
+  content: "\e6a2";
+}
+
+.icon-jianjie-03:before {
+  content: "\e6a3";
+}
+
+.icon-dangao:before {
+  content: "\e71d";
+}
+
+.icon-a-Fill1:before {
+  content: "\e60f";
+}
+
+.icon-shipin:before {
+  content: "\e6a8";
+}
+
+.icon-title-desc:before {
+  content: "\e60e";
+}
+
+.icon-bofang1:before {
+  content: "\e610";
+}
+
+.icon-icon-clock:before {
+  content: "\e607";
+}
+
+.icon-icon-location:before {
+  content: "\e608";
+}
+
+.icon-icon-phone:before {
+  content: "\e609";
+}
+
+.icon-icon-themes-coupon:before {
+  content: "\e60a";
+}
+
+.icon-rilitianchong:before {
+  content: "\e6ae";
+}
+
+.icon-dianzan:before {
+  content: "\e8ad";
+}
+
+.icon-sousuo:before {
+  content: "\e624";
+}
+
+.icon-dianzan1:before {
+  content: "\e8c3";
+}
+
+.icon-shaixuan:before {
+  content: "\e60b";
+}
+
+.icon-jiahao:before {
+  content: "\e606";
+}
+
+.icon-gouwuche3:before {
+  content: "\e6ab";
+}
+
+.icon-youjiantou:before {
+  content: "\e605";
+}
+
+.icon-shuaxin:before {
+  content: "\e64e";
+}
+
+.icon-shoucangjia:before {
+  content: "\e620";
+}
+
+.icon-bianji:before {
+  content: "\e680";
+}
+
+.icon-caogaoxiang:before {
+  content: "\e604";
+}
+
+.icon-lujing136:before {
+  content: "\e66a";
+}
+
+.icon-qianbi:before {
+  content: "\e6041";
+}
+
+.icon-bofang:before {
+  content: "\e87c";
+}
+
+.icon-zhuanfa:before {
+  content: "\e63d";
+}
+
+.icon-tupianjiazaishibai:before {
+  content: "\ec0d";
+}
+
+.icon-xiaoxi:before {
+  content: "\e622";
+}
+
+.icon-shang:before {
+  content: "\e722";
+}
+
+.icon-shangpin:before {
+  content: "\e64f";
+}
+
+.icon-jinghao:before {
+  content: "\e7ff";
+}
+
+.icon-aixin_shixin:before {
+  content: "\eca1";
+}
+
+.icon-aixin:before {
+  content: "\eca2";
+}
+
+.icon-new:before {
+  content: "\ae604";
+}
+
+.icon-icon--:before {
+  content: "\e738";
+}
+
+.icon-shucai:before {
+  content: "\ae609";
+}
+
+.icon-xia:before {
+  content: "\e63c";
+}
+
+.icon-shanchu1:before {
+  content: "\e7e2";
+}
+
+.icon-shanchu:before {
+  content: "\e60c";
+}
+
+.icon-danbianjiantou:before {
+  content: "\ae607";
+}
+
+.icon-danbianjiantou1:before {
+  content: "\ae608";
+}
+
+.icon-dianpu1:before {
+  content: "\e602";
+}
+
+.icon-Collection:before {
+  content: "\e60d";
+}
+
+.icon-shoucang:before {
+  content: "\e621";
+}
+
+.icon-31shijian:before {
+  content: "\e601";
+}
+
+.icon-didian:before {
+  content: "\e61a1";
+}
+
+.icon-dianhua:before {
+  content: "\e88b";
+}
+
+.icon-xiasanjiao:before {
+  content: "\e630";
+}
+
+.icon-shouye:before {
+  content: "\e751";
+}
+
+.icon-kefu:before {
+  content: "\ec2e";
+}
+
+.icon-shipintianchong:before {
+  content: "\e690";
+}
+
+.icon-gouwuche1:before {
+  content: "\e62c";
+}
+
+.icon-fenxiang:before {
+  content: "\e623";
+}
+
+.icon-gouwuche:before {
+  content: "\e63b";
+}
+
+.icon-dianpu:before {
+  content: "\e629";
+}
+
+.icon-jiantou_shangxiaqiehuan_o:before {
+  content: "\eb90";
+}
+
+.icon-shangxiajiantou:before {
+  content: "\e67f";
+}
+
+.icon-weizhi1:before {
+  content: "\e603";
+}
+
+.icon-icon_arrow_left:before {
+  content: "\e62e";
+}
+
+.icon-31dianhua:before {
+  content: "\e600";
+}
+
+.icon-shijian:before {
+  content: "\e6061";
+}
+
+.icon-weizhi:before {
+  content: "\e6701";
+}
+
+.icon-weizhi-copy:before {
+  content: "\e6042";
+}
+
+.icon-search:before {
+  content: "\e7b4";
+}
+
+.icon-arrow-right:before {
+  content: "\e743";
+}
+
diff --git a/static/css/iconfont.ttf b/static/css/iconfont.ttf
new file mode 100644
index 0000000..d68ad62
Binary files /dev/null and b/static/css/iconfont.ttf differ
diff --git a/static/img/gouwuche.png b/static/img/gouwuche.png
new file mode 100644
index 0000000..9cf0d7c
Binary files /dev/null and b/static/img/gouwuche.png differ
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..ab2138e
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,53 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+  state: {
+    opt: {},
+    sign: '',
+    pagecontentList: [],
+    navHeightTop: '',
+    navFixed: false,
+	heardHeight: 0
+  },
+  getters: {
+    getOpt: (state) => state.opt,
+    getSign: (state) => state.sign,
+    getpagecontent: (state) => state.pagecontentList,
+    getNavHeightTop: (state) => state.navHeightTop,
+    getNavFixed: (state) => state.navFixed,
+	getHeardHeight: (state) => state.heardHeight
+  },
+  mutations: {
+    setOpt: (state, opt) => (state.opt = opt),
+    setSign: (state, sign) => (state.sign = sign),
+    setpagecontent(state, pagecontent) {
+      state.pagecontentList = pagecontent
+    },
+    setNavHeightTop: (state, navHeightTop) => (state.navHeightTop = navHeightTop),
+    setNavFixed: (state, navFixed) => (state.navFixed = navFixed),
+	setHeardHeight: (state, height) => (state.heardHeight = height),
+  },
+  actions: {
+    acOpt(context, opt) {
+      context.commit('setOpt', opt)
+    },
+    acSign(context, sign) {
+      context.commit('setSign', sign)
+    },
+    acPagecontent(context, pagecontent) {
+      context.commit('setpagecontent', pagecontent)
+    },
+    acNavHeightTop(context, navHeightTop) {
+      context.commit('setNavHeightTop', navHeightTop)
+    },
+    acNavFixed(context, navFixed) {
+      context.commit('setNavFixed', navFixed)
+    },
+	acHeardHeight(context, height) {
+		context.commit('setHeardHeight', height)
+	}
+  },
+})
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..9611a30
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,89 @@
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的 bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的 bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的 bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的 bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的 bug
+- 修复 单选赋默认值时，赋值日期未高亮的 bug
+- 修复 赋默认值时，移动端未正确显示时间的 bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的 bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的 bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的 bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的 bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的 bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的 bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的 bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的 bug
+- 修复 start 和 end 不能动态赋值的 bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的 bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的 bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的 bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的 bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的 bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的 bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的 bug
+- 修复 chang事件触发2次的 bug
+- 修复 分、秒 end 范围错误的 bug
+- 优化 更好的 nvue 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
new file mode 100644
index 0000000..3d2dbea
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,185 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--isDay': weeks.isDay}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: #455997;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: 12px;
+		color: #333;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		// background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--isDay {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: #007aff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: #409eff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..da46e60
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,898 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+				<view v-if="left" class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="dates" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + ' 年 ' + ( nowDate.month||'') +' 月'}}</text>
+				</picker>
+				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<view v-if="!insert" class="dialog-close" @click="clean">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+
+				<!-- <text class="uni-calendar__backtoday" @click="backtoday">回到今天</text> -->
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
+							:selected="selected" :lunar="lunar" :checkHover="range" @change="choiceDate"
+							@handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+			<view v-if="!insert && !range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="reactStartTime" :end="reactEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="reactStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<uni-icons type="arrowthinright" color="#999" style="line-height: 50px;"></uni-icons>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<!-- <view class="uni-calendar__header-btn-box">
+					<text class="uni-calendar__button-text uni-calendar--fixed-width">{{okText}}</text>
+				</view> -->
+				<view class="uni-datetime-picker--btn" @click="confirm">确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+		props: {
+			dates: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			typeHasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			left: {
+				type: Boolean,
+				default: true
+			},
+			right: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						// console.log('-----', newVal);
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left') {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				const res = activeDate === this.startDate ? this.selectableTimes.start : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				const res = activeDate === this.endDate ? this.selectableTimes.end : ''
+				return res
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+				// multipleStatus: this.pleStatus
+			})
+			// 选中某一天
+			// this.cale.setDate(this.date)
+			this.init(this.dates)
+			// this.setDay
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+
+			// 取消穿透
+			clean() {
+				this.close()
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate()
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			// choiceDate(weeks) {
+			// 	if (weeks.disable) return
+			// 	this.calendar = weeks
+			// 	// 设置多选
+			// 	this.cale.setMultiple(this.calendar.fullDate, true)
+			// 	this.weeks = this.cale.weeks
+			// 	this.tempSingleDate = this.calendar.fullDate
+			// 	this.tempRange.before = this.cale.multipleStatus.before
+			// 	this.tempRange.after = this.cale.multipleStatus.after
+			// 	this.change()
+			// },
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				this.tempRange.before = this.cale.multipleStatus.before
+				this.tempRange.after = this.cale.multipleStatus.after
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: #007aff;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+		color: #999;
+		line-height: 50px;
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: #007aff;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 5px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..cc76311
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select datetime",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..7bc7405
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..7d37043
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "選擇日期",
+	"uni-datetime-picker.selectTime": "選擇時間",
+	"uni-datetime-picker.selectDateTime": "選擇日期時間",
+	"uni-datetime-picker.startDate": "開始日期",
+	"uni-datetime-picker.endDate": "結束日期",
+	"uni-datetime-picker.startTime": "開始时间",
+	"uni-datetime-picker.endTime": "結束时间",
+	"uni-datetime-picker.ok": "確定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js
new file mode 100644
index 0000000..9601aba
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..699aa63
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,927 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<!-- <keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" /> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress'
+	// #endif
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			value: {
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'start') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'end') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value) && typeof value !== NaN) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point) && Number(point) !== NaN) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = this.fixIosDateFormat(this.value)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: #007AFF;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
new file mode 100644
index 0000000..fb6f8da
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,1002 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
+		'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<!-- <uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons> -->
+						<input class="uni-date__x-input" type="text" v-model="singleVal"
+							:placeholder="singlePlaceholderText" :disabled="true" />
+					</view>
+					<view v-else class="uni-date-x uni-date-range">
+						<!-- <uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons> -->
+						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
+							:placeholder="startPlaceholderText" :disabled="true" />
+						<slot>
+							<view style="margin: 0 12rpx;" class="">{{rangeSeparator}}</view>
+						</slot>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.endDate"
+							:placeholder="endPlaceholderText" :disabled="true" />
+					</view>
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<!-- <uni-icons type="clear" color="#e1e1e1" size="18"></uni-icons> -->
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="popup" class="uni-date-mask" @click="close"></view>
+		<view v-if="!isPhone" ref="datePicker" v-show="popup" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
+						:placeholder="selectDateText" />
+					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
+						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input t-c" type="text" v-model="time" :placeholder="selectTimeText"
+							:disabled="!tempSingleDate" />
+					</time-picker>
+				</view>
+				<calendar ref="pcSingle" :showMonth="false" :start-date="caleRange.startDate"
+					:end-date="caleRange.endDate" :dates="defSingleDate" @change="singleChange"
+					style="padding: 0 8px;" />
+				<view v-if="hasTime" class="popup-x-footer">
+					<!-- <text class="">此刻</text> -->
+					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+				<view class="uni-date-popper__arrow"></view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+							:placeholder="startDateText" />
+						<time-picker type="time" v-model="tempRange.startTime" :start="reactStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text"
+								v-model="tempRange.startTime" :placeholder="startTimeText"
+								:disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+				<view class="popup-x-body">
+					<calendar ref="left" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="leftChange" :pleStatus="endMultipleStatus"
+						@firstEnterCale="updateRightCale" @monthSwitch="leftMonthSwitch" style="padding: 0 8px;" />
+					<calendar ref="right" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="rightChange"
+						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						@monthSwitch="rightMonthSwitch" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="" @click="clear">{{clearText}}</text>
+					<text class="confirm" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :dates="defSingleDate" :defTime="reactMobDefTime"
+			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" />
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import calendar from './calendar.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			calendar,
+			timePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				mobileRange: false,
+				// 单选
+				singleVal: '',
+				tempSingleDate: '',
+				defSingleDate: '',
+				time: '',
+				// 范围选
+				caleRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				range: {
+					startDate: '',
+					// startTime: '',
+					endDate: '',
+					// endTime: ''
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				visible: false,
+				popup: false,
+				popover: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal.indexOf('time') !== -1) {
+						this.hasTime = true
+					} else {
+						this.hasTime = false
+					}
+					if (newVal.indexOf('range') !== -1) {
+						this.isRange = true
+					} else {
+						this.isRange = false
+					}
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.startDate = defDate
+					if (this.hasTime) {
+						this.caleRange.startTime = defTime
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.endDate = defDate
+					if (this.hasTime) {
+						this.caleRange.endTime = defTime
+					}
+				}
+			},
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.startDate ? this.caleRange.startTime : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
+				return res
+			},
+			reactMobDefTime() {
+				const times = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? times : this.time
+			},
+			mobSelectableTime() {
+				return {
+					start: this.caleRange.startTime,
+					end: this.caleRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : t(
+					"uni-datetime-picker.selectDateTime"))
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return t("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return t("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				const {
+					clearIcon,
+					disabled,
+					singleVal,
+					range
+				} = this
+				const bool = clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))
+				return bool
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+
+			// if (this.formItem) {
+			// 	if (this.formItem.name) {
+			// 		this.rename = this.formItem.name
+			// 		this.form.inputChildrens.push(this)
+			// 	}
+			// }
+		},
+		mounted() {
+			this.platform()
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			initPicker(newVal) {
+				if (!newVal || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+				if (!Array.isArray(newVal) && !this.isRange) {
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.singleVal = defDate
+					this.tempSingleDate = defDate
+					this.defSingleDate = defDate
+					if (this.hasTime) {
+						this.singleVal = defDate + ' ' + defTime
+						this.time = defTime
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const defBefore = this.parseDate(before)
+					const defAfter = this.parseDate(after)
+					const startDate = defBefore.defDate
+					const endDate = defAfter.defDate
+					this.range.startDate = this.tempRange.startDate = startDate
+					this.range.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.range.startDate = defBefore.defDate + ' ' + defBefore.defTime
+						this.range.endDate = defAfter.defDate + ' ' + defAfter.defTime
+						this.tempRange.startTime = defBefore.defTime
+						this.tempRange.endTime = defAfter.defTime
+					}
+					const defaultRange = {
+						before: defBefore.defDate,
+						after: defAfter.defDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				const systemInfo = uni.getSystemInfoSync()
+				this.isPhone = systemInfo.windowWidth <= 500
+				this.windowWidth = systemInfo.windowWidth
+			},
+			show(event) {
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					this.$refs.mobile.open()
+					return
+				}
+				this.popover = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.popover.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.popup = !this.popup
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.range
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.next()
+							}
+						} else {
+							this.$refs.right.next()
+							this.$refs.right.cale.lastHover = false
+						}
+					}
+
+				}, 50)
+			},
+
+			close() {
+				setTimeout(() => {
+					this.popup = false
+					this.$emit('maskClick', this.value)
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+				this.formItem && this.formItem.setValue(value)
+				this.$emit('change', value)
+				this.$emit('input', value)
+				this.$emit('update:modelValue', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = this.fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.tempSingleDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+
+			confirmSingleChange() {
+				if (!this.tempSingleDate) {
+					this.popup = false
+					return
+				}
+				if (this.hasTime) {
+					this.singleVal = this.tempSingleDate + ' ' + (this.time ? this.time : '00:00:00')
+				} else {
+					this.singleVal = this.tempSingleDate
+				}
+				this.setEmit(this.singleVal)
+				this.popup = false
+			},
+
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+			},
+
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+			},
+
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+
+				} else {
+					if (this.hasTime) {
+						this.singleVal = e.fulldate + ' ' + e.time
+					} else {
+						this.singleVal = e.fulldate
+					}
+					this.setEmit(this.singleVal)
+				}
+				this.$refs.mobile.close()
+			},
+
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+
+			confirmRangeChange() {
+				if (!this.tempRange.startDate && !this.tempRange.endDate) {
+					this.popup = false
+					return
+				}
+				let start, end
+				if (!this.hasTime) {
+					start = this.range.startDate = this.tempRange.startDate
+					end = this.range.endDate = this.tempRange.endDate
+				} else {
+					start = this.range.startDate = this.tempRange.startDate + ' ' +
+						(this.tempRange.startTime ? this.tempRange.startTime : '00:00:00')
+					end = this.range.endDate = this.tempRange.endDate + ' ' +
+						(this.tempRange.endTime ? this.tempRange.endTime : '00:00:00')
+				}
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.popup = false
+			},
+
+			handleStartAndEnd(before, after, temp = false) {
+				if (!(before && after)) return
+				const type = temp ? 'tempRange' : 'range'
+				if (this.dateCompare(before, after)) {
+					this[type].startDate = before
+					this[type].endDate = after
+				} else {
+					this[type].startDate = after
+					this[type].endDate = before
+				}
+			},
+
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.singleVal = ''
+					this.tempSingleDate = ''
+					this.time = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue('')
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.range.startDate = ''
+					this.range.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.next()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue([])
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			},
+
+			parseDate(date) {
+				date = this.fixIosDateFormat(date)
+				const defVal = new Date(date)
+				const year = defVal.getFullYear()
+				const month = defVal.getMonth() + 1
+				const day = defVal.getDate()
+				const hour = defVal.getHours()
+				const minute = defVal.getMinutes()
+				const second = defVal.getSeconds()
+				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
+				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this
+					.lessTen(second)))
+				return {
+					defDate,
+					defTime
+				}
+			},
+
+			lessTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			leftMonthSwitch(e) {
+				// console.log('leftMonthSwitch 返回:', e)
+			},
+			rightMonthSwitch(e) {
+				// console.log('rightMonthSwitch 返回:', e)
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		/* padding: 0 10px; */
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		/* border: 1px solid #dcdfe6; */
+		
+	}
+
+	.uni-date-editor--x {
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		position: absolute;
+		top: 0;
+		right: 0;
+		display: inline-block;
+		box-sizing: border-box;
+		border: 9px solid transparent;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		/* padding: 0 8px; */
+		width: 160rpx;
+		text-align: center;
+		height: 60rpx;
+		width: 100%;
+		border-radius: 10rpx;
+		line-height: 60rpx;
+		font-size: 26rpx;
+		background-color: #f6f6f6;
+	}
+
+	.t-c {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+		/* 		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		box-sizing: border-box;
+		z-index: 996;
+		font-size: 14px; */
+	}
+
+	.uni-date-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		/* justify-content: space-between; */
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		/* background-color: #fff; */
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: #007aff;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm {
+		margin-left: 20px;
+		color: #007aff;
+	}
+
+	.uni-date-changed {
+		/* background-color: #fff; */
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		/* padding: 0 50px; */
+	}
+
+	.uni-date-changed--time text {
+		/* padding: 0 20px; */
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		/* display: flex; */
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..efa5773
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,410 @@
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range,
+		// multipleStatus
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+		// this.multipleStatus = multipleStatus
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: full.month,
+				disable: !(disableBefore && disableAfter),
+				isDay,
+				userChecked: false
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDay, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = this.dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDay)
+	}
+
+	isLogicAfter(currentDay, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = this.dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDay)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (!this.range) return
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (this.lastHover) return
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (this.dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this._getWeek(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this._getWeek(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..0e44103
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.4",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..6449885
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..7889936
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
+    {
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrow-down",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..86e7444
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					return unescape(`%u${code.unicode}`)
+				}
+				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..2f56eab
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000..835f33b
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..d1c4e77
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-swipe-action/changelog.md b/uni_modules/uni-swipe-action/changelog.md
new file mode 100644
index 0000000..c007cb5
--- /dev/null
+++ b/uni_modules/uni-swipe-action/changelog.md
@@ -0,0 +1,41 @@
+## 1.3.7（2022-06-06）
+- 修复 vue3 下使用组件不能正常运行的Bug
+## 1.3.6（2022-05-31）
+- 修复 h5端点击click触发两次的Bug
+## 1.3.5（2022-05-23）
+- 修复 isPC 找不到的Bug
+## 1.3.4（2022-05-19）
+-  修复 在 nvue 下 disabled 失效的bug
+## 1.3.3（2022-03-31）
+- 修复 按钮字体大小不能设置的bug
+## 1.3.2（2022-03-16）
+- 修复 h5和app端下报el错误的bug
+## 1.3.1（2022-03-07）
+- 修复 HBuilderX 1.4.X 版本中，h5和app端下报错的bug
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-swipe-action](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+## 1.2.4（2021-08-20）
+- 优化 close-all 方法
+## 1.2.3（2021-08-20）
+- 新增 close-all 方法，关闭所有已打开的组件
+## 1.2.2（2021-08-17）
+- 新增 resize() 方法，在非微信小程序、h5、app-vue端出现不能滑动的问题的时候，重置组件
+- 修复 app 端偶尔出现类似 Page[x][-x,xx;-x,xx,x,x-x] 的问题 
+- 优化 微信小程序、h5、app-vue 滑动逻辑，避免出现动态新增组件后不能滑动的问题
+## 1.2.1（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 修复 跨页面修改组件数据 ，导致不能滑动的问题
+## 1.1.10（2021-06-17）
+- 修复 按钮点击执行两次的bug
+## 1.1.9（2021-05-12）
+- 新增 项目示例地址
+## 1.1.8（2021-03-26）
+- 修复 微信小程序 nv_navigator is not defined 报错的bug
+## 1.1.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 左侧滑动
+- 新增 插槽使用方式
+- 新增 threshold 属性，可以控制滑动缺省值
+- 优化 长列表滚动性能
+- 修复 滚动页面时触发组件滑动的Bug
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
new file mode 100644
index 0000000..755c97c
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
@@ -0,0 +1,302 @@
+let bindIngXMixins = {}
+
+// #ifdef APP-NVUE
+const BindingX = uni.requireNativePlugin('bindingx');
+const dom = uni.requireNativePlugin('dom');
+const animation = uni.requireNativePlugin('animation');
+
+bindIngXMixins = {
+	data() {
+		return {}
+	},
+
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (this.stop) return
+			this.stop = true
+			if (newVal) {
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		},
+		leftOptions() {
+			this.getSelectorQuery()
+			this.init()
+		},
+		rightOptions(newVal) {
+			this.init()
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.box = this.getEl(this.$refs['selector-box--hock'])
+		this.selector = this.getEl(this.$refs['selector-content--hock']);
+		this.leftButton = this.getEl(this.$refs['selector-left-button--hock']);
+		this.rightButton = this.getEl(this.$refs['selector-right-button--hock']);
+		this.init()
+	},
+	// beforeDestroy() {
+	// 	this.swipeaction.children.forEach((item, index) => {
+	// 		if (item === this) {
+	// 			this.swipeaction.children.splice(index, 1)
+	// 		}
+	// 	})
+	// },
+	methods: {
+		init() {
+			this.$nextTick(() => {
+				this.x = 0
+				this.button = {
+					show: false
+				}
+				setTimeout(() => {
+					this.getSelectorQuery()
+				}, 200)
+			})
+		},
+		onClick(index, item, position) {
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+		},
+		touchstart(e) {
+			// fix by mehaotian 禁止滑动
+			if (this.disabled) return
+			// 每次只触发一次，避免多次监听造成闪烁
+			if (this.stop) return
+			this.stop = true
+			if (this.autoClose) {
+				this.swipeaction.closeOther(this)
+			}
+
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			let expression = this.range(this.x, -rightWidth, leftWidth)
+			let leftExpression = this.range(this.x - leftWidth, -leftWidth, 0)
+			let rightExpression = this.range(this.x + rightWidth, 0, rightWidth)
+
+			this.eventpan = BindingX.bind({
+				anchor: this.box,
+				eventType: 'pan',
+				props: [{
+					element: this.selector,
+					property: 'transform.translateX',
+					expression
+				}, {
+					element: this.leftButton,
+					property: 'transform.translateX',
+					expression: leftExpression
+				}, {
+					element: this.rightButton,
+					property: 'transform.translateX',
+					expression: rightExpression
+				}, ]
+			}, (e) => {
+				// nope
+				if (e.state === 'end') {
+					this.x = e.deltaX + this.x;
+					this.isclick = true
+					this.bindTiming(e.deltaX)
+				}
+			});
+		},
+		touchend(e) {
+			if (this.isopen !== 'none' && !this.isclick) {
+				this.open('none')
+			}
+		},
+		bindTiming(x) {
+			const left = this.x
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			const threshold = this.threshold
+			if (!this.isopen || this.isopen === 'none') {
+				if (left > threshold) {
+					this.open('left')
+				} else if (left < -threshold) {
+					this.open('right')
+				} else {
+					this.open('none')
+				}
+			} else {
+				if ((x > -leftWidth && x < 0) || x > rightWidth) {
+					if ((x > -threshold && x < 0) || (x - rightWidth > threshold)) {
+						this.open('left')
+					} else {
+						this.open('none')
+					}
+				} else {
+					if ((x < threshold && x > 0) || (x + leftWidth < -threshold)) {
+						this.open('right')
+					} else {
+						this.open('none')
+					}
+				}
+			}
+		},
+
+		/**
+		 * 移动范围
+		 * @param {Object} num
+		 * @param {Object} mix
+		 * @param {Object} max
+		 */
+		range(num, mix, max) {
+			return `min(max(x+${num}, ${mix}), ${max})`
+		},
+
+		/**
+		 * 开启swipe
+		 */
+		open(type) {
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭swipe
+		 */
+		close() {
+			this.animation('none')
+		},
+
+		/**
+		 * 开启关闭动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			const time = 300
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			if (this.eventpan && this.eventpan.token) {
+				BindingX.unbind({
+					token: this.eventpan.token,
+					eventType: 'pan'
+				})
+			}
+
+			switch (type) {
+				case 'left':
+					Promise.all([
+						this.move(this.selector, leftWidth),
+						this.move(this.leftButton, 0),
+						this.move(this.rightButton, rightWidth * 2)
+					]).then(() => {
+						this.setEmit(leftWidth, type)
+					})
+					break
+				case 'right':
+					Promise.all([
+						this.move(this.selector, -rightWidth),
+						this.move(this.leftButton, -leftWidth * 2),
+						this.move(this.rightButton, 0)
+					]).then(() => {
+						this.setEmit(-rightWidth, type)
+					})
+					break
+				default:
+					Promise.all([
+						this.move(this.selector, 0),
+						this.move(this.leftButton, -leftWidth),
+						this.move(this.rightButton, rightWidth)
+					]).then(() => {
+						this.setEmit(0, type)
+					})
+
+			}
+		},
+		setEmit(x, type) {
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			this.isopen = this.isopen || 'none'
+			this.stop = false
+			this.isclick = false
+			// 只有状态不一致才会返回结果
+			if (this.isopen !== type && this.x !== x) {
+				if (type === 'left' && leftWidth > 0) {
+					this.$emit('change', 'left')
+				}
+				if (type === 'right' && rightWidth > 0) {
+					this.$emit('change', 'right')
+				}
+				if (type === 'none') {
+					this.$emit('change', 'none')
+				}
+			}
+			this.x = x
+			this.isopen = type
+		},
+		move(ref, value) {
+			return new Promise((resolve, reject) => {
+				animation.transition(ref, {
+					styles: {
+						transform: `translateX(${value})`,
+					},
+					duration: 150, //ms
+					timingFunction: 'linear',
+					needLayout: false,
+					delay: 0 //ms
+				}, function(res) {
+					resolve(res)
+				})
+			})
+
+		},
+
+		/**
+		 * 获取ref
+		 * @param {Object} el
+		 */
+		getEl(el) {
+			return el.ref
+		},
+		/**
+		 * 获取节点信息
+		 */
+		getSelectorQuery() {
+			Promise.all([
+				this.getDom('left'),
+				this.getDom('right'),
+			]).then((data) => {
+				let show = 'none'
+				if (this.autoClose) {
+					show = 'none'
+				} else {
+					show = this.show
+				}
+
+				if (show === 'none') {
+					// this.close()
+				} else {
+					this.open(show)
+				}
+
+			})
+
+		},
+		getDom(str) {
+			return new Promise((resolve, reject) => {
+				dom.getComponentRect(this.$refs[`selector-${str}-button--hock`], (data) => {
+					if (data) {
+						this.button[str] = data.size
+						resolve(data)
+					} else {
+						reject()
+					}
+				})
+			})
+		}
+	}
+}
+
+// #endif
+
+export default bindIngXMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
new file mode 100644
index 0000000..917cb48
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
@@ -0,0 +1,12 @@
+export function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (let v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
new file mode 100644
index 0000000..43cd56b
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
@@ -0,0 +1,193 @@
+export default {
+	data() {
+		return {
+			x: 0,
+			transition: false,
+			width: 0,
+			viewWidth: 0,
+			swipeShow: 0
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (newVal && newVal !== 'none') {
+				this.transition = true
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.isopen = false
+		setTimeout(() => {
+			this.getQuerySelect()
+		}, 50)
+	},
+	methods: {
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		/**
+		 * 移动触发
+		 * @param {Object} e
+		 */
+		onChange(e) {
+			this.moveX = e.detail.x
+			this.isclose = false
+		},
+		touchstart(e) {
+			this.transition = false
+			this.isclose = true
+			this.autoClose && this.swipeaction.closeOther(this)
+		},
+		touchmove(e) {},
+		touchend(e) {
+			// 0的位置什么都不执行
+			if (this.isclose && this.isopen === 'none') return
+			if (this.isclose && this.isopen !== 'none') {
+				this.transition = true
+				this.close()
+			} else {
+				this.move(this.moveX + this.leftWidth)
+			}
+		},
+
+		/**
+		 * 移动
+		 * @param {Object} moveX
+		 */
+		move(moveX) {
+			// 打开关闭的处理逻辑不太一样
+			this.transition = true
+			// 未打开状态
+			if (!this.isopen || this.isopen === 'none') {
+				if (moveX > this.threshold) {
+					this.open('left')
+				} else if (moveX < -this.threshold) {
+					this.open('right')
+				} else {
+					this.close()
+				}
+			} else {
+				if (moveX < 0 && moveX < this.rightWidth) {
+					const rightX = this.rightWidth + moveX
+					if (rightX < this.threshold) {
+						this.open('right')
+					} else {
+						this.close()
+					}
+				} else if (moveX > 0 && moveX < this.leftWidth) {
+					const leftX = this.leftWidth - moveX
+					if (leftX < this.threshold) {
+						this.open('left')
+					} else {
+						this.close()
+					}
+				}
+
+			}
+
+		},
+
+		/**
+		 * 打开
+		 */
+		open(type) {
+			this.x = this.moveX
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭
+		 */
+		close() {
+			this.x = this.moveX
+			// TODO 解决 x 值不更新的问题，所以会多触发一次 nextTick ，待优化
+			this.$nextTick(() => {
+				this.x = -this.leftWidth
+				if (this.isopen !== 'none') {
+					this.$emit('change', 'none')
+				}
+				this.isopen = 'none'
+			})
+		},
+
+		/**
+		 * 执行结束动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			this.$nextTick(() => {
+				if (type === 'left') {
+					this.x = 0
+				} else {
+					this.x = -this.rightWidth - this.leftWidth
+				}
+
+				if (this.isopen !== type) {
+					this.$emit('change', type)
+				}
+				this.isopen = type
+			})
+
+		},
+		getSlide(x) {},
+		getQuerySelect() {
+			const query = uni.createSelectorQuery().in(this);
+			query.selectAll('.movable-view--hock').boundingClientRect(data => {
+				this.leftWidth = data[1].width
+				this.rightWidth = data[2].width
+				this.width = data[0].width
+				this.viewWidth = this.width + this.rightWidth + this.leftWidth
+				if (this.leftWidth === 0) {
+					// TODO 疑似bug ,初始化的时候如果x 是0，会导致移动位置错误，所以让元素超出一点
+					this.x = -0.1
+				} else {
+					this.x = -this.leftWidth
+				}
+				this.moveX = this.x
+				this.$nextTick(() => {
+					this.swipeShow = 1
+				})
+
+				if (!this.buttonWidth) {
+					this.disabledView = true
+				}
+
+				if (this.autoClose) return
+				if (this.show !== 'none') {
+					this.transition = true
+					this.open(this.shows)
+				}
+			}).exec();
+
+		}
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
new file mode 100644
index 0000000..9a8bcbb
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
@@ -0,0 +1,259 @@
+let otherMixins = {}
+
+// #ifndef APP-PLUS|| MP-WEIXIN  ||  H5
+const MIN_DISTANCE = 10;
+otherMixins = {
+	data() {
+		// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+		const elClass = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+		return {
+			uniShow: false,
+			left: 0,
+			buttonShow: 'none',
+			ani: false,
+			moveLeft: '',
+			elClass
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		left() {
+			this.moveLeft = `translateX(${this.left}px)`
+		},
+		buttonShow(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		leftOptions() {
+			this.init()
+		},
+		rightOptions() {
+			this.init()
+		}
+	},
+	mounted() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+		this.init()
+	},
+	methods: {
+		init() {
+			clearTimeout(this.timer)
+			this.timer = setTimeout(() => {
+				this.getSelectorQuery()
+			}, 100)
+			// 移动距离
+			this.left = 0
+			this.x = 0
+		},
+
+		closeSwipe(e) {
+			if (!this.autoClose) return
+			this.swipeaction.closeOther(this)
+		},
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		touchstart(e) {
+			if (this.disabled) return
+			this.ani = false
+			this.x = this.left || 0
+			this.stopTouchStart(e)
+			this.autoClose && this.closeSwipe()
+		},
+		touchmove(e) {
+			if (this.disabled) return
+			// 是否可以滑动页面
+			this.stopTouchMove(e);
+			if (this.direction !== 'horizontal') {
+				return;
+			}
+			this.move(this.x + this.deltaX)
+			return false
+		},
+		touchend() {
+			if (this.disabled) return
+			this.moveDirection(this.left)
+		},
+		/**
+		 * 设置移动距离
+		 * @param {Object} value
+		 */
+		move(value) {
+			value = value || 0
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			// 获取可滑动范围
+			this.left = this.range(value, -rightWidth, leftWidth);
+		},
+
+		/**
+		 * 获取范围
+		 * @param {Object} num
+		 * @param {Object} min
+		 * @param {Object} max
+		 */
+		range(num, min, max) {
+			return Math.min(Math.max(num, min), max);
+		},
+		/**
+		 * 移动方向判断
+		 * @param {Object} left
+		 * @param {Object} value
+		 */
+		moveDirection(left) {
+			const threshold = this.threshold
+			const isopen = this.isopen || 'none'
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			if (this.deltaX === 0) {
+				this.openState('none')
+				return
+			}
+			if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth >
+					0 && rightWidth +
+					left < threshold)) {
+				// right
+				this.openState('right')
+			} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth >
+					0 &&
+					leftWidth - left < threshold)) {
+				// left
+				this.openState('left')
+			} else {
+				// default
+				this.openState('none')
+			}
+		},
+
+		/**
+		 * 开启状态
+		 * @param {Boolean} type
+		 */
+		openState(type) {
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			let left = ''
+			this.isopen = this.isopen ? this.isopen : 'none'
+			switch (type) {
+				case "left":
+					left = leftWidth
+					break
+				case "right":
+					left = -rightWidth
+					break
+				default:
+					left = 0
+			}
+
+
+			if (this.isopen !== type) {
+				this.throttle = true
+				this.$emit('change', type)
+			}
+
+			this.isopen = type
+			// 添加动画类
+			this.ani = true
+			this.$nextTick(() => {
+				this.move(left)
+			})
+			// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+		},
+		close() {
+			this.openState('none')
+		},
+		getDirection(x, y) {
+			if (x > y && x > MIN_DISTANCE) {
+				return 'horizontal';
+			}
+			if (y > x && y > MIN_DISTANCE) {
+				return 'vertical';
+			}
+			return '';
+		},
+
+		/**
+		 * 重置滑动状态
+		 * @param {Object} event
+		 */
+		resetTouchStatus() {
+			this.direction = '';
+			this.deltaX = 0;
+			this.deltaY = 0;
+			this.offsetX = 0;
+			this.offsetY = 0;
+		},
+
+		/**
+		 * 设置滑动开始位置
+		 * @param {Object} event
+		 */
+		stopTouchStart(event) {
+			this.resetTouchStatus();
+			const touch = event.touches[0];
+			this.startX = touch.clientX;
+			this.startY = touch.clientY;
+		},
+
+		/**
+		 * 滑动中，是否禁止打开
+		 * @param {Object} event
+		 */
+		stopTouchMove(event) {
+			const touch = event.touches[0];
+			this.deltaX = touch.clientX - this.startX;
+			this.deltaY = touch.clientY - this.startY;
+			this.offsetX = Math.abs(this.deltaX);
+			this.offsetY = Math.abs(this.deltaY);
+			this.direction = this.direction || this.getDirection(this.offsetX, this.offsetY);
+		},
+
+		getSelectorQuery() {
+			const views = uni.createSelectorQuery().in(this)
+			views
+				.selectAll('.' + this.elClass)
+				.boundingClientRect(data => {
+					if (data.length === 0) return
+					let show = 'none'
+					if (this.autoClose) {
+						show = 'none'
+					} else {
+						show = this.show
+					}
+					this.leftWidth = data[0].width || 0
+					this.rightWidth = data[1].width || 0
+					this.buttonShow = show
+				})
+				.exec()
+		}
+	}
+}
+
+// #endif
+
+export default otherMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
new file mode 100644
index 0000000..435e0fb
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
@@ -0,0 +1,83 @@
+let mpMixins = {}
+let is_pc = null
+// #ifdef H5
+import {
+	isPC
+} from "./isPC"
+is_pc = isPC()
+// #endif
+// #ifdef APP-VUE|| MP-WEIXIN || H5
+
+mpMixins = {
+	data() {
+		return {
+			is_show: 'none'
+		}
+	},
+	watch: {
+		show(newVal) {
+			this.is_show = this.show
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.is_show = this.show
+	},
+	methods: {
+		// wxs 中调用
+		closeSwipe(e) {
+			if (!this.autoClose) return
+			this.swipeaction.closeOther(this)
+		},
+
+		change(e) {
+			this.$emit('change', e.open)
+			if (this.is_show !== e.open) {
+				this.is_show = e.open
+			}
+		},
+
+		appTouchStart(e) {
+			if (is_pc) return
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			if (is_pc) return
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		onClickForPC(index, item, position) {
+			if (!is_pc) return
+			// #ifdef H5
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+			// #endif
+		}
+	}
+}
+
+// #endif
+export default mpMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
new file mode 100644
index 0000000..78f0ec6
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
@@ -0,0 +1,270 @@
+const MIN_DISTANCE = 10;
+export default {
+	showWatch(newVal, oldVal, ownerInstance, instance, self) {
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		if (!$el) return
+		this.getDom(instance, ownerInstance, self)
+		if (newVal && newVal !== 'none') {
+			this.openState(newVal, instance, ownerInstance, self)
+			return
+		}
+
+		if (state.left) {
+			this.openState('none', instance, ownerInstance, self)
+		}
+		this.resetTouchStatus(instance, self)
+	},
+
+	/**
+	 * 开始触摸操作
+	 * @param {Object} e
+	 * @param {Object} ins
+	 */
+	touchstart(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state;
+		this.getDom(instance, ownerInstance, self)
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 开始触摸时移除动画类
+		instance.requestAnimationFrame(function() {
+			instance.removeClass('ani');
+			ownerInstance.callMethod('closeSwipe');
+		})
+
+		// 记录上次的位置
+		state.x = state.left || 0
+		// 计算滑动开始位置
+		this.stopTouchStart(e, ownerInstance, self)
+	},
+
+	/**
+	 * 开始滑动操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchmove(e, ownerInstance, self) {
+		let instance = e.instance;
+		// 删除之后已经那不到实例了
+		if (!instance) return;
+		let disabled = instance.getDataset().disabled
+		let state = self.state
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 是否可以滑动页面
+		this.stopTouchMove(e, self);
+		if (state.direction !== 'horizontal') {
+			return;
+		}
+		if (e.preventDefault) {
+			// 阻止页面滚动
+			e.preventDefault()
+		}
+		let x = state.x + state.deltaX
+		this.move(x, instance, ownerInstance, self)
+	},
+
+	/**
+	 * 结束触摸操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchend(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+
+		if (disabled) return
+		// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+		// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+		this.moveDirection(state.left, instance, ownerInstance, self)
+
+	},
+
+	/**
+	 * 设置移动距离
+	 * @param {Object} value
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	move(value, instance, ownerInstance, self) {
+		value = value || 0
+		let state = self.state
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		// 获取可滑动范围
+		state.left = this.range(value, -rightWidth, leftWidth);
+		instance.requestAnimationFrame(function() {
+			instance.setStyle({
+				transform: 'translateX(' + state.left + 'px)',
+				'-webkit-transform': 'translateX(' + state.left + 'px)'
+			})
+		})
+
+	},
+
+	/**
+	 * 获取元素信息
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	getDom(instance, ownerInstance, self) {
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		var leftDom = $el.querySelector('.button-group--left')
+		var rightDom = $el.querySelector('.button-group--right')
+
+		state.leftWidth = leftDom.offsetWidth || 0
+		state.rightWidth = rightDom.offsetWidth || 0
+		state.threshold = instance.getDataset().threshold
+	},
+
+	getDisabledType(value) {
+		return (typeof(value) === 'string' ? JSON.parse(value) : value) || false;
+	},
+
+	/**
+	 * 获取范围
+	 * @param {Object} num
+	 * @param {Object} min
+	 * @param {Object} max
+	 */
+	range(num, min, max) {
+		return Math.min(Math.max(num, min), max);
+	},
+
+
+	/**
+	 * 移动方向判断
+	 * @param {Object} left
+	 * @param {Object} value
+	 * @param {Object} ownerInstance
+	 * @param {Object} ins
+	 */
+	moveDirection(left, ins, ownerInstance, self) {
+		var state = self.state
+		var threshold = state.threshold
+		var position = state.position
+		var isopen = state.isopen || 'none'
+		var leftWidth = state.leftWidth
+		var rightWidth = state.rightWidth
+		if (state.deltaX === 0) {
+			this.openState('none', ins, ownerInstance, self)
+			return
+		}
+		if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+				rightWidth +
+				left < threshold)) {
+			// right
+			this.openState('right', ins, ownerInstance, self)
+		} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+				leftWidth - left < threshold)) {
+			// left
+			this.openState('left', ins, ownerInstance, self)
+		} else {
+			// default
+			this.openState('none', ins, ownerInstance, self)
+		}
+	},
+
+
+	/**
+	 * 开启状态
+	 * @param {Boolean} type
+	 * @param {Object} ins
+	 * @param {Object} ownerInstance
+	 */
+	openState(type, ins, ownerInstance, self) {
+		let state = self.state
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		let left = ''
+		state.isopen = state.isopen ? state.isopen : 'none'
+		switch (type) {
+			case "left":
+				left = leftWidth
+				break
+			case "right":
+				left = -rightWidth
+				break
+			default:
+				left = 0
+		}
+
+		// && !state.throttle
+
+		if (state.isopen !== type) {
+			state.throttle = true
+			ownerInstance.callMethod('change', {
+				open: type
+			})
+
+		}
+
+		state.isopen = type
+		// 添加动画类
+		ins.requestAnimationFrame(() => {
+			ins.addClass('ani');
+			this.move(left, ins, ownerInstance, self)
+		})
+	},
+
+
+	getDirection(x, y) {
+		if (x > y && x > MIN_DISTANCE) {
+			return 'horizontal';
+		}
+		if (y > x && y > MIN_DISTANCE) {
+			return 'vertical';
+		}
+		return '';
+	},
+
+	/**
+	 * 重置滑动状态
+	 * @param {Object} event
+	 */
+	resetTouchStatus(instance, self) {
+		let state = self.state;
+		state.direction = '';
+		state.deltaX = 0;
+		state.deltaY = 0;
+		state.offsetX = 0;
+		state.offsetY = 0;
+	},
+
+	/**
+	 * 设置滑动开始位置
+	 * @param {Object} event
+	 */
+	stopTouchStart(event, ownerInstance, self) {
+		let instance = event.instance;
+		let state = self.state
+		this.resetTouchStatus(instance, self);
+		var touch = event.touches[0];
+		state.startX = touch.clientX;
+		state.startY = touch.clientY;
+	},
+
+	/**
+	 * 滑动中，是否禁止打开
+	 * @param {Object} event
+	 */
+	stopTouchMove(event, self) {
+		let instance = event.instance;
+		let state = self.state;
+		let touch = event.touches[0];
+
+		state.deltaX = touch.clientX - state.startX;
+		state.deltaY = touch.clientY - state.startY;
+		state.offsetY = Math.abs(state.deltaY);
+		state.offsetX = Math.abs(state.deltaX);
+		state.direction = state.direction || this.getDirection(state.offsetX, state.offsetY);
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
new file mode 100644
index 0000000..d79c297
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
@@ -0,0 +1,347 @@
+<template>
+	<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+	<!-- #ifdef APP-VUE || MP-WEIXIN || H5 -->
+	<view class="uni-swipe">
+		<!--  #ifdef MP-WEIXIN || VUE3 -->
+		<view class="uni-swipe_box" :change:prop="wxsswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+			:data-disabled="disabled" @touchstart="wxsswipe.touchstart" @touchmove="wxsswipe.touchmove"
+			@touchend="wxsswipe.touchend">
+			<!-- #endif -->
+			<!--  #ifndef MP-WEIXIN || VUE3 -->
+			<view class="uni-swipe_box" :change:prop="renderswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+				:data-disabled="disabled+''" @touchstart="renderswipe.touchstart" @touchmove="renderswipe.touchmove"
+				@touchend="renderswipe.touchend">
+				<!-- #endif -->
+				<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+				<view class="uni-swipe_button-group button-group--left">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'left')"
+							@click.stop="onClickForPC(index,item,'left')">
+							<text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-swipe_text--center">
+					<slot></slot>
+				</view>
+				<view class="uni-swipe_button-group button-group--right">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'right')"
+							@click.stop="onClickForPC(index,item,'right')"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- app nvue端 使用 bindingx -->
+		<!-- #ifdef APP-NVUE -->
+		<view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
+			<view ref='selector-left-button--hock' class="uni-swipe_button-group button-group--left">
+				<slot name="left">
+					<view v-for="(item,index) in leftOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF', fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+			<view ref='selector-right-button--hock' class="uni-swipe_button-group button-group--right">
+				<slot name="right">
+					<view v-for="(item,index) in rightOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+			<view ref='selector-content--hock' class="uni-swipe_box">
+				<slot></slot>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- 其他平台使用 js ，长列表性能可能会有影响-->
+		<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ -->
+		<view class="uni-swipe">
+			<view class="uni-swipe_box" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"
+				:style="{transform:moveLeft}" :class="{ani:ani}">
+				<view class="uni-swipe_button-group button-group--left" :class="[elClass]">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<slot></slot>
+				<view class="uni-swipe_button-group button-group--right" :class="[elClass]">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" @touchstart="appTouchStart" @touchend="appTouchEnd($event,index,item,'right')"
+							class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+
+</template>
+<script src="./wx.wxs" module="wxsswipe" lang="wxs"></script>
+
+<script module="renderswipe" lang="renderjs">
+	import render from './render.js'
+	export default {
+		mounted(e, ins, owner) {
+			this.state = {}
+		},
+		methods: {
+			showWatch(newVal, oldVal, ownerInstance, instance) {
+				render.showWatch(newVal, oldVal, ownerInstance, instance, this)
+			},
+			touchstart(e, ownerInstance) {
+				render.touchstart(e, ownerInstance, this)
+			},
+			touchmove(e, ownerInstance) {
+				render.touchmove(e, ownerInstance, this)
+			},
+			touchend(e, ownerInstance) {
+				render.touchend(e, ownerInstance, this)
+			}
+		}
+	}
+</script>
+<script>
+	import mpwxs from './mpwxs'
+	import bindingx from './bindingx.js'
+	import mpother from './mpother'
+
+	/**
+	 * SwipeActionItem 滑动操作子组件
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 * @property {Boolean} show = [left|right｜none] 	开启关闭组件，auto-close = false 时生效
+	 * @property {Boolean} disabled = [true|false] 		是否禁止滑动
+	 * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
+	 * @property {Number}  threshold 					滑动缺省值
+	 * @property {Array} leftOptions 					左侧选项内容及样式
+	 * @property {Array} rgihtOptions 					右侧选项内容及样式
+	 * @event {Function} click 							点击选项按钮时触发事件，e = {content,index} ，content（点击内容）、index（下标)
+	 * @event {Function} change 						组件打开或关闭时触发，left\right\none
+	 */
+
+	export default {
+		mixins: [mpwxs, bindingx, mpother],
+		emits: ['click', 'change'],
+		props: {
+			// 控制开关
+			show: {
+				type: String,
+				default: 'none'
+			},
+
+			// 禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+
+			// 是否自动关闭
+			autoClose: {
+				type: Boolean,
+				default: true
+			},
+
+			// 滑动缺省距离
+			threshold: {
+				type: Number,
+				default: 20
+			},
+
+			// 左侧按钮内容
+			leftOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+
+			// 右侧按钮内容
+			rightOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+
+		methods: {
+			uninstall() {
+				if (this.swipeaction) {
+					this.swipeaction.children.forEach((item, index) => {
+						if (item === this) {
+							this.swipeaction.children.splice(index, 1)
+						}
+					})
+				}
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getSwipeAction(name = 'uniSwipeAction') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-swipe {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-swipe_box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-shrink: 0;
+		// touch-action: none;
+		/* #endif */
+		position: relative;
+	}
+
+	.uni-swipe_content {
+		// border: 1px red solid;
+	}
+
+	.uni-swipe_text--center {
+		width: 100%;
+		/* #ifndef APP-NVUE */
+		cursor: grab;
+		/* #endif */
+	}
+
+	.uni-swipe_button-group {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.button-group--left {
+		left: 0;
+		transform: translateX(-100%)
+	}
+
+	.button-group--right {
+		right: 0;
+		transform: translateX(100%)
+	}
+
+	.uni-swipe_button {
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 0 20px;
+	}
+
+	.uni-swipe_button-text {
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		/* #endif */
+		font-size: 14px;
+	}
+
+	.ani {
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
+	}
+
+	/* #ifdef MP-ALIPAY */
+	.movable-area {
+		/* width: 100%; */
+		height: 45px;
+	}
+
+	.movable-view {
+		display: flex;
+		/* justify-content: center; */
+		position: relative;
+		flex: 1;
+		height: 45px;
+		z-index: 2;
+	}
+
+	.movable-view-button {
+		display: flex;
+		flex-shrink: 0;
+		flex-direction: row;
+		height: 100%;
+		background: #C0C0C0;
+	}
+
+	/* .transition {
+		transition: all 0.3s;
+	} */
+
+	.movable-view-box {
+		flex-shrink: 0;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
new file mode 100644
index 0000000..b394244
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
@@ -0,0 +1,341 @@
+var MIN_DISTANCE = 10;
+
+/**
+ * 判断当前是否为H5、app-vue
+ */
+var IS_HTML5 = false
+if (typeof window === 'object') IS_HTML5 = true
+
+/**
+ * 监听页面内值的变化,主要用于动态开关swipe-action
+ * @param {Object} newValue
+ * @param {Object} oldValue
+ * @param {Object} ownerInstance
+ * @param {Object} instance
+ */
+function showWatch(newVal, oldVal, ownerInstance, instance) {
+	var state = instance.getState()
+	getDom(instance, ownerInstance)
+	if (newVal && newVal !== 'none') {
+		openState(newVal, instance, ownerInstance)
+		return
+	}
+
+	if (state.left) {
+		openState('none', instance, ownerInstance)
+	}
+	resetTouchStatus(instance)
+}
+
+/**
+ * 开始触摸操作
+ * @param {Object} e
+ * @param {Object} ins
+ */
+function touchstart(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState();
+	getDom(instance, ownerInstance)
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 开始触摸时移除动画类
+	instance.requestAnimationFrame(function() {
+		instance.removeClass('ani');
+		ownerInstance.callMethod('closeSwipe');
+	})
+
+	// 记录上次的位置
+	state.x = state.left || 0
+	// 计算滑动开始位置
+	stopTouchStart(e, ownerInstance)
+}
+
+/**
+ * 开始滑动操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchmove(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 是否可以滑动页面
+	stopTouchMove(e);
+	if (state.direction !== 'horizontal') {
+		return;
+	}
+
+	if (e.preventDefault) {
+		// 阻止页面滚动
+		e.preventDefault()
+	}
+
+	move(state.x + state.deltaX, instance, ownerInstance)
+}
+
+/**
+ * 结束触摸操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchend(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+
+	if (disabled) return
+	// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+	// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+	moveDirection(state.left, instance, ownerInstance)
+
+}
+
+/**
+ * 设置移动距离
+ * @param {Object} value
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function move(value, instance, ownerInstance) {
+	value = value || 0
+	var state = instance.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	// 获取可滑动范围
+	state.left = range(value, -rightWidth, leftWidth);
+	instance.requestAnimationFrame(function() {
+		instance.setStyle({
+			transform: 'translateX(' + state.left + 'px)',
+			'-webkit-transform': 'translateX(' + state.left + 'px)'
+		})
+	})
+
+}
+
+/**
+ * 获取元素信息
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function getDom(instance, ownerInstance) {
+	var state = instance.getState()
+	var leftDom = ownerInstance.selectComponent('.button-group--left')
+	var rightDom = ownerInstance.selectComponent('.button-group--right')
+	var leftStyles = {
+		width: 0
+	}
+	var rightStyles = {
+		width: 0
+	}
+	leftStyles = leftDom.getBoundingClientRect()
+	rightStyles = rightDom.getBoundingClientRect()
+
+	state.leftWidth = leftStyles.width || 0
+	state.rightWidth = rightStyles.width || 0
+	state.threshold = instance.getDataset().threshold
+}
+
+/**
+ * 获取范围
+ * @param {Object} num
+ * @param {Object} min
+ * @param {Object} max
+ */
+function range(num, min, max) {
+	return Math.min(Math.max(num, min), max);
+}
+
+
+/**
+ * 移动方向判断
+ * @param {Object} left
+ * @param {Object} value
+ * @param {Object} ownerInstance
+ * @param {Object} ins
+ */
+function moveDirection(left, ins, ownerInstance) {
+	var state = ins.getState()
+	var threshold = state.threshold
+	var position = state.position
+	var isopen = state.isopen || 'none'
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	if (state.deltaX === 0) {
+		openState('none', ins, ownerInstance)
+		return
+	}
+	if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+			rightWidth +
+			left < threshold)) {
+		// right
+		openState('right', ins, ownerInstance)
+	} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+			leftWidth - left < threshold)) {
+		// left
+		openState('left', ins, ownerInstance)
+	} else {
+		// default
+		openState('none', ins, ownerInstance)
+	}
+}
+
+
+/**
+ * 开启状态
+ * @param {Boolean} type
+ * @param {Object} ins
+ * @param {Object} ownerInstance
+ */
+function openState(type, ins, ownerInstance) {
+	var state = ins.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	var left = ''
+	state.isopen = state.isopen ? state.isopen : 'none'
+	switch (type) {
+		case "left":
+			left = leftWidth
+			break
+		case "right":
+			left = -rightWidth
+			break
+		default:
+			left = 0
+	}
+
+	// && !state.throttle
+
+	if (state.isopen !== type) {
+		state.throttle = true
+		ownerInstance.callMethod('change', {
+			open: type
+		})
+
+	}
+
+	state.isopen = type
+	// 添加动画类
+	ins.requestAnimationFrame(function() {
+		ins.addClass('ani');
+		move(left, ins, ownerInstance)
+	})
+	// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+}
+
+
+function getDirection(x, y) {
+	if (x > y && x > MIN_DISTANCE) {
+		return 'horizontal';
+	}
+	if (y > x && y > MIN_DISTANCE) {
+		return 'vertical';
+	}
+	return '';
+}
+
+/**
+ * 重置滑动状态
+ * @param {Object} event
+ */
+function resetTouchStatus(instance) {
+	var state = instance.getState();
+	state.direction = '';
+	state.deltaX = 0;
+	state.deltaY = 0;
+	state.offsetX = 0;
+	state.offsetY = 0;
+}
+
+/**
+ * 设置滑动开始位置
+ * @param {Object} event
+ */
+function stopTouchStart(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	resetTouchStatus(instance);
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.startX = touch.clientX;
+	state.startY = touch.clientY;
+}
+
+/**
+ * 滑动中，是否禁止打开
+ * @param {Object} event
+ */
+function stopTouchMove(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.deltaX = touch.clientX - state.startX;
+	state.deltaY = touch.clientY - state.startY;
+	state.offsetY = Math.abs(state.deltaY);
+	state.offsetX = Math.abs(state.deltaX);
+	state.direction = state.direction || getDirection(state.offsetX, state.offsetY);
+}
+
+function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (var v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
+
+var movable = false
+
+function mousedown(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchstart(e, ins)
+	movable = true
+}
+
+function mousemove(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	if (!movable) return
+	touchmove(e, ins)
+}
+
+function mouseup(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchend(e, ins)
+	movable = false
+}
+
+function mouseleave(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	movable = false
+}
+
+module.exports = {
+	showWatch: showWatch,
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	mousedown: mousedown,
+	mousemove: mousemove,
+	mouseup: mouseup,
+	mouseleave: mouseleave
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
new file mode 100644
index 0000000..4971782
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
@@ -0,0 +1,60 @@
+<template>
+	<view>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SwipeAction 滑动操作
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 */
+	export default {
+		name:"uniSwipeAction",
+		data() {
+			return {};
+		},
+		created() {
+			this.children = [];
+		},
+		methods: {
+			// 公开给用户使用，重制组件样式
+			resize(){
+				// wxs 会自己计算组件大小，所以无需执行下面代码
+				// #ifndef APP-VUE || H5 || MP-WEIXIN
+				this.children.forEach(vm=>{
+					vm.init()
+				})
+				// #endif
+			},
+			// 公开给用户使用，关闭全部 已经打开的组件
+			closeAll(){
+				this.children.forEach(vm=>{
+					// #ifdef APP-VUE || H5 || MP-WEIXIN
+					vm.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN
+					vm.close()
+					// #endif
+				})
+			},
+			closeOther(vm) {
+				if (this.openItem && this.openItem !== vm) {
+					// #ifdef APP-VUE || H5 || MP-WEIXIN
+					this.openItem.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN
+					this.openItem.close()
+					// #endif
+				}
+				// 记录上一个打开的 swipe-action-item ,用于 auto-close
+				this.openItem = vm
+			}
+		}
+	};
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-swipe-action/package.json b/uni_modules/uni-swipe-action/package.json
new file mode 100644
index 0000000..c8998d9
--- /dev/null
+++ b/uni_modules/uni-swipe-action/package.json
@@ -0,0 +1,87 @@
+{
+	"id": "uni-swipe-action",
+	"displayName": "uni-swipe-action 滑动操作",
+	"version": "1.3.7",
+	"description": "SwipeAction 滑动操作操作组件",
+	"keywords": [
+        "",
+        "uni-ui",
+        "uniui",
+        "滑动删除",
+        "侧滑删除"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+	"dcloudext": {
+		"category": [
+			"前端组件",
+			"通用组件"
+		],
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+	},
+	"uni_modules": {
+		"dependencies": ["uni-scss"],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "y",
+					"联盟": "u"
+				},
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-swipe-action/readme.md b/uni_modules/uni-swipe-action/readme.md
new file mode 100644
index 0000000..93a5cac
--- /dev/null
+++ b/uni_modules/uni-swipe-action/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwipeAction 滑动操作
+> **组件名：uni-swipe-action**
+> 代码块： `uSwipeAction`、`uSwipeActionItem`
+
+
+通过滑动触发选项的容器
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file