Home Explore Help
Register Sign In
zhh
/
front-end
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

lalala 6 years ago
parent
77bdf5eb55 5896a7be8f
commit
c9f79894ce
22 changed files with 19 additions and 12 deletions
Split View Show Diff Stats
  1. 9 7
      admin-update/src/views/member/list.vue
  2. 7 2
      admin-update/src/views/shop/list.vue
  3. 0 0
      huadian/css/chunk-29984a10.5c4b3929.css
  4. 1 0
      huadian/css/chunk-376d432b.eb980a25.css
  5. 0 1
      huadian/css/chunk-49ea53ac.508ebd8a.css
  6. 0 0
      huadian/css/chunk-4ec5d1b2.0715cb1f.css
  7. 0 0
      huadian/css/chunk-54a3120a.3b88c1f3.css
  8. 0 0
      huadian/css/chunk-ce00b4fe.a9a9087e.css
  9. 1 1
      huadian/index.html
  10. 0 0
      huadian/js/app.3b8ca9d8.js
  11. 0 0
      huadian/js/app.84021f58.js
  12. 0 0
      huadian/js/chunk-014c23f4.6b3e3212.js
  13. 0 0
      huadian/js/chunk-0cef3fd6.f7e3753e.js
  14. 0 1
      huadian/js/chunk-1ce2e68e.c4e0146e.js
  15. 1 0
      huadian/js/chunk-1ce2e68e.d2813623.js
  16. 0 0
      huadian/js/chunk-29984a10.153e4020.js
  17. 0 0
      huadian/js/chunk-376d432b.078f32d2.js
  18. 0 0
      huadian/js/chunk-49ea53ac.fe76487a.js
  19. 0 0
      huadian/js/chunk-4ec5d1b2.17a7550c.js
  20. 0 0
      huadian/js/chunk-54a3120a.d10298ce.js
  21. 0 0
      huadian/js/chunk-c67086f8.0b9a4512.js
  22. 0 0
      huadian/js/chunk-ce00b4fe.157a871e.js

+ 9 - 7
admin-update/src/views/member/list.vue
View File 

@@ -19,9 +19,8 @@
 
 
 			<template #table-column-avatarUrl="{scope}">
 
 				<cl-avatar
 
-					shape="square"
 
-					:size="40"
 
-					:src="scope.row.avatarUrl | default_avatar"
 
+					:size="30"
 
+					:src="scope.row.smallAvatarUrl | default_avatar"
 
 					:style="{ margin: 'auto' }"
 
 				></cl-avatar>
 
 			</template>
 
@@ -61,10 +60,13 @@
 
 			</template>
 
 
 			<template #table-column-actPrice="{scope}">
 
-				<el-tag size="mini" v-if="scope.row.isMember == 1">{{
 
-					scope.row.memberLevel
 
-				}}</el-tag>
 
-				<el-tag size="mini" type="warning" v-else>普</el-tag>
 
+				<el-tag size="mini" v-if="scope.row.userAsset.member == -1" type="warning"
 
+					>普</el-tag
 
+				>
 
+				<el-tag size="mini" v-else-if="scope.row.userAsset.member == 0">vip</el-tag>
 
+				<el-tag size="mini" v-else-if="scope.row.userAsset.member > 0"
 
+					>vip{{ scope.row.userAsset.member }}</el-tag
 
+				>
 
 			</template>
 
 
 			<!-- 详情 -->

+ 7 - 2
admin-update/src/views/shop/list.vue
View File 

@@ -4,7 +4,7 @@
 
 			<template #table-column-gatheringCode="{scope}">
 
 				<el-link
 
 					type="primary"
 
-					v-if="scope.row.wxPayInit == '1'"
 
+					v-if="shopInfo.extend.wxPayInit == '1'"
 
 					@click="download('gatheringCode', scope.row.id)"
 
 					>下载</el-link
 
 				>
 
@@ -13,7 +13,7 @@
 
 			<template #table-column-applyMemberCode="{scope}">
 
 				<el-link
 
 					type="primary"
 
-					v-if="scope.row.miniAuth == '1'"
 
+					v-if="shopInfo.extend.miniAuth == '1'"
 
 					@click="download('applyMemberCode', scope.row.id)"
 
 					>下载</el-link
 
 				>
 
@@ -29,6 +29,7 @@
 
 
 <script>
 
 import { imgHostUrl } from '@/config/env';
 
+import { mapGetters } from 'vuex';
 
 
 export default {
 
 	data() {
 
@@ -37,6 +38,10 @@ export default {
 
 		};
 
 	},
 
 
+	computed: {
 
+		...mapGetters(['shopInfo'])
 
+	},
 
+
 
 	methods: {
 
 		onLoad({ ctx, app }) {
 
 			this.crud = app;

File diff suppressed because it is too large
+ 0 - 0
huadian/css/chunk-29984a10.5c4b3929.css


+ 1 - 0
huadian/css/chunk-376d432b.eb980a25.css
View File 

@@ -0,0 +1 @@
 
+.el-dialog .el-dialog__header[data-v-0853cc3a]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-0853cc3a]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-0853cc3a]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-0853cc3a]{font-size:18px}.el-dialog .el-dialog__body[data-v-0853cc3a]{padding:20px}.el-dialog .el-dialog__footer[data-v-0853cc3a]{padding-bottom:15px}.shop-list[data-v-0853cc3a]{height:100%}

+ 0 - 1
huadian/css/chunk-49ea53ac.508ebd8a.css
View File 

@@ -1 +0,0 @@
 
-.el-dialog .el-dialog__header[data-v-0211066a]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-0211066a]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-0211066a]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-0211066a]{font-size:18px}.el-dialog .el-dialog__body[data-v-0211066a]{padding:20px}.el-dialog .el-dialog__footer[data-v-0211066a]{padding-bottom:15px}.shop-list[data-v-0211066a]{height:100%}

File diff suppressed because it is too large
+ 0 - 0
huadian/css/chunk-4ec5d1b2.0715cb1f.css


File diff suppressed because it is too large
+ 0 - 0
huadian/css/chunk-54a3120a.3b88c1f3.css


File diff suppressed because it is too large
+ 0 - 0
huadian/css/chunk-ce00b4fe.a9a9087e.css


+ 1 - 1
huadian/index.html
View File 

@@ -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.84021f58.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.84021f58.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.3b8ca9d8.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.3b8ca9d8.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
huadian/js/app.3b8ca9d8.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/app.84021f58.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-014c23f4.6b3e3212.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-0cef3fd6.f7e3753e.js


+ 0 - 1
huadian/js/chunk-1ce2e68e.c4e0146e.js
View File 

@@ -1 +0,0 @@
 
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1ce2e68e"],{"1d60":function(t,e,n){"use strict";n.r(e);var o=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"app-content summary-wrap"},[n("el-form",{ref:"form",staticClass:"demo-form",attrs:{model:t.form,rules:t.rules,"label-width":"100px"}},[n("el-form-item",{attrs:{label:"",prop:"desc"}},[n("cl-editor-quill",{on:{load:t.editor},model:{value:t.form.desc,callback:function(e){t.$set(t.form,"desc",e)},expression:"form.desc"}})],1),n("el-form-item",[n("div",{staticClass:"app-color-3"},[n("i",{staticClass:"el-icon-warning",staticStyle:{"margin-right":"4px"}}),n("span",[t._v("说明：商品介绍的后半部分，将会显示上面的内容。")])])]),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.submitForm("form")}}},[t._v("保存")])],1)],1)],1)},s=[],i={name:"goods-summary",data:function(){return{form:{desc:""},rules:{},data:""}},mounted:function(){this.init()},methods:{init:function(){this._getData()},_getData:function(){var t=this;this.$service.single.getGoodsIntro().then((function(e){t.form.desc=e.introduce}))},_updateFn:function(){var t=this;this.$service.single.editGoodsIntro({introduce:this.form.desc}).then((function(e){t.$message.success("保存成功！")}))},editor:function(){},submitForm:function(t){var e=this;this.$refs[t].validate((function(t){if(!t)return console.log("error submit!!"),!1;console.log(e.form),e._updateFn()}))},resetForm:function(t){this.$refs[t].resetFields()}}},r=i,a=(n("21db"),n("2877")),c=Object(a["a"])(r,o,s,!1,null,null,null);e["default"]=c.exports},"21db":function(t,e,n){"use strict";var o=n("53ea"),s=n.n(o);s.a},"53ea":function(t,e,n){}}]);

+ 1 - 0
huadian/js/chunk-1ce2e68e.d2813623.js
View File 

@@ -0,0 +1 @@
 
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1ce2e68e"],{"1d60":function(t,e,n){"use strict";n.r(e);var o=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"app-content summary-wrap"},[n("el-form",{ref:"form",staticClass:"demo-form",attrs:{model:t.form,rules:t.rules,"label-width":"100px"}},[n("el-form-item",{attrs:{label:"",prop:"desc"}},[n("cl-editor-quill",{on:{load:t.editor},model:{value:t.form.desc,callback:function(e){t.$set(t.form,"desc",e)},expression:"form.desc"}})],1),n("el-form-item",[n("div",{staticClass:"app-color-3"},[n("i",{staticClass:"el-icon-warning",staticStyle:{"margin-right":"4px"}}),n("span",[t._v("商品详情的后半部分内容，可以填写一些养护知识和友情提示等。")])])]),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.submitForm("form")}}},[t._v("保存")])],1)],1)],1)},s=[],i={name:"goods-summary",data:function(){return{form:{desc:""},rules:{},data:""}},mounted:function(){this.init()},methods:{init:function(){this._getData()},_getData:function(){var t=this;this.$service.single.getGoodsIntro().then((function(e){t.form.desc=e.introduce}))},_updateFn:function(){var t=this;this.$service.single.editGoodsIntro({introduce:this.form.desc}).then((function(e){t.$message.success("保存成功！")}))},editor:function(){},submitForm:function(t){var e=this;this.$refs[t].validate((function(t){if(!t)return console.log("error submit!!"),!1;console.log(e.form),e._updateFn()}))},resetForm:function(t){this.$refs[t].resetFields()}}},r=i,a=(n("21db"),n("2877")),c=Object(a["a"])(r,o,s,!1,null,null,null);e["default"]=c.exports},"21db":function(t,e,n){"use strict";var o=n("53ea"),s=n.n(o);s.a},"53ea":function(t,e,n){}}]);

File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-29984a10.153e4020.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-376d432b.078f32d2.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-49ea53ac.fe76487a.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-4ec5d1b2.17a7550c.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-54a3120a.d10298ce.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-c67086f8.0b9a4512.js


File diff suppressed because it is too large
+ 0 - 0
huadian/js/chunk-ce00b4fe.157a871e.js


Some files were not shown because too many files changed in this diff