Merge branch 'master' of http://git.huaml.com/zhh/front-end

admin-update/src/components/module/operate-line.vue

@@ -78,6 +78,10 @@ export default {
 			flex-shrink: 0;
 			text-align: center;
 			position: relative;
+			border-top: 1px solid #f7f7f7;
+			&:first-child {
+				border-top: none;
+			}
 			.iconfont {
 				font-size: 16px;
 				cursor: pointer;
@@ -87,12 +91,12 @@ export default {
 			}
 			.iconcaozuojihuo {
 				position: absolute;
-				top: -14px;
+				top: -12px;
 				right: 6px;
 				font-size: 16px;
 			}
 			.btn-text {
-				margin-top: 2px;
+				// margin-top: 2px;
 				cursor: pointer;
 				&:hover {
 					color: $mainColor;

admin-update/src/mock/userInfo.js

@@ -321,7 +321,7 @@ let menu = {
 		{
 			id: '601',
 			parentId: '6',
-			name: '邀请有礼',
+			name: '邀请列表',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 6,
@@ -332,7 +332,7 @@ let menu = {
 		{
 			id: '602',
 			parentId: '6',
-			name: '奖励设置',
+			name: '邀请奖励',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 6,
@@ -459,7 +459,7 @@ let menu = {
 		{
 			id: '1101',
 			parentId: '11',
-			name: '微信菜单设置',
+			name: '微信菜单',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,
@@ -470,7 +470,7 @@ let menu = {
 		{
 			id: '1102',
 			parentId: '11',
-			name: '新人领券设置',
+			name: '新人优惠券',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,
@@ -481,7 +481,7 @@ let menu = {
 		{
 			id: '1103',
 			parentId: '11',
-			name: '会员等级设置',
+			name: '会员等级',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,

admin-update/src/pages/layout/topbar/index.vue

@@ -3,9 +3,9 @@
 		<div class="collapse">
 			<img class="avatar" :src="logoUrl | default_avatar" alt="商标" />
 			<div>
-				<span v-if="$projectName == 'business'">{{ shopInfo.merchantName }}</span>
-				<span v-else>花卉宝</span>
-				<span class="app-size-32 app-bold"> - </span>
+				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.merchantName }}</span> -->
+				<!-- <span v-else>花卉宝</span> -->
+				<!-- <span class="app-size-32 app-bold"> - </span> -->
 				<span>后台管理系统</span>
 			</div>
 			<!-- <icon-svg name="icon-menu"></icon-svg> -->

admin-update/src/views/goods/auto-price.vue

@@ -1,26 +1,27 @@
 <template>
 	<div class="app-content auto-price-wrap">
 		<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-form">
-			<el-form-item label="自动涨价状态" prop="riseSwitch">
+			<el-form-item label="涨价开关" prop="riseSwitch">
 				<el-switch
 					v-model="form.riseSwitch"
 					active-value="1"
 					inactive-value="0"
 				></el-switch>
 			</el-form-item>
-			<el-form-item label="涨价节日" prop="festIdList">
-				<el-checkbox
-					v-model="form.festIdList"
-					:label="item.id"
-					border
-					v-for="(item, index) in festData"
-					:key="item.id"
-					size="small"
-					>{{ item.name }}</el-checkbox
-				>
-			</el-form-item>
+			
+			<template v-if="form.riseSwitch == 1">
+				<el-form-item label="涨价节日" prop="festIdList">
+					<el-checkbox
+						v-model="form.festIdList"
+						:label="item.id"
+						border
+						v-for="(item, index) in festData"
+						:key="item.id"
+						size="small"
+						>{{ item.name }}</el-checkbox
+					>
+				</el-form-item>
 
-			<template v-if="form.riseSwitch == 0">
 				<el-form-item label="涨价方式" prop="riseType">
 					<el-radio-group v-model="form.riseType">
 						<el-radio label="0">按百分比</el-radio>
@@ -49,7 +50,7 @@
 
 			<el-form-item>
 				<div class="app-color-3">
-					提示：在节日的前一天和当天，商城设置自动涨价的商品将会全部统一涨价。过后自动恢复原价。
+					节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。
 				</div>
 			</el-form-item>
 			<el-form-item>

admin-update/src/views/goods/freight-set.vue

@@ -39,8 +39,8 @@ export default {
 	watch: {
 		shopInfo() {
 			if (!this.$util.isEmpty(this.shopInfo)) {
-				this.form.first = this.shopInfo.extend.freightFirst;
-				this.form.add = this.shopInfo.extend.freightAdd;
+				this.form.first = this.shopInfo.extend.freeDistance;
+				this.form.add = this.shopInfo.extend.freight;
 			}
 		}
 	},
@@ -50,8 +50,8 @@ export default {
 	methods: {
 		init() {
 			if (!this.$util.isEmpty(this.shopInfo)) {
-				this.form.first = this.shopInfo.extend.freightFirst;
-				this.form.add = this.shopInfo.extend.freightAdd;
+				this.form.first = this.shopInfo.extend.freeDistance;
+				this.form.add = this.shopInfo.extend.freight;
 			}
 		},
 		_updateFn() {

admin-update/src/views/goods/goods-add.vue

@@ -157,7 +157,11 @@
 							trigger="hover"
 							v-model="chargePopover"
 						>
-							<p>5公里内免运费，超过每增加1公里运费增加2元</p>
+							<p>
+								{{ shopInfo.extend.freeDistance }}公里内免运费，超过每增加{{
+									shopInfo.extend.freight
+								}}公里运费增加2元
+							</p>
 							<div style="text-align: right; margin-top: 10px">
 								<el-button size="mini" type="primary" @click="chargePopover = false"
 									>修改</el-button
@@ -321,7 +325,7 @@ export default {
 	},
 	computed: {
 		...mapGetters({ categoryData: 'category' }),
-		...mapGetters(['token'])
+		...mapGetters(['token', 'shopInfo'])
 	},
 	created() {
 		this.init();

admin-update/src/views/setting/wx-menu.vue

@@ -30,32 +30,30 @@
 			<template v-if="addDialog">
 				<div class="ad-modal-content">
 					<div class="ad-modal-wrap">
-						<el-form :model="form" :rules="rule" ref="form" label-width="100px" class="demo-form">
+						<el-form :model="form" :rules="rule" ref="form" label-width="50px" class="demo-form">
 							<el-form-item label="名称" prop="name">
 								<el-input v-model="form.name" placeholder="请输入菜单名称" size="small"></el-input>
 							</el-form-item>
-							<template v-if="!isModifyParents">
-								<el-form-item label="选项" prop="menuOption">
-									<el-radio-group v-model="form.menuOption" :disabled="isModifyParents">
-										<el-radio label="0">常用网址</el-radio>
-										<el-radio label="1">自定义网址</el-radio>
+							<el-form-item label="选项" prop="menuOption">
+								<el-radio-group v-model="form.menuOption">
+									<el-radio label="0">常用网址</el-radio>
+									<el-radio label="1">自定义网址</el-radio>
+								</el-radio-group>
+							</el-form-item>
+							<el-form-item label class="content-j-wrap">
+								<template v-if="form.menuOption == 0">
+									<!-- <div> -->
+									<el-radio-group v-model="form.targetId" size="mini">
+										<el-radio v-for="(item, index) in commonUrlData" :key="index" border :label="item.id">{{ item.name }}</el-radio>
 									</el-radio-group>
-								</el-form-item>
-								<el-form-item label>
-									<template v-if="form.menuOption == 0">
-										<!-- <div> -->
-										<el-radio-group v-model="form.targetId" size="mini" :disabled="isModifyParents">
-											<el-radio v-for="(item, index) in commonUrlData" :key="index" border :label="item.id">{{ item.name }}</el-radio>
-										</el-radio-group>
-										<!-- </div> -->
-									</template>
-									<template v-else>
-										<div>
-											<el-input v-model="form.replyUrl" placeholder="请填写链接，留空点图片不跳转" size="small" :disabled="isModifyParents"></el-input>
-										</div>
-									</template>
-								</el-form-item>
-							</template>
+									<!-- </div> -->
+								</template>
+								<template v-else>
+									<div>
+										<el-input v-model="form.replyUrl" placeholder="请填写链接，留空点图片不跳转" size="small"></el-input>
+									</div>
+								</template>
+							</el-form-item>
 						</el-form>
 						<div class="dialog-footer">
 							<el-button @click="resetForm" size="small">取 消</el-button>
@@ -150,7 +148,12 @@
 				this.operateData = item.children || [];
 				// 修改
 				// this.dialogData = item;
-				this.form.name = JSON.parse(JSON.stringify(item.name));
+				// this.form.name = JSON.parse(JSON.stringify(item.name));
+				console.log('江总', item);
+				console.log('江总11', this.commonUrlData);
+				Object.keys(this.form).forEach(i => {
+					this.form[i] = item[i];
+				});
 
 				this.addDialog = true;
 			},
@@ -200,8 +203,12 @@
 				let form = JSON.parse(JSON.stringify(this.form));
 
 				if (this.isModifyParents) {
+					Object.keys(form).forEach(i => {
+						this.menuData[this.activeIndex][i] = form[i];
+					});
+					console.log('江总22', this.menuData);
 					// 如果是父菜单操作时
-					this.menuData[this.activeIndex].name = form.name;
+					// this.menuData[this.activeIndex].name = form.name;
 				} else {
 					// 如果是子菜单操作时
 					if (this.isAdd) {
@@ -236,6 +243,7 @@
 		width: 375px;
 		margin: 0 15px;
 		padding-top: 20px;
+		flex-shrink: 0;
 		// 头部
 		.wx-bar {
 			position: relative;
@@ -295,20 +303,35 @@
 	// 编辑块
 	.ad-modal-content {
 		width: 640px;
-		height: 620px;
+		min-width: 640px;
+		height: 640px;
 		border: 20px solid #f7f7f7;
 		// border-top: 0;
-		padding-top: 20px;
+		margin-top: 20px;
 		display: flex;
 		align-items: center;
+		// padding: 20px;
+		background-color: #f7f7f7;
+
+		.ad-modal-wrap {
+			width: 100%;
+			.content-j-wrap {
+				width: 100%;
+				height: 460px;
+				background-color: #fff;
+				padding-top: 10px;
+			}
+		}
 
-		padding: 20px;
 		.dialog-footer {
 			display: flex;
 			align-items: center;
 			// justify-content: center;
-			padding-left: 70px;
-			margin-top: 30px;
+			// padding-left: 100px;
+			margin-top: 10px;
+			.el-button {
+				margin: 0 10px;
+			}
 		}
 	}
 	.prompt-text {

business/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>花卉宝</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.efd09b84.js></script><script src=/static/js/index.4e891a86.js></script></body></html>
+			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.77936413.js></script><script src=/static/js/index.d4006bc8.js></script></body></html>

huadian/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href=/css/app.6c7c3c55.css rel=preload as=style><link href=/css/chunk-libs.6d5f97e5.css rel=preload as=style><link href=/js/app.a0f5bf8e.js rel=preload as=script><link href=/js/chunk-libs.fba3356a.js rel=preload as=script><link href=/css/chunk-libs.6d5f97e5.css rel=stylesheet><link href=/css/app.6c7c3c55.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.fba3356a.js></script><script src=/js/app.a0f5bf8e.js></script></body></html>
+			}</style><link href=/css/app.6c7c3c55.css rel=preload as=style><link href=/css/chunk-libs.6d5f97e5.css rel=preload as=style><link href=/js/app.37037950.js rel=preload as=script><link href=/js/chunk-libs.fba3356a.js rel=preload as=script><link href=/css/chunk-libs.6d5f97e5.css rel=stylesheet><link href=/css/app.6c7c3c55.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.fba3356a.js></script><script src=/js/app.37037950.js></script></body></html>

mini-app/components/app-delivery.wxss

@@ -1 +1 @@
-.app-delivery-module .module-com.data-v-6cad6654{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .module-com .module-tit.data-v-6cad6654{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-delivery-module .module-com .module-det.data-v-6cad6654{padding:0 30rpx}.app-delivery-module .line-cell .tui-title.data-v-6cad6654{width:210rpx;color:#666}.app-delivery-module .line-cell .tui-input.data-v-6cad6654{width:calc(100% - 210rpx);font-size:28rpx}.app-delivery-module .line-cell .tui-placeholder.data-v-6cad6654{color:#ccc}.app-delivery-module .line-cell .phcolor.data-v-6cad6654{color:#ccc}.app-delivery-module .delivery-time.data-v-6cad6654{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#fff;padding:20rpx 0}.app-delivery-module .delivery-time .button-com.data-v-6cad6654{padding-top:14rpx;padding-bottom:10rpx;margin:0 10rpx}.app-delivery-module .gift-wrap .gift-content.data-v-6cad6654{width:100%}.app-delivery-module .gift-wrap .need-gift.data-v-6cad6654{margin-left:14rpx;color:#666}.app-delivery-module .gift-wrap .gitf-textarea.data-v-6cad6654{margin-top:40rpx}.app-delivery-module .none-name-delivery.data-v-6cad6654{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .none-name-delivery .none-name-text.data-v-6cad6654{margin-left:14rpx;color:#666}
+.app-delivery-module .module-com.data-v-42dd27b6{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .module-com .module-tit.data-v-42dd27b6{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-delivery-module .module-com .module-det.data-v-42dd27b6{padding:0 30rpx}.app-delivery-module .line-cell .tui-title.data-v-42dd27b6{width:210rpx;color:#666}.app-delivery-module .line-cell .tui-input.data-v-42dd27b6{width:calc(100% - 210rpx);font-size:28rpx}.app-delivery-module .line-cell .tui-placeholder.data-v-42dd27b6{color:#ccc}.app-delivery-module .line-cell .phcolor.data-v-42dd27b6{color:#ccc}.app-delivery-module .delivery-time.data-v-42dd27b6{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#fff;padding:20rpx 0}.app-delivery-module .delivery-time .button-com.data-v-42dd27b6{padding-top:14rpx;padding-bottom:10rpx;margin:0 10rpx}.app-delivery-module .gift-wrap .gift-content.data-v-42dd27b6{width:100%}.app-delivery-module .gift-wrap .need-gift.data-v-42dd27b6{margin-left:14rpx;color:#666}.app-delivery-module .gift-wrap .gitf-textarea.data-v-42dd27b6{margin-top:40rpx}.app-delivery-module .none-name-delivery.data-v-42dd27b6{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .none-name-delivery .none-name-text.data-v-42dd27b6{margin-left:14rpx;color:#666}

mini-app/components/module/app-order-list.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-order-list"],{"01a3":function(t,n,e){},"471e":function(t,n,e){"use strict";var i,u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.$util.isEmpty(t.info)),i=t._f("default_img")(t.imgUrl);t.$mp.data=Object.assign({},{$root:{g0:e,f0:i}})},o=[];e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}))},"57f1":function(t,n,e){"use strict";var i=e("01a3"),u=e.n(i);u.a},"7d55":function(t,n,e){"use strict";e.r(n);var i=e("471e"),u=e("c41b");for(var o in u)"default"!==o&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("57f1");var r,a=e("f0c5"),f=Object(a["a"])(u["default"],i["b"],i["c"],!1,null,"5c42a4ee",null,!1,i["a"],r);n["default"]=f.exports},bb97:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={name:"list-module",props:{info:{type:Object,default:function(){}}},data:function(){return{}},computed:{imgUrl:function(){return this.$util.isEmpty(this.info)?this.info.smallCoverUrl?this.info.smallCoverUrl:this.info.smallImgList[0]:""}},mounted:function(){},methods:{}};n.default=i},c41b:function(t,n,e){"use strict";e.r(n);var i=e("bb97"),u=e.n(i);for(var o in i)"default"!==o&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-order-list"],{"7d55":function(t,n,e){"use strict";e.r(n);var i=e("eb87"),u=e("c41b");for(var o in u)"default"!==o&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("d874");var r,f=e("f0c5"),a=Object(f["a"])(u["default"],i["b"],i["c"],!1,null,"f8328d68",null,!1,i["a"],r);n["default"]=a.exports},bb97:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={name:"list-module",props:{info:{type:Object,default:function(){}}},data:function(){return{}},computed:{imgUrl:function(){return this.$util.isEmpty(this.info)?"":this.info.smallCoverUrl?this.info.smallCoverUrl:this.info.smallImgList[0]}},mounted:function(){},methods:{}};n.default=i},bbbf:function(t,n,e){},c41b:function(t,n,e){"use strict";e.r(n);var i=e("bb97"),u=e.n(i);for(var o in i)"default"!==o&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=u.a},d874:function(t,n,e){"use strict";var i=e("bbbf"),u=e.n(i);u.a},eb87:function(t,n,e){"use strict";var i,u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.$util.isEmpty(t.info)),i=t._f("default_img")(t.imgUrl);t.$mp.data=Object.assign({},{$root:{g0:e,f0:i}})},o=[];e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}))}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/module/app-order-list-create-component',
     {

mini-app/components/module/app-order-list.wxml

@@ -1 +1 @@
-<view class="list-module _div data-v-5c42a4ee"><block wx:if="{{!$root.g0}}"><block class="data-v-5c42a4ee"><view class="list-left _div data-v-5c42a4ee"><view class="image _div data-v-5c42a4ee"><image src="{{$root.f0}}" alt="商品图片" class="_img data-v-5c42a4ee"></image></view><view class="list-msg _div data-v-5c42a4ee"><view class="title _div data-v-5c42a4ee">{{info.goodsName||info.title}}</view><block wx:if="{{info.goodsStyle&&info.goodsStyle!='0'||info.goodsStyleName&&info.goodsStyleName!='0'}}"><block class="data-v-5c42a4ee"><view class="desc _div data-v-5c42a4ee">{{info.goodsStyle||info.goodsStyleName}}</view></block></block></view></view><view class="list-right _div data-v-5c42a4ee"><view class="price _div data-v-5c42a4ee">{{"￥"+(info.price||info.unitPrice)}}</view><view class="num _div data-v-5c42a4ee">{{"*"+(info.buyNum||info.num)}}</view></view></block></block></view>
+<view class="list-module _div data-v-f8328d68"><block wx:if="{{!$root.g0}}"><block class="data-v-f8328d68"><view class="list-left _div data-v-f8328d68"><view class="image _div data-v-f8328d68"><image src="{{$root.f0}}" alt="商品图片" class="_img data-v-f8328d68"></image></view><view class="list-msg _div data-v-f8328d68"><view class="title _div data-v-f8328d68">{{info.goodsName||info.title}}</view><block wx:if="{{info.goodsStyle&&info.goodsStyle!='0'||info.goodsStyleName&&info.goodsStyleName!='0'}}"><block class="data-v-f8328d68"><view class="desc _div data-v-f8328d68">{{info.goodsStyle||info.goodsStyleName}}</view></block></block></view></view><view class="list-right _div data-v-f8328d68"><view class="price _div data-v-f8328d68">{{"￥"+(info.price||info.unitPrice)}}</view><view class="num _div data-v-f8328d68">{{"*"+(info.buyNum||info.num)}}</view></view></block></block></view>

mini-app/components/module/app-order-list.wxss

@@ -1 +1 @@
-.list-module.data-v-5c42a4ee{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 0;border-bottom:1rpx solid #eee}.list-module .list-left.data-v-5c42a4ee{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.list-module .list-left .image.data-v-5c42a4ee{width:140rpx}.list-module .list-left .list-msg.data-v-5c42a4ee{margin-left:20rpx}.list-module .list-left .list-msg .title.data-v-5c42a4ee{font-size:28rpx;color:#666;margin-bottom:10rpx}.list-module .list-left .list-msg .desc.data-v-5c42a4ee{color:#999}.list-module .list-right.data-v-5c42a4ee{text-align:right;color:#666}.list-module .list-right .price.data-v-5c42a4ee{margin-bottom:70rpx;color:#333}
+.list-module.data-v-f8328d68{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 0;border-bottom:1rpx solid #eee}.list-module .list-left.data-v-f8328d68{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.list-module .list-left .image.data-v-f8328d68{width:140rpx}.list-module .list-left .list-msg.data-v-f8328d68{margin-left:20rpx}.list-module .list-left .list-msg .title.data-v-f8328d68{font-size:28rpx;color:#666;margin-bottom:10rpx}.list-module .list-left .list-msg .desc.data-v-f8328d68{color:#999}.list-module .list-right.data-v-f8328d68{text-align:right;color:#666}.list-module .list-right .price.data-v-f8328d68{margin-bottom:70rpx;color:#333}

mini-app/pages/order/buy.wxss

@@ -1 +1 @@
-.app-content.data-v-3e4d9fad{padding-top:100rpx;padding-bottom:120rpx;min-height:calc(100vh - 220rpx)}.app-content .module-com.data-v-3e4d9fad{margin-bottom:20rpx;background-color:#fff}.app-content .module-com .module-tit.data-v-3e4d9fad{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-content .module-com .module-det.data-v-3e4d9fad{padding:0 30rpx}.app-content .line-cell .tui-title.data-v-3e4d9fad{width:210rpx;color:#666}.app-content .line-cell .tui-input.data-v-3e4d9fad{width:calc(100% - 210rpx);font-size:28rpx}.app-content .line-cell .tui-placeholder.data-v-3e4d9fad{color:#ccc}.app-content .line-cell .phcolor.data-v-3e4d9fad{color:#ccc}.app-content .shop-price-wrap .module-det.data-v-3e4d9fad{padding-bottom:20rpx}.app-content .shop-price-wrap .shop-prompt.data-v-3e4d9fad{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#666;margin-top:20rpx}.app-content .shop-price-wrap .shop-prompt .iconchangjianwentixiangguanwenti2.data-v-3e4d9fad{color:#ccc;margin-left:10rpx}.app-content .discount-wrap .module-det.data-v-3e4d9fad{padding-top:20rpx;padding-bottom:20rpx}.app-content .none-name-delivery.data-v-3e4d9fad{padding-left:30rpx;margin-top:40rpx}.app-content .none-name-delivery .none-name-text.data-v-3e4d9fad{margin-left:14rpx;color:#666}.page-btn.data-v-3e4d9fad{width:calc(100% - 60rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:0 30rpx}.page-btn .app-price.data-v-3e4d9fad{margin-bottom:8rpx;margin-left:4rpx}.page-btn .red.data-v-3e4d9fad{width:270rpx}.data-v-3e4d9fad .tui-alert-content{padding:40rpx 40rpx}.alt-content>._div.data-v-3e4d9fad{margin:10rpx 0}
+.app-content.data-v-7ed9559b{padding-top:100rpx;padding-bottom:120rpx;min-height:calc(100vh - 220rpx)}.app-content .module-com.data-v-7ed9559b{margin-bottom:20rpx;background-color:#fff}.app-content .module-com .module-tit.data-v-7ed9559b{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-content .module-com .module-det.data-v-7ed9559b{padding:0 30rpx}.app-content .line-cell .tui-title.data-v-7ed9559b{width:210rpx;color:#666}.app-content .line-cell .tui-input.data-v-7ed9559b{width:calc(100% - 210rpx);font-size:28rpx}.app-content .line-cell .tui-placeholder.data-v-7ed9559b{color:#ccc}.app-content .line-cell .phcolor.data-v-7ed9559b{color:#ccc}.app-content .shop-price-wrap .module-det.data-v-7ed9559b{padding-bottom:20rpx}.app-content .shop-price-wrap .shop-prompt.data-v-7ed9559b{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#666;margin-top:20rpx}.app-content .shop-price-wrap .shop-prompt .iconchangjianwentixiangguanwenti2.data-v-7ed9559b{color:#ccc;margin-left:10rpx}.app-content .discount-wrap .module-det.data-v-7ed9559b{padding-top:20rpx;padding-bottom:20rpx}.app-content .none-name-delivery.data-v-7ed9559b{padding-left:30rpx;margin-top:40rpx}.app-content .none-name-delivery .none-name-text.data-v-7ed9559b{margin-left:14rpx;color:#666}.page-btn.data-v-7ed9559b{width:calc(100% - 60rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:0 30rpx}.page-btn .app-price.data-v-7ed9559b{margin-bottom:8rpx;margin-left:4rpx}.page-btn .red.data-v-7ed9559b{width:270rpx}.data-v-7ed9559b .tui-alert-content{padding:40rpx 40rpx}.alt-content>._div.data-v-7ed9559b{margin:10rpx 0}

mobile-code-back/src/admin/goodsManage/freight.vue

@@ -41,16 +41,16 @@ export default {
 	watch: {
 		userInfo() {
 			if (!this.$util.isEmpty(this.userInfo)) {
-				this.form.first = this.userInfo.extend.freightFirst
-				this.form.add = this.userInfo.extend.freightAdd
+				this.form.first = this.userInfo.extend.freeDistance
+				this.form.add = this.userInfo.extend.freight
 			}
 		}
 	},
 	methods: {
 		init() {
 			getUser().then(res => {
-				this.form.first = this.userInfo.extend.freightFirst
-				this.form.add = this.userInfo.extend.freightAdd
+				this.form.first = this.userInfo.extend.freeDistance
+				this.form.add = this.userInfo.extend.freight
 			})
 		},
 		confirmFn() {

mobile-code-back/src/admin/goodsManage/price-increase.vue

@@ -42,7 +42,7 @@
 				</tui-list-cell>
 			</block>
 		</div>
-		<div class="prompt-text">提示：在节日的前一天和当天，商城设置自动涨价的商品将会全部 统一涨价。过后自动恢复原价。</div>
+		<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 		<button class="admin-button-com blue big confirm-btn" @click="setPrice">确定</button>
 	</div>
 </template>

mobile-code-back/src/admin/setting/coupon.vue

@@ -21,7 +21,7 @@
                 </div>
 			</div>
 		</div>
-		<div class="prompt-text">提示：在节日的前一天和当天, 商城设置自动涨价的商品将会全部 统一涨价。过后自动恢复原价。</div>
+		<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 		<div class="admin-button-com blue big" @click="confirmFn">确定</div>
 	</div>
 </template>

mobile-code-back/src/admin/setting/list.vue

@@ -20,17 +20,17 @@ export default {
 		return {
 			data: [
 				{
-					name: '微信菜单设置',
+					name: '微信菜单',
 					icon: 'iconweixin',
 					url: '/admin/setting/wx-menu'
 				},
 				{
-					name: '新人领券设置',
+					name: '新人优惠券',
 					icon: 'iconxinrenlingquanshezhi',
 					url: '/admin/setting/coupon'
 				},
 				{
-					name: '会员等级设置',
+					name: '会员等级',
 					icon: 'iconhuiyuandengjishezhi',
 					url: '/admin/setting/level'
 				}

mobile-code-back/src/b-pages.json

@@ -165,19 +165,19 @@
 				{
 					"path": "wx-menu",
 					"style": {
-						"navigationBarTitleText": "微信菜单设置"
+						"navigationBarTitleText": "微信菜单"
 					}
 				},
 				{
 					"path": "coupon",
 					"style": {
-						"navigationBarTitleText": "新人领券设置"
+						"navigationBarTitleText": "新人优惠券"
 					}
 				},
 				{
 					"path": "level",
 					"style": {
-						"navigationBarTitleText": "会员等级设置"
+						"navigationBarTitleText": "会员等级"
 					}
 				},
 				{

mobile-code-back/src/components/app-delivery.vue

@@ -24,7 +24,7 @@
 				<div class="tui-title">详细地址</div>
 				<div class="tui-input" v-if="form.receiveFullAddress">{{ form.receiveFullAddress }}</div>
 				<div class="tui-placeholder" v-else>请选择详细地址</div>
-				<!-- <input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="receiveFullAddress" placeholder="小区、大厦或街道名称，如金尚小区" /> -->
+				<!-- <input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="receiveFullAddress" placeholder="小区、大厦或街道名称" /> -->
 			</tui-list-cell>
 			<tui-list-cell class="line-cell" :hover="false">
 				<div class="tui-title">门牌号</div>
@@ -64,7 +64,7 @@
 						<span class="need-gift">需要贺卡</span>
 					</div>
 					<div class="gitf-textarea">
-						<textarea v-model="form.cardInfo" class="tui-textarea" placeholder-class="phcolor" name="cardInfo" placeholder="请填写贺卡内容" auto-height />
+						<textarea v-model="form.cardInfo" class="tui-textarea" placeholder-class="phcolor" name="cardInfo" placeholder="请填写贺卡内容，留空将寄出空白贺卡" auto-height />
 						<!-- <app-textarea v-model="form.cardInfo" placeholder="请填写贺卡内容" @blur="blursave('blur')" /> -->
 					</div>
 				</div>
@@ -73,8 +73,8 @@
 		<!-- 备注 -->
 		<div class="module-com">
 			<tui-list-cell class="line-cell" :hover="false">
-				<div class="tui-title">备注</div>
-				<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" name="remark" placeholder="(选填)" />
+				<div class="tui-title">其它备注</div>
+				<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" name="remark" placeholder="（选填）" />
 			</tui-list-cell>
 		</div>
 		<!-- 省市联动 -->

mobile-code/src/admin/ad/list.vue

@@ -127,7 +127,7 @@ export default {
 		})
 	},
 	onReachBottom() {
-		if (this.list.data.length < this.list.total) {
+		if (!this.list.finished) {
 			this._list().then(res => {
 				uni.stopPullDownRefresh()
 			})

mobile-code/src/admin/ad/sel-goods.vue

@@ -43,7 +43,7 @@ export default {
 		})
 	},
 	onReachBottom() {
-		if (this.list.data.length < this.list.total) {
+		if (!this.list.finished) {
 			this._list().then(res => {
 				uni.stopPullDownRefresh()
 			})

mobile-code/src/admin/assets/list.vue

@@ -49,7 +49,7 @@ export default {
 		})
 	},
 	onReachBottom() {
-		if (this.list.data.length < this.list.total) {
+		if (!this.list.finished) {
 			this._list().then(res => {
 				uni.stopPullDownRefresh()
 			})

mobile-code/src/admin/coupon/list.vue

@@ -78,7 +78,7 @@ export default {
 		})
 	},
 	onReachBottom() {
-		if (this.list.data.length < this.list.total) {
+		if (!this.list.finished) {
 			this._list().then(res => {
 				uni.stopPullDownRefresh()
 			})

mobile-code/src/admin/goodsManage/category.vue

@@ -160,7 +160,7 @@ export default {
 		})
 	},
 	onReachBottom() {
-		if (this.list.data.length < this.list.total) {
+		if (!this.list.finished) {
 			this._list().then(res => {
 				uni.stopPullDownRefresh()
 			})

mobile-code/src/admin/goodsManage/freight.vue

@@ -41,16 +41,16 @@ export default {
 	watch: {
 		userInfo() {
 			if (!this.$util.isEmpty(this.userInfo)) {
-				this.form.first = this.userInfo.extend.freightFirst
-				this.form.add = this.userInfo.extend.freightAdd
+				this.form.first = this.userInfo.extend.freeDistance
+				this.form.add = this.userInfo.extend.freight
 			}
 		}
 	},
 	methods: {
 		init() {
 			getUser().then(res => {
-				this.form.first = this.userInfo.extend.freightFirst
-				this.form.add = this.userInfo.extend.freightAdd
+				this.form.first = this.userInfo.extend.freeDistance
+				this.form.add = this.userInfo.extend.freight
 			})
 		},
 		confirmFn() {

mobile-code/src/admin/goodsManage/price-increase.vue

@@ -6,120 +6,122 @@
 				<switch :checked="form.riseSwitch == '0' ? false : true" @change="switchChangeFn" />
 			</div>
 		</div>
-		<!-- 选项设置 -->
-		<div class="input-line-wrap new-wrap">
-			<tui-list-cell class="line-cell" :hover="false">
-				<div class="tui-title">要涨价节日</div>
-				<div class="tui-input button-wrap">
-					<block v-for="(item, index) in festData" :key="index">
-						<button class="admin-button-com" :class="[form.festIdList.includes(item.id) ? '' : 'default']" @click="selFestFn(item)">{{ item.name || '暂无' }}</button>
-					</block>
-				</div>
-			</tui-list-cell>
-			<tui-list-cell class="line-cell" :hover="false">
-				<div class="tui-title">涨价方式</div>
-				<radio-group class="tui-input flex-center-between" @change="radioChange">
-					<label class="list" for="customLink">
-						<radio id="customLink" value="0" :checked="form.riseType == 0"/>
-						<span class="checkbox-text">按百分比</span>
-					</label>
-					<label class="list" for="goodsLink">
-						<radio id="goodsLink" value="1" :checked="form.riseType == 1"/>
-						<span class="checkbox-text">按金额</span>
-					</label>
-				</radio-group>
-			</tui-list-cell>
-			<block v-if="form.riseType == 0">
+		<block v-if="form.riseSwitch != 0">
+			<!-- 选项设置 -->
+			<div class="input-line-wrap new-wrap">
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title">比例</div>
-					<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价10%，请输入10" maxlength="50" type="number" />
+					<div class="tui-title">要涨价节日</div>
+					<div class="tui-input button-wrap">
+						<block v-for="(item, index) in festData" :key="index">
+							<button class="admin-button-com" :class="[form.festIdList.includes(item.id) ? '' : 'default']" @click="selFestFn(item)">{{ item.name || '暂无' }}</button>
+						</block>
+					</div>
 				</tui-list-cell>
-			</block>
-			<block v-else>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title">金额</div>
-					<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价80元请输入80" maxlength="50" type="number" />
+					<div class="tui-title">涨价方式</div>
+					<radio-group class="tui-input flex-center-between" @change="radioChange">
+						<label class="list" for="customLink">
+							<radio id="customLink" value="0" :checked="form.riseType == 0" />
+							<span class="checkbox-text">按百分比</span>
+						</label>
+						<label class="list" for="goodsLink">
+							<radio id="goodsLink" value="1" :checked="form.riseType == 1" />
+							<span class="checkbox-text">按金额</span>
+						</label>
+					</radio-group>
 				</tui-list-cell>
-			</block>
-		</div>
-		<div class="prompt-text">提示：在节日的前一天和当天，商城设置自动涨价的商品将会全部 统一涨价。过后自动恢复原价。</div>
+				<block v-if="form.riseType == 0">
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">比例</div>
+						<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价10%，请输入10" maxlength="50" type="number" />
+					</tui-list-cell>
+				</block>
+				<block v-else>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">金额</div>
+						<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价80元请输入80" maxlength="50" type="number" />
+					</tui-list-cell>
+				</block>
+			</div>
+			<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
+		</block>
 		<button class="admin-button-com blue big confirm-btn" @click="setPrice">确定</button>
 	</div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import TuiListCell from '@/components/plugin/list-cell'
-// api
-import { getFest } from '@/utils/config'
-import { getRise, updateRise } from '@/api/goods'
-export default {
-	name: 'setting-price-increase',
-	components: {
-		TuiListCell
-	},
-	data() {
-		return {
-			// radioVal: '0',
-			form: {
-				riseSwitch: '0',
-				riseType: '0',
-				festIdList: [],
-				riseAmount: ''
-			}
-		}
-	},
-	computed: {
-		...mapGetters({ festData: 'getFest' })
-	},
-	onLoad() {
-		// this.init()
-	},
-	methods: {
-		init() {
-			getFest().then(() => {
-				this._getDet()
-			})
-		},
-		_getDet() {
-			return getRise().then(res => {
-				if (this.$util.isEmpty(res.data)) return
-				res.data.festIdList = res.data.festIdList.map(e => e + '')
-				Object.keys(this.form).forEach((i, index) => {
-					this.form[i] = res.data[i]
-				})
-			})
+	import { mapGetters } from 'vuex'
+	import TuiListCell from '@/components/plugin/list-cell'
+	// api
+	import { getFest } from '@/utils/config'
+	import { getRise, updateRise } from '@/api/goods'
+	export default {
+		name: 'setting-price-increase',
+		components: {
+			TuiListCell
 		},
-		setPrice() {
-			if (this.form.festIdList.length == 0) {
-				this.$msg('请先选择节日!')
-				return false
+		data() {
+			return {
+				// radioVal: '0',
+				form: {
+					riseSwitch: '0',
+					riseType: '0',
+					festIdList: [],
+					riseAmount: ''
+				}
 			}
-			if (!this.form.riseAmount) {
-				this.$msg('请先输入比例或者金额!')
-				return false
-			}
-			updateRise(this.form).then(res => {
-				this.$msg('更新成功!')
-			})
 		},
-		selFestFn(item) {
-			let index = this.form.festIdList.findIndex(e => e == item.id)
-			if (index == -1) {
-				this.form.festIdList.push(item.id)
-			} else {
-				this.form.festIdList.splice(index, 1)
-			}
+		computed: {
+			...mapGetters({ festData: 'getFest' })
 		},
-		switchChangeFn(e) {
-			this.form.riseSwitch = e.detail.value ? '1' : '0'
+		onLoad() {
+			// this.init()
 		},
-		radioChange(e) {
-			this.form.riseAmount = ''
-			this.form.riseType = e.detail.value
+		methods: {
+			init() {
+				getFest().then(() => {
+					this._getDet()
+				})
+			},
+			_getDet() {
+				return getRise().then(res => {
+					if (this.$util.isEmpty(res.data)) return
+					res.data.festIdList = res.data.festIdList.map(e => e + '')
+					Object.keys(this.form).forEach((i, index) => {
+						this.form[i] = res.data[i]
+					})
+				})
+			},
+			setPrice() {
+				if (this.form.festIdList.length == 0) {
+					this.$msg('请先选择节日!')
+					return false
+				}
+				if (!this.form.riseAmount) {
+					this.$msg('请先输入比例或者金额!')
+					return false
+				}
+				updateRise(this.form).then(res => {
+					this.$msg('更新成功!')
+				})
+			},
+			selFestFn(item) {
+				let index = this.form.festIdList.findIndex(e => e == item.id)
+				if (index == -1) {
+					this.form.festIdList.push(item.id)
+				} else {
+					this.form.festIdList.splice(index, 1)
+				}
+			},
+			switchChangeFn(e) {
+				this.form.riseSwitch = e.detail.value ? '1' : '0'
+			},
+			radioChange(e) {
+				this.form.riseAmount = ''
+				this.form.riseType = e.detail.value
+			}
 		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>

mobile-code/src/admin/home/member.vue

@@ -78,6 +78,21 @@ export default {
 			]
 		}
 	},
+	onPullDownRefresh() {
+		this.resetList()
+		this._list().then(res => {
+			uni.stopPullDownRefresh()
+		})
+	},
+	onReachBottom() {
+		if (!this.list.finished) {
+			this._list().then(res => {
+				uni.stopPullDownRefresh()
+			})
+		} else {
+			uni.stopPullDownRefresh()
+		}
+	},
 	onLoad(option) {
 		// this.init()
 	},

mobile-code/src/admin/home/order.vue

@@ -101,11 +101,19 @@
 			}
 		},
 		onPullDownRefresh() {
-			console.log('fasdfasdf')
+			this.resetList()
+			this._list().then(res => {
+				uni.stopPullDownRefresh()
+			})
 		},
-		// 加载更多
 		onReachBottom() {
-			console.log('5151')
+			if (!this.list.finished) {
+				this._list().then(res => {
+					uni.stopPullDownRefresh()
+				})
+			} else {
+				uni.stopPullDownRefresh()
+			}
 		},
 		onLoad: function() {
 			// this.init()
@@ -120,7 +128,7 @@
 			this._list()
 		},
 		methods: {
-			async init() {},
+			// async init() {},
 			_list() {
 				let status = JSON.parse(JSON.stringify(this.tabIndex))
 				status = status == 4 ? 5 : status - 1