From 44dbae4a6ffb73478cd7980f37f1760e9a070c07 Mon Sep 17 00:00:00 2001 From: xuxy <1059738716@qq.com> Date: 星期日, 28 七月 2024 23:55:21 +0800 Subject: [PATCH] add 帮助富文本等页面 --- pages/home/components/home-banner-imgs.vue | 39 ++ environments/index.js | 4 pages.json | 570 +++++++++++++++++++------------------ pages/help/content.vue | 197 +++++++++++++ sub_pages/customer/shopping/confirm.vue | 34 ++ pages/order/order.vue | 2 pages/order/order-detail.vue | 2 pages/user/supplier-user.vue | 4 8 files changed, 553 insertions(+), 299 deletions(-) diff --git a/environments/index.js b/environments/index.js index 199d56d..7a40f75 100644 --- a/environments/index.js +++ b/environments/index.js @@ -1,7 +1,7 @@ export default { - httpBaseUri: 'https://www.hmyxianhua.com/flower', - // httpBaseUri: 'http://47.99.58.211/flower', + // httpBaseUri: 'https://www.hmyxianhua.com/flower', + httpBaseUri: 'http://47.99.58.211/flower', // httpBaseUri: 'http://localhost:8080/flower', clientId: '', secret: '', diff --git a/pages.json b/pages.json index 4900a51..c752a79 100644 --- a/pages.json +++ b/pages.json @@ -1,286 +1,290 @@ { - // 如果您是通过uni_modules形式引入uView,可以忽略此配置 - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - }, - "pages": [ - { - "path": "pages/login/supplier-login", - "style": { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, - { - "path": "pages/home/supplier-home", - "style": { - "navigationBarTitleText": "首页", - "enablePullDownRefresh": true, - "navigationStyle": "custom" - } - }, - // #ifdef PUB_CUSTOMER - { - "path": "pages/home/home", - "style": { - "navigationBarTitleText": "首页", - "enablePullDownRefresh": true, - "navigationStyle": "custom" - } - }, - { - "path": "pages/user/address/address", - "style": { - "navigationBarTitleText": "收货地址" - } - }, - // #endif - { - "path": "pages/login/supplier-reg", - "style": { - "navigationBarTitleText": "申请入驻", - "navigationStyle": "custom" - } - }, - { - "path": "pages/user/supplier-user", - "style": { - "navigationBarTitleText": "我的", - "enablePullDownRefresh": true, - "navigationStyle": "custom" - } - }, - { - "path": "pages/user/user-info/user-info", - "style": { - "navigationBarTitleText": "我的信息", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/notice/notice", - "style": { - "navigationBarTitleText": "通知公告", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/notice/list", - "style": { - "navigationBarTitleText": "通知公告", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/user/user-pwd/user-pwd", - "style": { - "navigationBarTitleText": "修改密码", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/help/help", - "style": { - "navigationBarTitleText": "客服中心", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/order/order", - "style": { - "navigationBarTitleText": "我的订单", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/order/order-detail", - "style": { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false - } - } - // #ifdef PUB_PARTNER - , - { - "path": "sub_pages/partner/delivery/delivery", - "style": { - "navigationBarTitleText": "配送质检", - "enablePullDownRefresh": true - } - }, - { - "path": "sub_pages/partner/delivery/delivery-detail", - "style": { - "navigationBarTitleText": "质检详情", - "enablePullDownRefresh": true - } - } - // #endif - ], - "subPackages": [ - { - "root": "sub_pages/supplier", - "pages": [ - // #ifdef PUB_SUPPLIER - { - "path": "supplier-info/supplier-info", - "style": { - "navigationBarTitleText": "信息维护", - "enablePullDownRefresh": false - } - }, - { - "path": "flower-manage/flower-manage", - "style": { - "navigationBarTitleText": "商品管理", - "enablePullDownRefresh": true - } - }, - { - "path": "flower-manage/flower-add", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, + // 如果您是通过uni_modules形式引入uView,可以忽略此配置 + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + }, + "pages": [{ + "path": "pages/login/supplier-login", + "style": { + "navigationBarTitleText": "登录", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/home/supplier-home", + "style": { + "navigationBarTitleText": "首页", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + }, + // #ifdef PUB_CUSTOMER + { + "path": "pages/home/home", + "style": { + "navigationBarTitleText": "首页", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + }, + { + "path": "pages/user/address/address", + "style": { + "navigationBarTitleText": "收货地址" + } + }, + // #endif + { + "path": "pages/login/supplier-reg", + "style": { + "navigationBarTitleText": "申请入驻", + "navigationStyle": "custom" + } + }, + { + "path": "pages/user/supplier-user", + "style": { + "navigationBarTitleText": "我的", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + }, + { + "path": "pages/user/user-info/user-info", + "style": { + "navigationBarTitleText": "我的信息", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/notice/notice", + "style": { + "navigationBarTitleText": "通知公告", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/notice/list", + "style": { + "navigationBarTitleText": "通知公告", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/user/user-pwd/user-pwd", + "style": { + "navigationBarTitleText": "修改密码", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/help/help", + "style": { + "navigationBarTitleText": "客服中心", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/order/order", + "style": { + "navigationBarTitleText": "我的订单", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/order/order-detail", + "style": { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false + } + } + // #ifdef PUB_PARTNER + , + { + "path": "sub_pages/partner/delivery/delivery", + "style": { + "navigationBarTitleText": "配送质检", + "enablePullDownRefresh": true + } + }, + { + "path": "sub_pages/partner/delivery/delivery-detail", + "style": { + "navigationBarTitleText": "质检详情", + "enablePullDownRefresh": true + } + } + // #endif + , { + "path": "pages/help/content", + "style": { + "navigationBarTitleText": "" + } + } + ], + "subPackages": [{ + "root": "sub_pages/supplier", + "pages": [ + // #ifdef PUB_SUPPLIER + { + "path": "supplier-info/supplier-info", + "style": { + "navigationBarTitleText": "信息维护", + "enablePullDownRefresh": false + } + }, + { + "path": "flower-manage/flower-manage", + "style": { + "navigationBarTitleText": "商品管理", + "enablePullDownRefresh": true + } + }, + { + "path": "flower-manage/flower-add", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, - { - "path": "order-settlement/order-settlement", - "style": { - "navigationBarTitleText": "账单结算", - "enablePullDownRefresh": true - } - }, - { - "path": "order-sale/order-sale", - "style": { - "navigationBarTitleText": "售后理赔", - "enablePullDownRefresh": true - } - }, - { - "path": "order-records/order-records", - "style": { - "navigationBarTitleText": "扣款记录", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#E6F2EB" - } - }, - // #endif - { - "path": "protocol", - "style": { - "navigationBarTitleText": "协议", - "enablePullDownRefresh": false - } - } - ] - }, - { - "root": "sub_pages/partner", - "pages": [ - // #ifdef PUB_PARTNER - { - "path": "partner-info/partner-info", - "style": { - "navigationBarTitleText": "信息维护", - "enablePullDownRefresh": false - } - }, - { - "path": "order-manage/order-manage", - "style": { - "navigationBarTitleText": "订单管理", - "enablePullDownRefresh": true - } - }, - { - "path": "markup-config/markup-config", - "style": { - "navigationBarTitleText": "加价配置", - "enablePullDownRefresh": true - } - } - // #endif - ] - }, - { - "root": "sub_pages/customer", - "pages": [ - // #ifdef PUB_CUSTOMER - { - "path": "customer-info/customer-info", - "style": { - "navigationBarTitleText": "信息维护", - "enablePullDownRefresh": false - } - }, - { - "path": "trade/trade", - "style": { - "navigationBarTitleText": "交易大厅", - "enablePullDownRefresh": true - } - }, - { - "path": "shopping/shopping", - "style": { - "navigationBarTitleText": "购物车", - "enablePullDownRefresh": true - } - }, - { - "path": "shopping/confirm", - "style": { - "navigationBarTitleText": "订单详情" - } - }, - { - "path": "trade/list", - "style": { - "navigationBarTitleText": "商品列表", - "enablePullDownRefresh": true - } - }, - { - "path": "trade/detail", - "style": { - "navigationBarTitleText": "商品详情", - "enablePullDownRefresh": false - } - }, - { - "path": "shop/shop", - "style": { - "navigationBarTitleText": "商家主页" - } - }, - { - "path": "self/follow", - "style": { - "navigationBarTitleText": "我的关注", - "enablePullDownRefresh": true - } - }, - { - "path": "self/collect", - "style": { - "navigationBarTitleText": "我的收藏", - "enablePullDownRefresh": true - } - } - // #endif - ] - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "花满芫", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8", - "app-plus": { - "background": "#efeff4" - } - } + { + "path": "order-settlement/order-settlement", + "style": { + "navigationBarTitleText": "账单结算", + "enablePullDownRefresh": true + } + }, + { + "path": "order-sale/order-sale", + "style": { + "navigationBarTitleText": "售后理赔", + "enablePullDownRefresh": true + } + }, + { + "path": "order-records/order-records", + "style": { + "navigationBarTitleText": "扣款记录", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#E6F2EB" + } + }, + // #endif + { + "path": "protocol", + "style": { + "navigationBarTitleText": "协议", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "sub_pages/partner", + "pages": [ + // #ifdef PUB_PARTNER + { + "path": "partner-info/partner-info", + "style": { + "navigationBarTitleText": "信息维护", + "enablePullDownRefresh": false + } + }, + { + "path": "order-manage/order-manage", + "style": { + "navigationBarTitleText": "订单管理", + "enablePullDownRefresh": true + } + }, + { + "path": "markup-config/markup-config", + "style": { + "navigationBarTitleText": "加价配置", + "enablePullDownRefresh": true + } + } + // #endif + ] + }, + { + "root": "sub_pages/customer", + "pages": [ + // #ifdef PUB_CUSTOMER + { + "path": "customer-info/customer-info", + "style": { + "navigationBarTitleText": "信息维护", + "enablePullDownRefresh": false + } + }, + { + "path": "trade/trade", + "style": { + "navigationBarTitleText": "交易大厅", + "enablePullDownRefresh": true + } + }, + { + "path": "shopping/shopping", + "style": { + "navigationBarTitleText": "购物车", + "enablePullDownRefresh": true + } + }, + { + "path": "shopping/confirm", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "trade/list", + "style": { + "navigationBarTitleText": "商品列表", + "enablePullDownRefresh": true + } + }, + { + "path": "trade/detail", + "style": { + "navigationBarTitleText": "商品详情", + "enablePullDownRefresh": false + } + }, + { + "path": "shop/shop", + "style": { + "navigationBarTitleText": "商家主页" + } + }, + { + "path": "self/follow", + "style": { + "navigationBarTitleText": "我的关注", + "enablePullDownRefresh": true + } + }, + { + "path": "self/collect", + "style": { + "navigationBarTitleText": "我的收藏", + "enablePullDownRefresh": true + } + } + // #endif + ] + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "花满芫", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8", + "app-plus": { + "background": "#efeff4" + } + } } \ No newline at end of file diff --git a/pages/help/content.vue b/pages/help/content.vue new file mode 100644 index 0000000..32d3f86 --- /dev/null +++ b/pages/help/content.vue @@ -0,0 +1,197 @@ +<template> + <view class="travel-detail"> + <view v-if="dto.id"> + <view class="info-desc"> + <view v-html="dto.content||'暂无'" class="rich" style="overflow: scroll;"> + + </view> + </view> + + </view> + </view> +</template> + +<script> + export default { + data() { + return { + dto: { + content:'' + }, + id: '' + }; + }, + async onLoad(options) { + this.id = options.id || '' + if(this.id){ + // #ifdef MP + wx.setNavigationBarTitle({ + title:this.id || '详情' + }) + // #endif + + } + await this.init() + + }, + async onPullDownRefresh() { + await this.init() + uni.stopPullDownRefresh() + }, + methods: { + async init() { + this.$message.showLoading() + const { + data + } = await this.$http.request('get', '/api/config/content/list/view?id=' + this.id, { + + }) + this.$message.hideLoading() + this.dto = { + ...data + } + this.dto.content = this.$util.formatRichText(this.dto.content || '') + + }, + } + } +</script> + +<style lang="scss" scoped> + .popup-form { + padding-bottom: 68rpx; + + .bottom-img { + width: 118rpx; + height: 70rpx; + display: block; + margin: 0 auto; + } + + .bottom-info { + font-weight: 400; + font-size: 28rpx; + color: #666666; + line-height: 40rpx; + text-align: center; + } + + .title { + font-size: 32rpx; + color: #000000; + margin-bottom: 32rpx; + } + + .people-name { + font-weight: 600; + font-size: 32rpx; + color: #000000; + line-height: 102rpx; + margin-left: 28rpx; + } + + .people-img { + width: 102rpx; + height: 102rpx; + border: 2rpx solid #FFFFFF; + } + } + + .travel-detail { + .info-peoples { + padding: 24rpx 30rpx; + background: #fff; + + .title { + font-size: 32rpx; + color: #000000; + font-weight: 600; + + } + + .show-more-peoples { + font-size: 24rpx; + color: #26C3A5; + } + } + + .info-desc { + padding: 24rpx 30rpx; + background: #fff; + + .title { + margin-bottom: 20rpx; + font-weight: 600; + font-size: 32rpx; + color: #000000; + } + + /deep/ img { + max-width: 600rpx; + + } + } + + .info-cover { + width: 750rpx; + height: 474rpx; + } + + .infos { + padding: 24rpx 30rpx; + background: #fff; + + .name { + font-weight: 600; + font-size: 40rpx; + color: #000000; + } + + + .price { + font-weight: 600; + line-height: 72rpx; + font-size: 50rpx; + color: #000000; + + .dot { + font-size: 40rpx; + line-height: 56rpx; + } + } + + .status { + width: 132rpx; + height: 50rpx; + border-radius: 26rpx; + border: 2rpx solid #999999; + color: #999999; + line-height: 50rpx; + font-size: 24rpx; + + text-align: center; + margin-left: 16rpx; + } + + .status.A, + .status.J { + border: 2rpx solid #04BA97; + color: #04BA97; + } + + .icon-loc { + width: 24rpx; + height: 30rpx; + background-size: 100% 100%; + + } + + .icon-clock { + width: 24rpx; + height: 26rpx; + background-size: 100% 100%; + + } + } + } +</style> \ No newline at end of file diff --git a/pages/home/components/home-banner-imgs.vue b/pages/home/components/home-banner-imgs.vue index 6406423..0fa5c54 100644 --- a/pages/home/components/home-banner-imgs.vue +++ b/pages/home/components/home-banner-imgs.vue @@ -2,29 +2,29 @@ <view class=" home-banner-imgs"> <view class="flex" v-if="list&&list.length>=3"> <view class="flex1 m-r-5"> - <image class="p1 img100" :src="list[0].url"> + <image class="p1 img100" :src="list[0].url" mode="scaleToFill"> </image> </view> <view class="flex1 m-l-5"> - <image class="p2 img100" :src="list[1].url"> + <image class="p2 img100" :src="list[1].url" mode="scaleToFill"> </image> - <image class="p3 img100" :src="list[2].url"> + <image class="p3 img100" :src="list[2].url" mode="scaleToFill"> </image> </view> </view> - <view class="flex" v-else-if="list&&list.length>=2"> + <view class="flex l-2" v-else-if="list&&list.length>=2" mode="scaleToFill"> <view class="flex1 m-r-5"> - <image class="p1 img100" :src="list[0].url"> + <image class="p1 img100" :src="list[0].url" mode="scaleToFill"> </image> </view> <view class="flex1 m-l-5"> - <image class="p1 img100" :src="list[1].url"> + <image class="p1 img100" :src="list[1].url" mode="scaleToFill"> </image> </view> </view> - <view class="flex" v-else-if="list&&list.length>=1"> + <view class="flex l-1" v-else-if="list&&list.length>=1" mode="scaleToFill"> <view class="flex1 m-r-5"> - <image class="p1 img100" :src="list[0].url"> + <image class="p1 img100" :src="list[0].url" mode="scaleToFill"> </image> </view> </view> @@ -47,6 +47,22 @@ }) if (code === 0) { this.list = data || [] + for(var item of this.list){ + try{ + if(item.url){ + var t = JSON.parse(item.url) + if(Array.isArray(t)){ + item.url = t[0] || '' + }else{ + item.url = t.url || '' + } + } + + }catch(e){ + // console.log('error',e) + } + } + console.log(this.list) } } @@ -55,6 +71,7 @@ <style lang="scss"> .home-banner-imgs { + // background-color: #fff; .p1 { // width: 334rpx; height: 308rpx; @@ -73,5 +90,11 @@ // width: 334rpx; height: 142rpx; } + // .l-1{ + // .p1{ + // min-height: 308rpx; + // height: 308rpx; + // } + // } } </style> \ No newline at end of file diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue index 7a5e869..e434471 100644 --- a/pages/order/order-detail.vue +++ b/pages/order/order-detail.vue @@ -303,7 +303,7 @@ </view> <view class="form-item"> <view class="label">特殊需求:</view> - <view class="value">{{ dto.specialNeeds || '-' }}</view> + <view class="value">{{ dto.specialNeedsStr || '-' }}</view> </view> <view class="form-item"> <view class="label">买家留言:</view> diff --git a/pages/order/order.vue b/pages/order/order.vue index 081a6f0..0d6feed 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -49,7 +49,7 @@ <view class="flex"> <image class="image img100" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/67/67acf980f310460a97d305c6ffc7e811位图@2x (1).png"></image> - <view>消费订单:¥<span>{{ '0' }}</span> 总消费:¥<span>{{ '0' }}</span></view> + <view>消费订单:¥<span class="m-r-10">{{ '0' }}</span> 总消费:¥<span>{{ '0' }}</span></view> </view> </view> <view class="status-list m-t-12 flex flex-wrap-normal"> diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue index cc5e22b..a61e88f 100644 --- a/pages/user/supplier-user.vue +++ b/pages/user/supplier-user.vue @@ -118,14 +118,14 @@ </image> <view>地址管理</view> </view> - <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')"> + <view class="service-icons" @click="goto('/pages/help/content?id=售后规则',false)"> <image src="../../static/images/customer/service/service-icon-4.png" class="service-icon "> </image> <view>售后规则</view> </view> </view> <view class="flex service-icons-container"> - <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')"> + <view class="service-icons" @click="goto('/pages/help/content?id=新手帮助',false)"> <image src="../../static/images/customer/service/service-icon-5.png" class="t2 service-icon "> </image> <view>新手帮助</view> diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue index 776d98d..18ecf6c 100644 --- a/sub_pages/customer/shopping/confirm.vue +++ b/sub_pages/customer/shopping/confirm.vue @@ -25,6 +25,18 @@ ...this.dto, ...item } + this.$http.request('get', '/api/code/value', { + params: { + type: 'SPEC_REQ' + } + }).then(res => { + var data = res.data + this.need_columns = [data || []] + this.need_columns[0].unshift({ + label: '暂无', + value: '' + }) + }) //先获取直接的全部地址 // @ApiModelProperty(value = "订单商品") // private List<FlowerCartListDTO> flowers; @@ -37,6 +49,7 @@ dto: { remarks: '', specialNeeds: '', + specialNeedsStr: '', transportId: '', addressId: '', flowers: [], @@ -44,7 +57,10 @@ current_transport: {}, cacheAddressId: '', transportList: [], - + show_select_need: false, + need_columns: [ + [] + ], } }, @@ -58,6 +74,11 @@ } }, methods: { + select_need(e) { + this.show_select_need = false + this.dto.specialNeedsStr = e.value[0].label + this.dto.specialNeeds = e.value[0].value + }, async loadTransportList() { let that = this; console.log('address', that.address, that.cacheAddressId) @@ -222,12 +243,18 @@ <view class="p10 bg-white m-t-20 br-4"> <view class="form-item "> <view class="label">特殊需求</view> - <view class="m-l-a m-r-0 flex1"> + <!-- <view class="m-l-a m-r-0 flex1"> <view class="m-t-12 m-b-12"> <u-textarea v-model="dto.specialNeeds" placeholder="请输入特殊需求"> </u-textarea> </view> + </view> --> + <view class="m-l-a m-r-0 flex " :class="[!dto.specialNeeds?'desc-gray':'']" @click="()=>{ + show_select_need=true + }"> + <view>{{dto.specialNeedsStr||dto.specialNeeds || '请选择'}}</view> + <u-icon class="m-l-a" name="arrow-right"></u-icon> </view> </view> <view class="form-item m-t-12 "> @@ -276,6 +303,9 @@ 提交订单 </view> </view> + + <u-picker :show="show_select_need" @confirm="select_need" keyName="label" :columns="need_columns" + @cancel="show_select_need=false"></u-picker> </view> </template> -- Gitblit v1.9.3