yanghao
/
yunshengtai-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

yshop1.9.6,H5(公众号)端新增商品海报功能,管理后台配置新增排序与可隐藏选项，修复小程序bug等

master
hupeng 5 years ago
parent
a3ede4ccec
commit
512a502abb
13 changed files with 156 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      src/views/dashboard/YshopInfo.vue
  2. 11
      src/views/shop/set/form.vue
  3. 13
      src/views/shop/set/hot.vue
  4. 11
      src/views/shop/set/hotform.vue
  5. 13
      src/views/shop/set/index.vue
  6. 13
      src/views/shop/set/menu.vue
  7. 11
      src/views/shop/set/menuform.vue
  8. 13
      src/views/shop/set/roll.vue
  9. 11
      src/views/shop/set/rollform.vue
  10. 13
      src/views/shop/set/sign.vue
  11. 11
      src/views/shop/set/signform.vue
  12. 13
      src/views/shop/set/usermenu.vue
  13. 11
      src/views/shop/set/usermenuform.vue

48
src/views/dashboard/YshopInfo.vue
Unescape View File

@ -58,7 +58,7 @@
</div>
<div class="text item">
1、VIP为终身制包括JAVA端+H5公众号端，后期免费升级迭代及其技术支持。！<br />
2、价格：vip会员价228元(JAVA+H5+公众号版)，后续的系统升级vip价格会有相应的调整的，所以早上车更优惠哦！<br />
2、价格：vip会员价248元(JAVA+H5+公众号版)，后续的系统升级vip价格会有相应的调整的，所以早上车更优惠哦！<br />
3、VIP购买淘宝地址：https://item.taobao.com/item.htm?id=607532386325<br />
4、加入vip群：931426444,请输入你的淘宝订单编号，即可入群<br />
5、群里面获取私服git<br />
@ -83,64 +83,70 @@
<span style="font-weight: bolder">更新日志</span>
</div>
<div class="text item">
<span style="font-weight: bolder">（2020-02-06）yshop1.9.4版本 发布更新如下：</span>
<span style="font-weight: bolder">（2020-02-11）yshop1.9.6版本 发布更新如下：</span>
</div>
<div class="text item">
1.后台砍价列表显示调整
1、H5(公众号)端新增商品海报功能
</div>
<div class="text item">
2.后台会员新增用户来源
2、管理后台配置新增排序与可隐藏选项，同时移动端接口相应更新
</div>
<div class="text item">
3.小程序新增普通二维码功能
3、去除小程序首页新闻轮播图标识
</div>
<div class="text item">
4.修复小程序砍价海报问题
4、修复小程序图片路径写死了问题(只能修改vue中的url,css中的需要自行替换)#I18KRS
</div>
<div class="text item">
5.修复小程序首页滚动新闻不显示的问题
5、修改小程序登录成功后，跳到转个人中心问题 #I194VT
</div>
<div class="text item">
6.修复小程序个人中心积分列表问题
6、修复小程序申请退款页面图文#I197FG
</div>
<div class="text item">
7.修复小程序购物车删除问题#I19176
7、修复砍价不能下单问题
</div>
<div class="text item">
<span style="font-weight: bolder">（2020-02-07）yshop1.9.5版本 发布更新如下：</span>
</div>
<div class="text item">
<span style="font-weight: bolder">（2020-02-04）yshop1.9.3版本 发布更新如下：</span>
1.H5(公众号)新增手机号绑定#I18IVP
</div>
<div class="text item">
1.修复购物车列表问题
2.小程序新增手机号绑定接口(小程序待对接)
</div>
<div class="text item">
2.修复后台图文管理时间显示问题
3.H5(公众号)端新增我的账户信息管理(头像等信息修改)
</div>
<div class="text item">
3.修复砍价增加商品问题
4.修复H5注册NULL问题
</div>
<div class="text item">
4.修复个人中心优惠券数量不显示问题
5.修复小程序未付款订单支付问题#I18ZV5
</div>
<div class="text item">
5.模板消息推送增加小程序判断(后期会增加小程序消息)
<span style="font-weight: bolder">（2020-02-06）yshop1.9.4版本 发布更新如下：</span>
</div>
<div class="text item">
<span style="font-weight: bolder">（2020-01-31）yshop1.9.2版本 发布更新如下：</span>
1.后台砍价列表显示调整
</div>
<div class="text item">
2.后台会员新增用户来源
</div>
<div class="text item">
1.修复素材库无法分页的问题#I18KJN
3.小程序新增普通二维码功能
</div>
<div class="text item">
2.修复订单退款问题#I18GG6
4.修复小程序砍价海报问题
</div>
<div class="text item">
3.修复分类问题#I17UEI
5.修复小程序首页滚动新闻不显示的问题
</div>
<div class="text item">
4.修复后台添加角色的问题#I18NCW
6.修复小程序个人中心积分列表问题
</div>
<div class="text item">
5.修复H5登陆提示信息不一致#I18GZW
7.修复小程序购物车删除问题#I19176
</div>
</el-card>
</div>

11
src/views/shop/set/form.vue
Unescape View File

@ -13,6 +13,13 @@
<el-form-item label="图片(750*375)">
<MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
</el-form-item>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 300px;" />
</el-form-item>
<el-form-item label="是否显示">
<el-radio v-model="form.status" :label="1">是</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<!--<el-input v-model="form.groupName" />-->
@ -45,8 +52,8 @@ export default {
wxapp_url: '',
pic: '',
imageArr: [],
sort: '',
status: ''
sort: 0,
status: 1
},
rules: {
}

13
src/views/shop/set/hot.vue
Unescape View File

@ -20,6 +20,15 @@
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="ID" />
<el-table-column prop="map.title" label="标签" />
<el-table-column prop="sort" label="排序" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@ -108,7 +117,9 @@ export default {
title: data.map.title,
info: data.map.info,
url: data.map.url,
pic: data.map.pic
pic: data.map.pic,
sort: data.sort,
status: data.status
}
_this.dialog = true
}

11
src/views/shop/set/hotform.vue
Unescape View File

@ -4,6 +4,13 @@
<el-form-item label="标签">
<el-input v-model="form.title" style="width: 370px;" />
</el-form-item>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 300px;" />
</el-form-item>
<el-form-item label="是否显示">
<el-radio v-model="form.status" :label="1">是</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<!--<el-input v-model="form.groupName" />-->
@ -30,7 +37,9 @@ export default {
form: {
id: '',
groupName: 'routine_hot_search',
title: ''
title: '',
sort: 0,
status: 1
},
rules: {
}

13
src/views/shop/set/index.vue
Unescape View File

@ -27,6 +27,15 @@
<a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@ -116,7 +125,9 @@ export default {
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic,
imageArr: data.map.pic ? data.map.pic.split(',') : []
imageArr: data.map.pic ? data.map.pic.split(',') : [],
sort: data.sort,
status: data.status
}
_this.dialog = true
}

13
src/views/shop/set/menu.vue
Unescape View File

@ -27,6 +27,15 @@
<a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@ -116,7 +125,9 @@ export default {
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic,
imageArr: data.map.pic ? data.map.pic.split(',') : []
imageArr: data.map.pic ? data.map.pic.split(',') : [],
sort: data.sort,
status: data.status
}
_this.dialog = true
}

11
src/views/shop/set/menuform.vue
Unescape View File

@ -13,6 +13,13 @@
<el-form-item label="分类图标(90*90)">
<MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
</el-form-item>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 300px;" />
</el-form-item>
<el-form-item label="是否显示">
<el-radio v-model="form.status" :label="1">是</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<!--<el-input v-model="form.groupName" />-->
@ -45,8 +52,8 @@ export default {
wxapp_url: '',
pic: '',
imageArr: [],
sort: '',
status: ''
sort: 0,
status: 1
},
rules: {
}

13
src/views/shop/set/roll.vue
Unescape View File

@ -22,6 +22,15 @@
<el-table-column prop="map.info" label="滚动文字" />
<el-table-column prop="map.url" label="链接url" />
<el-table-column prop="map.wxapp_url" label="小程序跳转page" />
<el-table-column prop="sort" label="排序" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@ -111,7 +120,9 @@ export default {
info: data.map.info,
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic
pic: data.map.pic,
sort: data.sort,
status: data.status
}
_this.dialog = true
}

11
src/views/shop/set/rollform.vue
Unescape View File

@ -10,6 +10,13 @@
<el-form-item label="小程序跳转page">
<el-input v-model="form.wxapp_url" style="width: 300px;" />
</el-form-item>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 300px;" />
</el-form-item>
<el-form-item label="是否显示">
<el-radio v-model="form.status" :label="1">是</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<!--<el-input v-model="form.groupName" />-->
@ -38,7 +45,9 @@ export default {
groupName: 'routine_home_roll_news',
info: '',
wxapp_url: '',
url: ''
url: '',
sort: 0,
status: 1
},
rules: {
}

13
src/views/shop/set/sign.vue
Unescape View File

@ -21,6 +21,15 @@
<el-table-column prop="id" label="ID" />
<el-table-column prop="map.day" label="第几天" />
<el-table-column prop="map.sign_num" label="获取积分" />
<el-table-column prop="sort" label="排序" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@ -107,7 +116,9 @@ export default {
id: data.id,
groupName: data.groupName,
day: data.map.day,
sign_num: data.map.sign_num
sign_num: data.map.sign_num,
sort: data.sort,
status: data.status
}
_this.dialog = true
}

11
src/views/shop/set/signform.vue
Unescape View File

@ -7,6 +7,13 @@
<el-form-item label="获取积分">
<el-input v-model="form.sign_num" style="width: 300px;" />
</el-form-item>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 300px;" />
</el-form-item>
<el-form-item label="是否显示">
<el-radio v-model="form.status" :label="1">是</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<!--<el-input v-model="form.groupName" />-->
@ -34,7 +41,9 @@ export default {
id: '',
groupName: 'sign_day_num',
day: 1,
sign_num: 0
sign_num: 0,
sort: 0,
status: 1
},
rules: {
}

13
src/views/shop/set/usermenu.vue
Unescape View File

@ -29,6 +29,15 @@
</a>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@ -118,7 +127,9 @@ export default {
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic,
imageArr: data.map.pic ? data.map.pic.split(',') : []
imageArr: data.map.pic ? data.map.pic.split(',') : [],
sort: data.sort,
status: data.status
}
_this.dialog = true
}

11
src/views/shop/set/usermenuform.vue
Unescape View File

@ -13,6 +13,13 @@
<el-form-item label="图标(52*52)">
<MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
</el-form-item>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 300px;" />
</el-form-item>
<el-form-item label="是否显示">
<el-radio v-model="form.status" :label="1">是</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<!--<el-input v-model="form.groupName" />-->
@ -108,8 +115,8 @@ export default {
imageArr: [],
value: '',
addTime: '',
sort: '',
status: ''
sort: 0,
status: 1
}
}
}

Write Preview
Loading…
Cancel
Save