From c58aff5b2a349c6b1fc8a4a3f474f7f8cc529e09 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 12 七月 2024 14:05:58 +0800
Subject: [PATCH] update 花农端首次上架
---
sub_pages/supplier/order-records/order-records.vue | 4
pages/login/supplier-login.vue | 4
environments/index.js | 36 +----------
pages/home/home.vue | 4 +
sub_pages/supplier/order-settlement/order-settlement.vue | 2
sub_pages/supplier/supplier-reg/supplier-reg.vue | 6 +
pages/home/supplier-home.vue | 15 +++-
static/common/icon-sc.png | 0
static/common/icon-shop.png | 0
App.vue | 3
sub_pages/supplier/order-sale/order-sale.vue | 2
sub_pages/customer/trade/detail.vue | 61 +++++++++++++++++++-
12 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/App.vue b/App.vue
index 1aa56db..ac7a622 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,7 @@
<script>
// 合伙人： "appid" : "wx6d0ecc4e18710458",
- // 花农： "appid" : "wx3203fd935a6ffe09",
+ // 花农： "appid" : "wx3203fd935a6ffe09",
+ // 花店 wx1441324401626290
import storage from '@/plugins/storage.js'
export default {
diff --git a/environments/index.js b/environments/index.js
index d72a54b..30e3981 100644
--- a/environments/index.js
+++ b/environments/index.js
@@ -1,36 +1,8 @@
-const environments = {
- 'local': {
- httpBaseUri: 'http://localhost:8083',
- clientId: '',
- secret: '',
- tenantId: '',
- appDownloadUri: 'http://xxx/app/',
- websocketUrl: '',
- type: 'dev'
- },
- 'dev': {
- httpBaseUri: 'http://39.103.237.67:8083',
- clientId: '',
- secret: '',
- tenantId: '',
- appDownloadUri: 'http://xxx/app/',
- websocketUrl: '',
- type: 'dev'
- },
-}
-// export default environments['local']
-// export default environments['dev']
-
export default {
- // httpBaseUri: 'http://localhost:8084',
- httpBaseUri: 'http://121.199.161.55:8080/flower',
- // http://106.14.123.210:8080/flower/swagger-ui.html#/
- // httpBaseUri: 'http://121.196.214.70',
- // httpBaseUri: 'http://localhost:8084',
- // httpBaseUri:'http://39.103.237.67:80',
- // //#ifndef H5-SERVERLOCAL
- // httpBaseUri: 'http://47.96.167.62:8083/',
- // //#endif
+
+ httpBaseUri: 'https://www.hmyxianhua.com/flower',
+ // httpBaseUri: 'https://47.99.58.211/flower',
+
clientId: '',
secret: '',
tenantId: '',
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8fa256a..22681a1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -177,6 +177,10 @@
// this.schools = res.data || []
// }
// })
+ uni.navigateTo({
+ url: '/sub_pages/customer/trade/detail'
+ })
+
//获取banner图
this.$http.request('get', '/api/ua/banner/list', {
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index a19329a..bcc74e0 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -101,20 +101,20 @@
<view class="item-container flex m-t-12" style="padding: 34rpx 44rpx;">
<view class="rate-view flex1" style="max-width: 140rpx;">
<view class="title">售后率</view>
- <view class="title" style="color: red;">0.02%</view>
+ <view class="title" style="color: red;">0.00%</view>
</view>
<view class="tj-panel pink flex1">
<view class="name">今日待配送</view>
- <view class="title">12扎</view>
+ <view class="title">0扎</view>
</view>
<view class="tj-panel green flex1">
<view class="name green">今日配送汇总</view>
- <view class="title">12扎</view>
+ <view class="title">0扎</view>
</view>
</view>
<view class="m-t-12" @click="getNoticeMore">
<uni-notice-bar class="notice-bar" color="#333" background-color="#fff" show-get-more show-icon
- :scrollable="scrollable" :text="currentNotice.title" :key="currentNotice.id" />
+ :scrollable="scrollable" :text="currentNotice.title||'暂无公共'" :key="currentNotice.id" />
<span v-if="!currentNotice||!currentNotice.id"> </span>
</view>
<view class="item-container">
@@ -250,12 +250,19 @@
},
methods: {
async toFlowManage() {
+
+
if (!this.currentInfo.supplierDTO) {
await this.$message.confirm('尚未入住店铺信息，是否前往入住？')
this.goto('/sub_pages/supplier/supplier-info/supplier-info', true)
return
}
if (this.currentInfo.supplierDTO) {
+ //需要刷新一下当前用户信息
+ this.$message.showLoading()
+ await this.$store.dispatch('getCurrentInfo')
+ this.$message.hideLoading()
+
if (this.currentInfo.supplierDTO.status == 'P') {
} else {
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index 5d7d5e5..4ad70ff 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -73,8 +73,8 @@
data() {
return {
openId: '-1',
- userName: 'gzm',
- password: '123456',
+ userName: '',
+ password: '',
// userName: '',
// password: '',
diff --git a/static/common/icon-sc.png b/static/common/icon-sc.png
new file mode 100644
index 0000000..543628f
--- /dev/null
+++ b/static/common/icon-sc.png
Binary files differ
diff --git a/static/common/icon-shop.png b/static/common/icon-shop.png
new file mode 100644
index 0000000..ef2788b
--- /dev/null
+++ b/static/common/icon-shop.png
Binary files differ
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index 8183fd0..84406cf 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -1,6 +1,16 @@
<template>
- <view>
-
+ <view class="trade-detail">
+ <view class="top-img-container">
+ <image src="" class="top-img"></image>
+ <view class="icon-container">
+ <image src="../../../static/common/icon-sc.png" class="icon-sc"></image>
+ <view class="num">12</view>
+ </view>
+ <view class="icon-container">
+ <image src="../../../static/common/icon-shop.png" class="icon-shop"></image>
+
+ </view>
+ </view>
</view>
</template>
@@ -17,6 +27,51 @@
}
</script>
-<style>
+<style lang="scss" scoped>
+.trade-detail{
+ .top-img-container{
+ position: relative;
+ .top-img{
+ width: 750rpx;
+ height: 764rpx;
+ }
+ .icon-container{
+ position: absolute;
+ top: 20rpx;
+ width: 80rpx;
+ height: 80rpx;
+ background: rgba(0,0,0,0.42);
+
+ .icon-sc{
+ width: 54rpx;
+ height: 54rpx;
+ margin: 0 auto;
+ margin-top: 12rpx;
+ }
+ .icon-shop{
+ width: 54rpx;
+ height: 54rpx;
+ margin: 0 auto;
+ margin-top: 12rpx;
+ }
+ .num{
+ font-weight: 400;
+ font-size: 20rpx;
+ color: #FFFFFF;
+ line-height: 28rpx;
+ position: absolute;
+ top: 6prx;
+ right: 16rpx;
+ }
+ }
+ .icon-container:last-child{
+ left: 120rpx;
+ }
+ .icon-container:first-child{
+ left: 20rpx;
+ }
+
+ }
+}
</style>
diff --git a/sub_pages/supplier/order-records/order-records.vue b/sub_pages/supplier/order-records/order-records.vue
index 981a774..0e084ec 100644
--- a/sub_pages/supplier/order-records/order-records.vue
+++ b/sub_pages/supplier/order-records/order-records.vue
@@ -7,7 +7,7 @@
<view class="label">买家</view>
</view>
<view class="tj-each flex1">
- <view class="value">9扎</view>
+ <view class="value">0扎</view>
<view class="label">交易</view>
</view>
<view class="tj-each flex1">
@@ -15,7 +15,7 @@
<view class="label">理赔</view>
</view>
<view class="tj-each flex1">
- <view class="value">401.12</view>
+ <view class="value">0</view>
<view class="label">交易合计</view>
</view>
</view>
diff --git a/sub_pages/supplier/order-sale/order-sale.vue b/sub_pages/supplier/order-sale/order-sale.vue
index 61e523e..40e3fb0 100644
--- a/sub_pages/supplier/order-sale/order-sale.vue
+++ b/sub_pages/supplier/order-sale/order-sale.vue
@@ -58,7 +58,7 @@
}
},
onLoad() {
- this.listApi = '/api/ua/announcement/list'
+ this.listApi = ''
this.getList()
},
diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index ffcf07f..f89a9da 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -75,7 +75,7 @@
}
},
onLoad() {
- this.listApi = '/api/ua/announcement/list'
+ this.listApi = ''
this.getList()
},
diff --git a/sub_pages/supplier/supplier-reg/supplier-reg.vue b/sub_pages/supplier/supplier-reg/supplier-reg.vue
index d6fb84e..44790f8 100644
--- a/sub_pages/supplier/supplier-reg/supplier-reg.vue
+++ b/sub_pages/supplier/supplier-reg/supplier-reg.vue
@@ -36,7 +36,7 @@
<view class="flex">
<view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
</view>
- <view class="flex flex-wrap-normal" style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;">
+ <view class="flex flex-wrap-normal" style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="false">
<view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}"
@click="protocal=!protocal"
class="component-radio" :class="[protocal?'cur':'']">
@@ -81,6 +81,9 @@
})
},
async getCode() {
+ // await this.$message.confirm('是否同意入驻协议')
+ // this.protocal = true
+ console.log('getCode')
uni.hideKeyboard() //隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
if (this.getCodeisWaiting) {
return;
@@ -298,6 +301,7 @@
position: absolute;
right: 40rpx;
top: 25rpx;
+ z-index: 99;
}
}
--
Gitblit v1.9.3