diff --git a/api/api.js b/api/api.js
index a32111e..6557cf2 100644
--- a/api/api.js
+++ b/api/api.js
@@ -60,6 +60,7 @@ const config = {
roleOption: {
url: '/alUser/role',
method: 'POST',
+ limit : 1000,
},
// ========================产品报价===============================
@@ -67,6 +68,7 @@ const config = {
addCustoms: {
url: '/product/addCustoms',
method: 'POST',
+ limit : 1000,
},
// 产品报价
addProduct: {
diff --git a/components/config/customerServicePopup.vue b/components/config/customerServicePopup.vue
index ef1ef86..192491c 100644
--- a/components/config/customerServicePopup.vue
+++ b/components/config/customerServicePopup.vue
@@ -65,8 +65,8 @@
},
methods: {
getCustomPhone(){
- this.$api('getImagePhoneOther', {}, res => {
- console.log(res)
+ this.$api('getImagePhoneOther', res => {
+ console.log(res)
this.phone = res.result.phone
})
},
diff --git a/pages/index/center2.vue b/pages/index/center2.vue
index f87631a..d1bf05d 100644
--- a/pages/index/center2.vue
+++ b/pages/index/center2.vue
@@ -18,12 +18,12 @@
{{ $t('components.phoneNumber') }}： {{userInfo.phone}}
-
+
+
diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue
index cf544b5..669a283 100644
--- a/pages/index/tradingPlatform.vue
+++ b/pages/index/tradingPlatform.vue
@@ -75,10 +75,10 @@
},
onLoad() {
if(this.userShop){
- // 现货/期货列表
+ // 现货/期货列表
this.mixinsListApi = 'productList'
}else{
- // 交易平台挂单列表
+ // 交易平台挂单列表
this.mixinsListApi = 'productlist'
this.queryParams.productType = this.actionIndex
@@ -98,6 +98,7 @@
+ .registerShop {
+ .frame {
+ height: 79vh;
+ overflow: auto;
+
+ .basicInfo {
+ display: flex;
+ flex-direction: column;
+ gap: 5rpx;
+ background-color: #FFF;
+ margin-top: 20rpx;
+ padding: 20rpx;
+
+
+ .item {
+ display: flex;
+ align-items: center;
+ background-color: #FFF;
+ height: 80rpx;
+ // margin: 10rpx 0 0 0;
+ padding: 10rpx 0 0 20rpx;
+
+ >view:nth-of-type(1) {
+ width: 30%;
+ // font-weight: 700;
+ }
+
+ >view:nth-of-type(2) {
+ width: 70%;
+ border-radius: 10rpx;
+ overflow: hidden;
+
+ input {
+ background-color: #f5f5f5;
+ font-size: 28rpx;
+ padding: 16rpx 8rpx 16rpx 15rpx;
+ }
+ }
+ }
+
+
+ }
+
+ .certificateInfo {
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ background-color: #FFF;
+ margin-top: 20rpx;
+ padding: 20rpx;
+
+
+ .certificateInfoItem {
+ .title {
+ display: flex;
+ // padding-top: 40rpx;
+ font-size: 30rpx;
+ font-weight: 700;
+ padding: 0 0 0 20rpx;
+
+ >span:nth-of-type(1) {
+ margin: 4rpx 0 0 8rpx;
+ background-color: #FFF;
+ }
+
+ >span:nth-of-type(2) {
+ margin: 0 0 0 8rpx;
+ background-color: #FFF;
+ }
+ }
+
+ .upload {
+ margin: 5rpx 0 0 40rpx;
+ }
+ }
+
+
+ }
+ }
+
+ .bottom {
+ position: fixed;
+ bottom: 10rpx;
+ left: 0;
+ right: 0;
+
+ background-color: #FFF;
+
+ .btns {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ gap: 40rpx;
+
+ .sqsh {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 40%;
+ height: 70rpx;
+ border-radius: 40rpx;
+ color: white;
+ font-size: 28rpx;
+ margin: 20rpx 10rpx 0 0;
+ background: #293143;
+ //margin-top: 20rpx;
+ border-radius: 40rpx;
+ }
+
+ .lxwm {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 40%;
+ height: 70rpx;
+ border-radius: 40rpx;
+ color: #000000;
+ font-size: 28rpx;
+ margin: 20rpx 10rpx 0 0;
+ background: #f2f2f2;
+ //margin-top: 20rpx;
+ border-radius: 40rpx;
+ }
+
+ }
+
+ .others {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ gap: 200rpx;
+ color: #707070;
+ font-size: 24rpx;
+
+ .zcxz {
+ text-decoration: underline;
+ }
+
+ .kjhtyl {
+ text-decoration: underline;
+ }
+
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages_order/auth/selectionIdentity.vue b/pages_order/auth/selectionIdentity.vue
index f95086a..932ac4e 100644
--- a/pages_order/auth/selectionIdentity.vue
+++ b/pages_order/auth/selectionIdentity.vue
@@ -1,100 +1,107 @@
-
+
-
+
-
+
- {{ $t('components.selectIdentity') }}
-
-
-
- {{ $t('other.iAmBuyer') }}
-
- 
-
-
-
-
- {{ $t('other.iAmSupplier') }}
-
- 
-
-
-
-
-
+ {{ $t('components.selectIdentity') }}
+
+
+
+ {{ $t('other.iAmBuyer') }}
+
+
+
+
+
+
+ {{ $t('other.iAmSupplier') }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/center/helpFeedback.vue b/pages_order/center/helpFeedback.vue
index a14286b..c2cc96a 100644
--- a/pages_order/center/helpFeedback.vue
+++ b/pages_order/center/helpFeedback.vue
@@ -1,221 +1,239 @@
-
-
-
-
-
-
-
- {{ $t('components.helpAndFeedback') }} *
-
-
-
-
-
-
-
- {{ $t('components.screenshot') }} *
-
-
-
-
-
-
-
-
- {{ $t('components.contactInfo') }} *
-
-
- {{ $t('components.contactName') }}
-
-
-
-
-
- {{ $t('components.lxPhone') }}
-
-
-
-
-
-
-
-
-
-
- {{ $t('components.submitFeedback') }}
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ $t('components.helpAndFeedback') }} *
+
+
+
+
+
+
+
+ {{ $t('components.screenshot') }} *
+
+
+
+
+
+
+
+
+ {{ $t('components.contactInfo') }} *
+
+
+ {{ $t('components.contactName') }}
+
+
+
+
+
+ {{ $t('components.lxPhone') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('components.submitFeedback') }}
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/center/systemSet.vue b/pages_order/center/systemSet.vue
index 7d02e59..9cd3202 100644
--- a/pages_order/center/systemSet.vue
+++ b/pages_order/center/systemSet.vue
@@ -1,138 +1,180 @@
-
-
-
-
-
-
- {{ item.title }}
-
-
-
- ![]()
-
-
- {{ item2.text }}
-
-
-
- {{ item.rightIcon }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+ ![]()
+
+
+ {{ item2.text }}
+
+
+
+ {{ item.rightIcon }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/store/store.js b/store/store.js
index 7b1fe6e..56d7d96 100644
--- a/store/store.js
+++ b/store/store.js
@@ -4,6 +4,7 @@ import Vuex from 'vuex'
Vue.use(Vuex); //vue的插件机制
import api from '@/api/api.js'
+import { date } from '../uni_modules/uv-ui-tools/libs/function/test';
//Vuex.Store 构造器选项
const store = new Vuex.Store({
@@ -13,6 +14,7 @@ const store = new Vuex.Store({
userInfo : {}, //用户信息
shopData : {},
buy : {},
+ customerPhone : '',//客服电话
},
getters: {
// 角色 true 为供应商 false 为采购商
@@ -56,7 +58,8 @@ const store = new Vuex.Store({
}
state.userInfo = res.result.userInfo
state.buy = res.result.buy
- state.shop = res.result.shop
+ state.shopData = res.result.shop
+ state.shop = !!res.result.shop
uni.setStorageSync('token', res.result.token)
if(!state.shop && !state.buy){
@@ -71,9 +74,10 @@ const store = new Vuex.Store({
})
},
getUserInfo(state){
- api('infoGetInfo', res => {
+ api('getImagePhoneOther', res => {
if(res.code == 200){
- state.userInfo = res.result
+ state.userInfo = res.result.my
+ state.customerPhone = res.result.phone
}
})
},
@@ -92,6 +96,9 @@ const store = new Vuex.Store({
}
})
},
+ setShop(state, date){
+ state.shop = date
+ },
},
actions: {},
})