Skip to content

I
integral-mall
Commit 6ccfd954 by damodmg
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !20
parents 4a1bc856 42671980
Showing with 28 additions and 52 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=./static/css/app.942c6f5abeccc49b8da1e0d54a1a0877.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-image.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.264a1f7323512c77f7a5.js></script><script type=text/javascript src=./static/js/app.a8289f49abbbf73d482b.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=./static/css/app.942c6f5abeccc49b8da1e0d54a1a0877.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.07.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-image.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.264a1f7323512c77f7a5.js></script><script type=text/javascript src=./static/js/app.2568d2e354a9f2297d39.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2568d2e354a9f2297d39.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.a8289f49abbbf73d482b.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -21,9 +21,9 @@
<script src='//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js'></script>
<script src='//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js'></script>
<!-- 组件引用cdn -->
<script src='//web-1251519181.file.myqcloud.com/components/header.2.0.06.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/header.2.0.07.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/export-excel.2.0.01.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/upload-image.2.0.00.js'></script>
......
src/components/layout/index.vue
......@@ -18,7 +18,6 @@
<router-view></router-view>
</div>
</div>
<vue-gic-footer></vue-gic-footer>
</div>
</div>
......@@ -54,32 +53,9 @@ export default {
return this.$store.state.marketing.breadcrumb;
}
},
// watch:{
// asideShow(val) {
// this.collapseFlag = this.asideShow;
// }
// },
methods: {
// // 处理路由跳转
// toRouterView(val) {
// var that = this;
// // 模拟检查数据
// // //有两个参数
// //{
// // name:,
// // path:
// //}
// that.$router.push({
// path: val
// });
// },
// 处理路由跳转
toRouterView(val) {
//有两个参数
//{
// name:,
// path:
//}
this.$router.push({
path: val.path
});
......
src/views/mall/common/member-info.vue
......@@ -56,9 +56,7 @@
</div>
<span slot="reference">
<a :href="'/member/#/wechatmemberDetail?memberId=' + row.memberId" target="_blank">
<!-- <img class="vertical-middle table__avatar" :src="filterAvatar(row.photoUrl)" width="60" height="60" alt="" srcset="" /> -->
<img class="vertical-middle table__avatar" v-if="row.photoUrl" :src="row.photoUrl" width="60" height="60" alt="" srcset="" />
<img class="vertical-middle table__avatar" v-else src="../../../../static/img/head_default.png" width="60" height="60" alt="" srcset="" />
<img class="vertical-middle table__avatar" :src="filterAvatar(row.photoUrl)" width="60" height="60" alt="" srcset="" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{ row.memberName || '--' }}</p>
<p class="table-name--ellipsis fz13">{{ row.cardNum || '--' }}</p>
......@@ -67,7 +65,8 @@
</span>
</el-popover>
</template>
<!-- <img class="vertical-middle table__avatar" v-if="row.photoUrl" :src="row.photoUrl" width="60" height="60" alt="" srcset="" />
<img class="vertical-middle table__avatar" v-else src="../../../../static/img/head_default.png" width="60" height="60" alt="" srcset="" /> -->
<script>
import { getMemberInfo } from '@/service/api/mallApi.js';
......@@ -84,26 +83,27 @@ export default {
data() {
return {
singleInfo: {},
// defaultAvatar: require('../../../assets/img/head_default.png'),
// gzhiconcanclegray: require('../../../assets/img/status@gzhcanclegray.png'), //取消关注微信公众号
// gzhicon: require('../../../assets/img/status@gzh.png'), //已关注微信公众号
// gzhicongray: require('../../../assets/img/status@gzhgray.png'), //未关注微信公众号
// xcxicongray: require('../../../assets/img/status@xcxgray.png'), //未使用小程序
// xcxicon: require('../../../assets/img/status@xcx.png'), //已使用小程序
// bphone: require('../../../assets/img/phone_icon.png'), //绑定手机
// ubphone: require('../../../assets/img/phone_icon_gray.png'), //未绑定手机
// autoIcon: require('../../../assets/img/member_icon.png'), //已认证
// unAutoIcon: require('../../../assets/img/member_icon_gray.png') //未认证
defaultAvatar: '../../../../static/img/head_default.png',
gzhiconcanclegray: '../../../../static/img/status@gzhcanclegray.png', //取消关注微信公众号
gzhicon: '../../../../static/img/status@gzh.png', //已关注微信公众号
gzhicongray: '../../../../static/img/status@gzhgray.png', //未关注微信公众号
xcxicongray: '../../../../static/img/status@xcxgray.png', //未使用小程序
xcxicon: '../../../../static/img/status@xcx.png', //已使用小程序
bphone: '../../../../static/img/phone_icon.png', //绑定手机
ubphone: '../../../../static/img/phone_icon_gray.png', //未绑定手机
autoIcon: '../../../../static/img/member_icon.png', //已认证
unAutoIcon: '../../../../static/img/member_icon_gray.png' //未认证
/*eslint-disable*/
defaultAvatar: require('../../../assets/img/head_default.png'),
gzhiconcanclegray: require('../../../assets/img/status@gzhcanclegray.png'), //取消关注微信公众号
gzhicon: require('../../../assets/img/status@gzh.png'), //已关注微信公众号
gzhicongray: require('../../../assets/img/status@gzhgray.png'), //未关注微信公众号
xcxicongray: require('../../../assets/img/status@xcxgray.png'), //未使用小程序
xcxicon: require('../../../assets/img/status@xcx.png'), //已使用小程序
bphone: require('../../../assets/img/phone_icon.png'), //绑定手机
ubphone: require('../../../assets/img/phone_icon_gray.png'), //未绑定手机
autoIcon: require('../../../assets/img/member_icon.png'), //已认证
unAutoIcon: require('../../../assets/img/member_icon_gray.png') //未认证
// defaultAvatar: '../../../../static/img/head_default.png',
// gzhiconcanclegray: '../../../../static/img/status@gzhcanclegray.png', //取消关注微信公众号
// gzhicon: '../../../../static/img/status@gzh.png', //已关注微信公众号
// gzhicongray: '../../../../static/img/status@gzhgray.png', //未关注微信公众号
// xcxicongray: '../../../../static/img/status@xcxgray.png', //未使用小程序
// xcxicon: '../../../../static/img/status@xcx.png', //已使用小程序
// bphone: '../../../../static/img/phone_icon.png', //绑定手机
// ubphone: '../../../../static/img/phone_icon_gray.png', //未绑定手机
// autoIcon: '../../../../static/img/member_icon.png', //已认证
// unAutoIcon: '../../../../static/img/member_icon_gray.png' //未认证
};
},
methods: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment