Skip to content

I
integral-mall
Commit 3acc741f by 萱草
Options

update: 杂项需求

parent 713a2bfc
Showing with 66 additions and 13 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.531d886a23a13ce370e73e3d82de3f11.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.9d68253c9a038dd54e36.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=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.0d6f3360c7f732fd33634bda5554e0d7.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.547f2323d83b9f6ce650.js></script></body></html>
\ No newline at end of file
dist/static/js/app.547f2323d83b9f6ce650.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.9d68253c9a038dd54e36.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/eqCode.vue
......@@ -12,6 +12,9 @@
<p style="font-weight: 600;margin-bottom:15px">小程序二维码</p>
<img :src="modalData.imgUrl" class="wechat-img" style="width:140px;height:140px;" />
</div>
<div class="wechat-force" style="margin-bottom:0">
<p>温馨提示：通过二维码兑换，仅校验会员适用等级</p>
</div>
<div class="wechat-force">
<el-button type="primary" @click="force">重新生成</el-button>
</div>
......
src/views/goods/coupon/coupon.vue
......@@ -60,7 +60,9 @@
<img v-if="scope.row.cardType === 0 && !scope.row.mainImageUrl" src="../../../../static/img/quan01.png" alt />
<img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<el-tooltip :content="'优惠券id：' + scope.row.integralMallProId" effect="light" placement="top-start">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
</el-tooltip>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
<p class="category-ellipsis">{{ scope.row.remarks }}</p>
</div>
......
src/views/goods/coupon/info.vue
......@@ -49,6 +49,13 @@
</dm-delete>
</template>
</el-table-column>
<el-table-column label="卡券状态">
<template slot-scope="scope">
<div style="color:#f5222d">
{{ scope.row.status === 0 ? '已删除' : scope.row.status === 1 ? '正常' : scope.row.status === 2 ? '已过期' : '' }}
</div>
</template>
</el-table-column>
</el-table>
<el-form-item label="券包名称" v-if="cardList.length > 1" prop="proName">
<el-input v-model.trim="couponForm.proName" class="w-600" type="text" placeholder="请输入券包名称" @input="value => goodsLimit(value)">
......@@ -171,11 +178,17 @@
</el-form-item> -->
<span style="display:none">{{ refash }}</span>
<el-form-item label="展现门店" required style="position:relative" v-if="useNewStoreWidget === 0">
<vue-gic-store-linkage v-if="(mallProId && creatorId) || mallProId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<el-tooltip class="tips-content" popper-class="store-tips" effect="light" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-linkage style="margin-left:10px" v-if="(mallProId && creatorId) || mallProId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span>
</el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" />
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1" class="store-card">
<el-tooltip class="tips-content" popper-class="store-tips" effect="light" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-card style="margin-left:10px" class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" />
</el-form-item>
<el-form-item label="限兑">
<el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
......@@ -1241,6 +1254,13 @@ export default {
width: 500px;
margin: 22px 0 22px 133px;
}
.store-card {
position: relative;
}
.tips-content {
position: absolute;
left: -10px;
}
</style>
<style>
.select-shop__right {
......@@ -1285,4 +1305,9 @@ export default {
background: #f2f3f4;
padding: 0 0 20px 124px;
} */
.store-tips {
width: 200px;
position: absolute;
left: -10px;
}
</style>
src/views/goods/gift/gift.vue
......@@ -64,10 +64,13 @@
<div class="gift-info">
<img :src="scope.row.mainImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis intergral-edit">
{{ scope.row.proName }}
<i class="el-icon-edit" @click="editProName(scope.row)"></i>
</p>
<!-- integralMallProId -->
<el-tooltip :content="'礼品id：' + scope.row.integralMallProId" effect="light" placement="top-start">
<p class="pro-ellipsis intergral-edit">
{{ scope.row.proName }}
<i class="el-icon-edit" @click="editProName(scope.row)"></i>
</p>
</el-tooltip>
<p class="category-ellipsis">编码：{{ scope.row.proCode }}</p>
</div>
</div>
......
src/views/goods/gift/info.vue
......@@ -138,11 +138,17 @@
</el-form-item>-->
<span style="display:none">{{ refash }}</span>
<el-form-item label="展现门店" required style="position:relative" v-if="useNewStoreWidget === 0">
<vue-gic-store-linkage v-if="(giftId && creatorId) || giftId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<el-tooltip class="tips-content" effect="light" popper-class="store-tips" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-linkage style="margin-left:10px" v-if="(giftId && creatorId) || giftId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span>
</el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes />
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1" class="store-card">
<el-tooltip class="tips-content" effect="light" popper-class="store-tips" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-card style="margin-left:10px" class="pt10" ref="storeCard" :uuid.sync="uuid" scenes />
</el-form-item>
<el-form-item label="限兑">
<el-checkbox v-model="giftForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
......@@ -2085,6 +2091,13 @@ export default {
position: absolute;
left: -25px;
}
.store-card {
position: relative;
}
.tips-content {
position: absolute;
left: -10px;
}
</style>
<style>
.upload-list-box .el-upload--picture-card {
......@@ -2118,4 +2131,9 @@ export default {
background: #f2f3f4;
padding: 0 0 20px 124px;
} */
.store-tips {
width: 200px;
position: absolute;
left: -10px;
}
</style>
src/views/order/couponExchange.vue
......@@ -90,6 +90,7 @@
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-"></i> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">兑换渠道：{{ orderInfo.source === 0 || orderInfo.source === 1 ? '二维码扫描' : orderInfo.source === 3 ? '常规兑换' : orderInfo.source === 2 ? '其他' : '' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.merchantNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : '--' }}</el-dropdown-item>
......
src/views/order/giftExchange.vue
......@@ -89,6 +89,7 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">兑换渠道：{{ orderInfo.source === 0 || orderInfo.source === 1 ? '二维码扫描' : orderInfo.source === 3 ? '常规兑换' : orderInfo.source === 2 ? '其他' : '' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.merchantNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : '--' }}</el-dropdown-item>
......
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