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

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

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-content summary-wrap">
-		<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-form">
+		<el-form :model="form" :rules="rules" ref="form" label-width="10px" class="demo-form">
 			<el-form-item label="" prop="desc">
 				<cl-editor-quill v-model="form.desc" @load="editor"></cl-editor-quill>
 			</el-form-item>

admin-update/src/views/member/list.vue

@@ -25,6 +25,10 @@
 				></cl-avatar>
 			</template>
 
+			<template #table-column-id="{scope}">
+				<span @click="detailShowFn(scope.row)">{{ scope.row.id }}</span>
+			</template>
+
 			<template #table-column-userName="{scope}">
 				<div class="user-name-warp">
 					<i v-if="scope.row.source == 0" class="iconfont iconweixinlaiyuan"></i>
@@ -69,10 +73,6 @@
 				>
 			</template>
 
-			<!-- 详情 -->
-			<template #slot-detail="{scope}">
-				<el-button type="text" @click="detailShowFn(scope.row)">详情</el-button>
-			</template>
 			<!-- 充值 -->
 			<template #slot-recharge="{scope}">
 				<el-button type="text" @click="rechargeShowFn(scope.row)">充值</el-button>
@@ -319,7 +319,7 @@ export default {
 						},
 						{
 							prop: 'userName',
-							label: '来源 昵称',
+							label: '昵称',
 							align: 'center'
 						},
 						{
@@ -347,7 +347,7 @@ export default {
 							prop: 'subscribe',
 							label: '关注公众号',
 							align: 'center',
-							sortable: true,
+							sortable: false,
 							width: 150
 						},
 						{

admin-update/src/views/order/list.vue

@@ -23,14 +23,19 @@
 				<div class="book-wrap">
 					<cl-avatar
 						shape="circle"
-						:size="24"
-						:src="scope.row.avatarUrl | default_avatar"
+						:size="22"
+						:src="scope.row.bookAvatar | default_avatar"
 					></cl-avatar>
 					<div>{{ scope.row.bookName }}</div>
 					<div>{{ scope.row.bookMobile }}</div>
 				</div>
 			</template>
 
+			<!-- 单号 -->
+			<template #table-column-orderSn="{scope}">
+                <el type="text" @click="detailShowFn(scope.row)" >{{ scope.row.orderSn}}</el>
+			</template>
+
 			<!-- 收花人 -->
 			<template #table-column-receiveUserName="{scope}">
 				<div class="book-wrap">
@@ -49,20 +54,20 @@
 
 			<!-- 状态 -->
 			<template #table-column-status="{scope}">
-				<el-tag v-if="scope.row.status == 1" size="medium" type="danger">待配送</el-tag>
-				<el-tag v-else-if="scope.row.status == 2" size="medium" type="danger"
-					>配送中</el-tag
+				<el v-if="scope.row.status == 1">待配送</el>
+				<el v-else-if="scope.row.status == 2"
+					>配送中</el
 				>
-				<el-tag v-else-if="scope.row.status == 3" size="medium" type="danger"
-					>待通知</el-tag
+				<el v-else-if="scope.row.status == 3"
+					>待通知</el
 				>
-				<el-tag v-else-if="scope.row.status == 4" size="medium" type="danger"
-					>已取消</el-tag
+				<el v-else-if="scope.row.status == 4"
+					>已取消</el
 				>
-				<el-tag v-else-if="scope.row.status == 5" size="medium" type="success"
-					>已完成</el-tag
+				<el v-else-if="scope.row.status == 5"
+					>已完成</el
 				>
-				<el-tag v-else size="medium" type="danger">待付款</el-tag>
+				<el v-else>待付款</el>
 			</template>
 
 			<!-- 进度 -->
@@ -87,30 +92,28 @@
 			<!-- 操作 -->
 			<!-- 发货 -->
 			<template #slot-column-option="{scope}">
-				<template>
-					<el-button type="text" @click="detailShowFn(scope.row)">详情</el-button>
-				</template>
-				<template v-if="scope.row.status == 4 || scope.row.status == 0">
-					<el-button type="text" size="small" disabled>免发货</el-button>
+				<template v-if="scope.row.status == 0">
+					<el-button type="text" size="small" disabled>自取</el-button>
 					<el-button type="text" size="small" disabled>发货</el-button>
 				</template>
-				<template v-else-if="scope.row.currentFlow == 0">
-					<el-button type="text" size="small" @click="noSendShipFn(scope.row)"
-						>免发货</el-button
-					>
-					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
-						>发货</el-button
-					>
-				</template>
-				<template v-else-if="scope.row.currentFlow == scope.row.totalFlow">
-					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
-						>配送详情</el-button
-					>
-				</template>
+
 				<template v-else>
-					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
-						>继续</el-button
-					>
+
+                                <template v-if="scope.row.currentFlow == 0">
+                					<el-button type="text" size="small" @click="noSendShipFn(scope.row)"
+                						>自取</el-button
+                					>
+                					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
+                						>发货</el-button
+                					>
+                				</template>
+                				<template v-else>
+                									<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
+                                						>继续</el-button
+                                					>
+				                </template>
+
+
 				</template>
 			</template>
 		</cl-crud>
@@ -185,7 +188,7 @@ export default {
 			})
 				.then(() => {
 					this.$service.order.freeShipping({ id: item.id }).then(res => {
-						this.$message.success('免发货操作成功！');
+						this.$message.success('操作成功！');
 						item.currentFlow = 1;
 					});
 				})
@@ -248,36 +251,40 @@ export default {
 							label: '实付款',
 							align: 'center',
 							emptyText: '无',
-							'min-width': 150
+							'min-width': 100
 						},
+                        {
+                            prop: 'sendNum',
+                            label: '编号',
+                            align: 'center',
+                            width: 80
+                        },
 						{
-							prop: 'reachTime',
-							label: '送达状态',
-							align: 'center'
-						},
-						{
-							prop: 'reachTime',
-							label: '送达时间',
-							align: 'center'
+							prop: 'currentFlow',
+							label: '进度',
+							align: 'center',
+							width: 220
 						},
 						{
 							prop: 'status',
 							label: '状态',
 							align: 'center'
 						},
+                        {
+                            prop: 'reachTime',
+                            label: '配送状态',
+                            align: 'center'
+                        },
 						{
-							prop: 'sendNum',
-							label: '标记号',
-							align: 'center',
-							sortable: true,
-							width: 150
+							prop: 'reachTime',
+							label: '送达时间',
+							align: 'center'
 						},
-						{
-							prop: 'currentFlow',
-							label: '进度',
-							align: 'center',
-							width: 220
-						}
+                        {
+                            prop: 'reachTime',
+                            label: '已通知',
+                            align: 'center'
+                        },
 					],
 
 					props: {
@@ -338,6 +345,7 @@ export default {
 	// height: 26px;
 }
 </style>
+
 <style lang="scss">
 .order-list-wrap {
 	.el-step__head.is-process {

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

@@ -57,7 +57,7 @@
 						</el-form>
 						<div class="dialog-footer">
 							<el-button @click="resetForm" size="small">取 消</el-button>
-							<el-button type="primary" @click="confirmForm" size="small">提交生效</el-button>
+							<el-button type="primary" @click="confirmForm" size="small">提交</el-button>
 						</div>
 					</div>
 				</div>
@@ -132,7 +132,7 @@
 				console.log(this.menuData);
 				// return false;
 				this.$service.setting.updateMenu(this.menuData).then(res => {
-					this.$message.success(res.msg || '提交生效');
+					this.$message.success(res.msg || '提交');
 					this.closeOperate();
 					this.resetForm();
 				});

mobile-code/src/pages/order/detail.vue

@@ -112,9 +112,6 @@
 			<template v-if="data.status == 0">
 				<button class="button-com red" @click="payFn">立即支付</button>
 			</template>
-			<template v-else-if="data.status == 1">
-				<button class="button-com middle">填写收花地址</button>
-			</template>
 			<template v-else-if="data.status == 5">
 				<button class="button-com middle" @click="evealFn">评价</button>
 			</template>

mobile-code/src/pages/pay/index.vue

@@ -274,6 +274,12 @@
 				}
 				host(params).then(res => {
 					this.payCallData = res.data
+					//错误返回判断
+					if(res.code == 0){
+						this.$msg(res.msg)
+						return false
+					}
+
 					if (this.form.payWay == 0) {
 						wexinPay(res.data, this.paySuccess, this.payFail)
 					} else if (this.form.payWay == 1) {

mobile/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.6a3c29d9.js></script><script src=/static/js/index.09750d2d.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.565672a3.js></script><script src=/static/js/index.6b7e7e6f.js></script></body></html>

mobile/static/js/common-redirect.2ef1646f.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["common-redirect"],{"0be2":function(n,t,e){var o=e("24fb");t=o(!1),t.push([n.i,'@charset "UTF-8";\n/***\r\n全局scss 变量和方法 存放处\r\n */\n/* 引入minxin */\n/* 颜色变量 */\n/*图片地址*/\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */.prompt-text[data-v-2eafd1ca]{padding-top:%?200?%;text-align:center}',""]),n.exports=t},"1d95":function(n,t,e){"use strict";e.r(t);var o=e("3b8d0"),i=e.n(o);for(var r in o)"default"!==r&&function(n){e.d(t,n,(function(){return o[n]}))}(r);t["default"]=i.a},"2be1":function(n,t,e){var o=e("0be2");"string"===typeof o&&(o=[[n.i,o,""]]),o.locals&&(n.exports=o.locals);var i=e("4f06").default;i("c197214a",o,!0,{sourceMap:!1,shadowMode:!1})},"3b8d0":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;e("2f62"),e("b26e");var o={data:function(){return{}},computed:{},onLoad:function(n){uni.showLoading({title:"加载中..."}),n.redirectUrl&&this.compatible()},methods:{compatible:function(){uni.hideLoading(),"invite"==this.option.type&&(location.href=decodeURIComponent(this.option.redirectUrl))}}};t.default=o},"8a05":function(n,t,e){"use strict";var o=e("2be1"),i=e.n(o);i.a},"982e":function(n,t,e){"use strict";var o,i=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{staticClass:"app-content"})},r=[];e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return o}))},b171:function(n,t,e){"use strict";e.r(t);var o=e("982e"),i=e("1d95");for(var r in i)"default"!==r&&function(n){e.d(t,n,(function(){return i[n]}))}(r);e("8a05");var a,c=e("f0c5"),u=Object(c["a"])(i["default"],o["b"],o["c"],!1,null,"2eafd1ca",null,!1,o["a"],a);t["default"]=u.exports}}]);

mobile/static/js/common-webview.30c0e4eb.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["common-webview"],{"2e95":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;t("2f62");var r={data:function(){return{src:"",roleName:""}},computed:{},onLoad:function(n){},onShareAppMessage:function(n){var e={};return e={title:this.userInfo.nick_name+this.userInfo.role_name,path:"/pages/design/designCompany/indexNew?".concat(params)},e}};e.default=r},5535:function(n,e,t){"use strict";t.r(e);var r=t("2e95"),u=t.n(r);for(var a in r)"default"!==a&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"737d":function(n,e,t){"use strict";var r,u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("v-uni-web-view",{attrs:{src:n.src}})},a=[];t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return r}))},e76d:function(n,e,t){"use strict";t.r(e);var r=t("737d"),u=t("5535");for(var a in u)"default"!==a&&function(n){t.d(e,n,(function(){return u[n]}))}(a);var o,c=t("f0c5"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"67f405be",null,!1,r["a"],o);e["default"]=i.exports}}]);