abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mactj 2021-01-20 17:25:41 +08:00
parent a423661c5e
commit b38b66a217
18 changed files with 172 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mini-app/TodoList.md
View File

@ -1,17 +1,12 @@
注X:完成 注X:完成
域名[] 域名[x]
注册[X] 注册[X]
登录[X] 登录[X]
首页装修[x] 首页装修[x]
资讯/酒庄信息管理[x] 资讯/酒庄信息管理[x]
采集酒庄介绍(图标/图片)[0/12] 采集酒庄介绍(图标/图片)[6/12]
采集产品介绍(图标/图片)[0/12] 采集产品介绍(图标/图片)[6/12]
产品追溯[]
新品推荐(就产品列表)[x]
视频直播[]
商品列表[x] 商品列表[x]
商品管理[x] 商品管理[x]
商品详情[x] 商品详情[x]
@ -20,18 +15,20 @@
订单管理[x] 订单管理[x]
生成支付[x] 生成支付[x]
支付回调[x] 支付回调[x]
紫环会[x]
发货单excel输出[x]
我的[x]
******---------------******
紫环会[] ----这是啥 公众号专题链接列表[]
产品追溯[]
视频直播[]
新品推荐[]
用户协议/隐私政策[]
小程序图标[]
退款申请[] 退款申请[]
物流追踪[] 物流追踪[]
发货单excel输出[x] 发货单excel导入[]
发货单excel倒入[x]
小程序图标[]
我的页面图标/图片[]

7
mini-app/project.config.json
View File

@ -139,6 +139,13 @@
"id": -1, "id": -1,
"name": "订单列表", "name": "订单列表",
"pathName": "pages/mall/order/order-list", "pathName": "pages/mall/order/order-list",
"query": "",
"scene": null
},
{
"id": -1,
"name": "\bwebview",
"pathName": "pages/webView/web",
"scene": null "scene": null
} }
] ]

3
mini-app/src/app.wpy
View File

@ -110,7 +110,8 @@ pages: [
'pages/mall/order/order-check', 'pages/mall/order/order-check',
'pages/mall/shopping-car/shopping-car-list', 'pages/mall/shopping-car/shopping-car-list',
'pages/winery/winery-detail', 'pages/winery/winery-detail',
'pages/winery/winery-list' 'pages/winery/winery-list',
'pages/webView/web'
], ],
navigateToMiniProgramAppIdList: [ navigateToMiniProgramAppIdList: [

11
mini-app/src/appManager.js
View File

@ -1,6 +1,7 @@
import store from '@/store' import store from '@/store'
import eventHub from './common/eventHub' import eventHub from './common/eventHub'
import userApis from './apis/userApis' import userApis from './apis/userApis'
import { webViewPage } from './store/constant/nav/pages'
class AppManager { class AppManager {
login(callBack) { login(callBack) {
@ -29,8 +30,6 @@ class AppManager {
self.setRemoteUserInfo(req2.userInfo) self.setRemoteUserInfo(req2.userInfo)
} }
wx.hideLoading() wx.hideLoading()
if (callBack) { if (callBack) {
@ -95,7 +94,7 @@ class AppManager {
} }
if (!path) { if (!path) {
this.showToast('建设中') this.showToast('建设中，敬请期待.')
return return
} }
@ -107,6 +106,12 @@ class AppManager {
showToast(msg) { showToast(msg) {
wx.showToast({ title: msg, icon: 'none' }) wx.showToast({ title: msg, icon: 'none' })
} }
navWeb(url) {
store.state.currWebUrl = url
this.navigateTo(webViewPage)
}
} }
export default new AppManager() export default new AppManager()

2
mini-app/src/components/mall/order/order-detail-list-body.wpy
View File

@ -64,7 +64,7 @@ module.exports.parseOrderStatus = parseOrderStatus;
<div style="width: 100%;"> <div style="width: 100%;">
<van-loading wx:if="{{ !isInit }}" style="margin-top: 20px; display: flex;align-items: center;flex-direction: column;"></van-loading> <van-loading wx:if="{{ !isInit }}" style="margin-top: 20px; display: flex;align-items: center;flex-direction: column;"></van-loading>
<view class="contianer" style="margin: 10px;" wx:else> <view class="" style="margin: 10px;" wx:else>
<div v-if="records.length < 1" style="display: flex;flex-direction: column;align-items: center;width: 100%;"> <div v-if="records.length < 1" style="display: flex;flex-direction: column;align-items: center;width: 100%;">

2
mini-app/src/components/mall/order/order-list-body.wpy
View File

@ -63,7 +63,7 @@ module.exports.parseOrderStatus = parseOrderStatus;
<van-loading wx:if="{{ !isInit }}" <van-loading wx:if="{{ !isInit }}"
style="margin-top: 20px; display: flex;align-items: center;flex-direction: column;"></van-loading> style="margin-top: 20px; display: flex;align-items: center;flex-direction: column;"></van-loading>
<view class="contianer" style="margin: 10px;" wx:else> <view class="" style="margin: 10px;" wx:else>
<div v-if="records.length < 1" style="display: flex;flex-direction: column;align-items: center;width: 100%;"> <div v-if="records.length < 1" style="display: flex;flex-direction: column;align-items: center;width: 100%;">

96
mini-app/src/components/mall/tab/mall-bbs.wpy
View File

@ -4,63 +4,68 @@
width: 100%; width: 100%;
height: 536rpx; height: 536rpx;
z-index: -10; z-index: -10;
} }
</style> </style>
<template> <template>
<div class="contianer"> <view style="background-color: white;flex-direction: column;display: flex; align-items: center;padding-bottom: 600px;">
<van-image :src="imageDefine.BBS_BG"> <van-image :src="imageDefine.BBS_BG" width="400rpx" height="400rpx" style="margin-top: 100px;" />
<span style="margin-top: 10px;font-size: 26px;color: #940D46;font-weight: bold;">敬请期待</span>
<span style="margin-top: 10px;font-size: 14px;color: #999;">即将上线更多福利，记得关注哦～</span>
<!-- <van-panel v-for="(item,index) in list" :key="index" :title="item.user" desc="三星客户" status=" " use-footer-slot>--> <van-button round type="info" @tap="onButton" style="margin-top: 10px;">先逛逛葡萄酒</van-button>
<!-- <van-row>-->
<!-- <van-col span="8">-->
<!-- <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
<!-- </van-col>-->
<!-- <van-col span="8">span: 8</van-col>-->
<!-- </van-row>-->
<!-- <view style="display: flex;font-size: 14px;">{{item.context}}</view>--> <!-- <van-panel v-for="(item,index) in list" :key="index" :title="item.user" desc="三星客户" status=" " use-footer-slot>-->
<!-- <van-row>-->
<!-- <van-col span="8">-->
<!-- <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
<!-- </van-col>-->
<!-- <van-col span="8">span: 8</van-col>-->
<!-- </van-row>-->
<!-- <van-grid column-num="3" border="{{ false }}">--> <!-- <view style="display: flex;font-size: 14px;">{{item.context}}</view>-->
<!-- <van-grid-item use-slot v-for=" 3 " wx:for-item="index">-->
<!-- <image-->
<!-- style="width: 100%; height: 90px;"-->
<!-- src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg"-->
<!-- />-->
<!-- </van-grid-item>-->
<!-- </van-grid>-->
<!-- <van-divider />--> <!-- <van-grid column-num="3" border="{{ false }}">-->
<!-- <view style="display: flex;font-size: 14px;">--> <!-- <van-grid-item use-slot v-for=" 3 " wx:for-item="index">-->
<!-- <span style="color: cornflowerblue;">用户xxx<span--> <!-- <image-->
<!-- style="color: #333333;">的回复: 内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺</span></span>--> <!-- style="width: 100%; height: 90px;"-->
<!-- src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg"-->
<!-- />-->
<!-- </van-grid-item>-->
<!-- </van-grid>-->
<!-- </view>--> <!-- <van-divider />-->
<!-- <view slot="footer">--> <!-- <view style="display: flex;font-size: 14px;">-->
<!-- <view style="display: flex;justify-content: flex-end;">--> <!-- <span style="color: cornflowerblue;">用户xxx<span-->
<!-- <van-button v-if="true" size="small">删除</van-button>--> <!-- style="color: #333333;">的回复: 内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺</span></span>-->
<!-- <van-button v-if="true" size="small" type="danger" style="margin-left: 10px;">编辑</van-button>-->
<!-- <van-button size="small" type="danger" style="margin-left: 10px;" @tap="onReply(item)">回复</van-button>--> <!-- </view>-->
<!-- </view>--> <!-- <view slot="footer">-->
<!-- </view>--> <!-- <view style="display: flex;justify-content: flex-end;">-->
<!-- </van-panel>--> <!-- <van-button v-if="true" size="small">删除</van-button>-->
<!-- <van-button v-if="true" size="small" type="danger" style="margin-left: 10px;">编辑</van-button>-->
<!-- <van-button size="small" type="danger" style="margin-left: 10px;" @tap="onReply(item)">回复</van-button>-->
<!-- </view>-->
<!-- </view>-->
<!-- </van-panel>-->
<!-- <van-dialog--> <!-- <van-dialog-->
<!-- use-slot--> <!-- use-slot-->
<!-- title="标题"--> <!-- title="标题"-->
<!-- show="{{ isShowInput }}"--> <!-- show="{{ isShowInput }}"-->
<!-- show-cancel-button--> <!-- show-cancel-button-->
<!-- bind:close="onCloseInput"--> <!-- bind:close="onCloseInput"-->
<!-- bind:confirm="onConfirmInput"--> <!-- bind:confirm="onConfirmInput"-->
<!-- >--> <!-- >-->
<!-- <image src="https://img.yzcdn.cn/1.jpg" />--> <!-- <image src="https://img.yzcdn.cn/1.jpg" />-->
<!-- </van-dialog>--> <!-- </van-dialog>-->
<!-- <div style="margin-top: 100px;" />-->
</view>
<!-- <div style="margin-top: 100px;" />-->
</div>
</template> </template>
<script> <script>
@ -96,6 +101,9 @@ wepy.component({
}, },
onConfirmInput() { onConfirmInput() {
this.isShowInput = false this.isShowInput = false
},
onButton() {
this.$emit('changeTab', 1)
} }
}, },

41
mini-app/src/components/mall/tab/mall-home.wpy
View File

@ -77,7 +77,7 @@
</style> </style>
<template> <template>
<div class="container" > <div class="container">
<image class="header-image" :src="navDefine.HOME_HEADER.image" /> <image class="header-image" :src="navDefine.HOME_HEADER.image" />
<div class="user-banner" /> <div class="user-banner" />
@ -128,7 +128,7 @@
<van-col offset="1" span="11"> <van-col offset="1" span="11">
<div class="menu-desc" @tap="onNavItem(navDefine.HOME_MENU2)"> <div class="menu-desc" @tap="onBuy()">
<div class="fxc"> <div class="fxc">
<span style="font-size: 16px;">购买庄酒</span> <span style="font-size: 16px;">购买庄酒</span>
<span class="menu-desc-text">限量年份套装</span> <span class="menu-desc-text">限量年份套装</span>
@ -193,6 +193,7 @@ import orderApis from '../../../apis/orderApis'
import appManager from '../../../appManager' import appManager from '../../../appManager'
import { navDefine } from '../../../store/constant/navDefine' import { navDefine } from '../../../store/constant/navDefine'
import xiao4rApis from '../../../apis/xiao4rApis' import xiao4rApis from '../../../apis/xiao4rApis'
import { webViewPage } from '../../../store/constant/nav/pages'
wepy.component({ wepy.component({
store, store,
@ -220,39 +221,13 @@ wepy.component({
methods: { methods: {
onBuy() {
this.$emit('changeTab', 1)
},
onShoppingCar() { onShoppingCar() {
appManager.navigateTo(navDefine.SHOPPING_CAR_LIST) appManager.navigateTo(navDefine.SHOPPING_CAR_LIST)
return
// xiao4rApis.test({
//
// channel_bs: '28',
// clientType: 'mini',
// fee: '0.01',
// kh: '29000051611',
// openId: appManager.getOpenid(),
// org_no: '29',
// userId: '2475772'
//
// }).then(r => {
// let payData = r.data.payMsg
// wx.requestPayment({
// appId: payData.appId,
// timeStamp: payData.timeStamp,
// nonceStr: payData.nonceStr,
// package: payData.packageValue,
// signType: payData.signType,
// paySign: payData.paySign,
// success: function(res) {
//
// },
// fail: function(res) {
// }
// })
// })
} }
}, },

4
mini-app/src/components/mall/tab/mall-my.wpy
View File

@ -95,7 +95,7 @@
<van-divider /> <van-divider />
<van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;"> <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
<van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU1" @tap="onNavItem(item)"> <van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU1" @tap="onNavItem(item)">
<van-image width="48rpx" height="40rpx" :src="item.icon" /> <van-image width="48rpx" height="48rpx" :src="item.icon" />
<span style="margin-top: 10px;">{{item.name}} </span> <span style="margin-top: 10px;">{{item.name}} </span>
</van-grid-item> </van-grid-item>
</van-grid> </van-grid>
@ -106,7 +106,7 @@
<van-divider /> <van-divider />
<van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;"> <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
<van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU2" @tap="onNavItem(item)"> <van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU2" @tap="onNavItem(item)">
<van-image width="48rpx" height="40rpx" :src="item.icon" /> <van-image width="48rpx" height="48rpx" :src="item.icon" />
<span style="margin-top: 10px;">{{item.name}} </span> <span style="margin-top: 10px;">{{item.name}} </span>
</van-grid-item> </van-grid-item>
</van-grid> </van-grid>

2
mini-app/src/components/mall/tab/mall-shopping.wpy
View File

@ -11,7 +11,7 @@ module.exports.parseImage = parseImage;
<van-nav-bar <van-nav-bar
title="福利购" title="福利购"
/> />
<view class="contianer" style="margin: 10px 16px 80px 16px;"> <view class="" style="margin: 10px 16px 80px 16px;">
<van-image class="banner" :src="imageDefine.SHOPPING_BANNER" width="686rpx" <van-image class="banner" :src="imageDefine.SHOPPING_BANNER" width="686rpx"

7
mini-app/src/pages/mall/index.wpy
View File

@ -90,9 +90,9 @@ module.exports.getTime = getTime;
我的 我的
</van-tabbar-item> </van-tabbar-item>
</van-tabbar> </van-tabbar>
<mall-home v-if="pageIndex === 0" /> <mall-home v-if="pageIndex === 0" @changeTab="changeTab" />
<mall-shopping v-else-if="pageIndex === 1" /> <mall-shopping v-else-if="pageIndex === 1" />
<mall-bbs v-else-if="pageIndex === 2" /> <mall-bbs v-else-if="pageIndex === 2" @changeTab="changeTab" />
<mall-my v-else-if="pageIndex === 3" /> <mall-my v-else-if="pageIndex === 3" />
<dialog-registration /> <dialog-registration />
@ -143,6 +143,9 @@ wepy.page({
this.pageIndex = event.$wx.detail this.pageIndex = event.$wx.detail
}, },
callAppLaunch() { callAppLaunch() {
},
changeTab(index) {
this.pageIndex = index
} }
}, },

2
mini-app/src/pages/mall/order/order-check.wpy
View File

@ -29,7 +29,7 @@ module.exports.parseImage = parseImage;
<nav-bar title="确认订单" /> <nav-bar title="确认订单" />
<div class="contianer" style="width: 100%;margin:15px;"> <div class="" style="width: 100%;margin:15px;">
<van-loading v-if="!isInit" style="margin-top: 20px;justify-content: center;"></van-loading> <van-loading v-if="!isInit" style="margin-top: 20px;justify-content: center;"></van-loading>
<view wx:else> <view wx:else>

5
mini-app/src/pages/mall/user/user-address-list.wpy
View File

@ -87,8 +87,9 @@
</div> </div>
<div style="margin-top: 20px;">
<van-button round type="info" size="large" @tap="onAdd" style="margin-top: 20px;">+ 新建收获地址</van-button> <van-button round type="info" size="large" @tap="onAdd">+ 新建收获地址</van-button>
</div>
</view> </view>
</div> </div>

43
mini-app/src/pages/webView/web.wpy Normal file
View File

@ -0,0 +1,43 @@
<style lang="less">
</style>
<template>
<web-view src="{{currWebUrl}}" />
</template>
<script>
import wepy from '@wepy/core'
import store from '@/store'
import { mapActions, mapState } from '@wepy/x'
wepy.page({
store,
hooks: {
},
data: {
url: ''
},
computed: mapState(['currWebUrl']),
methods: {
},
ready() {
this.url = store.state.currWebUrl
}
})
</script>
<config>
{
navigationBarText: '详情',
navigationBarTextStyle: 'black',
}
</config>

28
mini-app/src/pages/winery/winery-list.wpy
View File

@ -85,7 +85,16 @@ page {
const parseImage = (imageKey) => { const parseImage = (imageKey) => {
return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey
} }
const parseAwards = (value) => {
if (!value) {
return []
}
return value.split(',')
}
module.exports.parseImage = parseImage; module.exports.parseImage = parseImage;
module.exports.parseAwards = parseAwards;
</wxs> </wxs>
<template> <template>
@ -122,23 +131,26 @@ module.exports.parseImage = parseImage;
<div class="winery-item"> <div class="winery-item">
<van-image :src="filters.parseImage(item.avatar)" width="100%" height="128px" /> <van-image :src="filters.parseImage(item.avatar)" width="100%" height="128px" />
<div style="margin-left: 20px;margin-top:20px;display: flex;align-items: center;"> <div style="margin-left: 20px;margin-top:35px;display: flex;align-items: center;">
<span style="font-size: 20px;font-weight: bold;width: 120px;">{{item.mchName}}</span> <span style="font-size: 20px;font-weight: bold;width: 120px;">{{item.mchName}}</span>
<span style="color: #999;font-size: 12px;width: 200px;margin-left: 8px;">{{item.subtitle}}</span> <span style="color: #999;font-size: 12px;width: 200px;margin-left: 8px;">{{item.subtitle}}</span>
</div> </div>
<div style="margin: 19px 8px 15px 8px;"> <div style="margin: 19px 15px 15px 8px;">
<van-tag color="#F8F4E8" text-color="#CCA049" style="margin-right: 8px;">xxxxxxxxxxx大赛·金奖</van-tag>
<van-tag color="#EDF4FA" text-color="#828E99">xxxxxxxxxx大赛·银奖</van-tag>
<van-tag v-for="(awardItem,index) in filters.parseAwards(item.award)"
:color="index === 0 ? '#F8F4E8' : '#EDF4FA' " :text-color="index === 0 ? '#CCA049' : '#828E99'"
style="margin-right: 8px;">{{awardItem}}
</van-tag>
</div> </div>
</div> </div>
<!-- <div class="winery-item-arrow">-->
<!-- <div class="winery-item-arrow">--> <!-- <van-icon name="arrow" />-->
<!-- <van-icon name="arrow" />--> <!-- </div>-->
<!-- </div>-->
</div> </div>
</div> </div>

2
mini-app/src/store/constant/nav/my.js
View File

@ -29,7 +29,7 @@ export const myMenuList2 = [
icon: imgbaseUrl + '/my/tool_2.png', icon: imgbaseUrl + '/my/tool_2.png',
path: orderDetailListPage path: orderDetailListPage
}, { }, {
name: '优惠券', name: '条款政策',
icon: imgbaseUrl + '/my/tool_3.png', icon: imgbaseUrl + '/my/tool_3.png',
path: '' path: ''
} }

1
mini-app/src/store/constant/nav/pages.js
View File

@ -6,3 +6,4 @@ export const userAddressListPage = '/pages/mall/user/user-address-list'
export const goodsDetailPage = '/pages/mall/goods/goods-detail' export const goodsDetailPage = '/pages/mall/goods/goods-detail'
export const wineryListPage = '/pages/winery/winery-list' export const wineryListPage = '/pages/winery/winery-list'
export const wineryDetailPage = '/pages/winery/winery-detail' export const wineryDetailPage = '/pages/winery/winery-detail'
export const webViewPage = '/pages/webView/web'

3
mini-app/src/store/index.js
View File

@ -15,7 +15,8 @@ export default new Vuex.Store({
avatarUrl: 'https://img.yzcdn.cn/vant/cat.jpeg' avatarUrl: 'https://img.yzcdn.cn/vant/cat.jpeg'
}, },
token: '', token: '',
company: '企业名称' company: '企业名称',
currWebUrl: ''
}, },
// 订单 // 订单
order: {}, order: {},