diff --git a/config/dev.js b/config/dev.js
index 4253546..52454bf 100644
--- a/config/dev.js
+++ b/config/dev.js
@@ -5,7 +5,28 @@ module.exports = {
},
defineConstants: {
},
- mini: {},
+ mini: {
+ // optimizeMainPackage: {
+ // enable: true
+ // },
+ webpackChain: (chain, webpack) => {
+ chain.merge({
+ plugin: {
+ install: {
+ plugin: require('terser-webpack-plugin'),
+ args: [{
+ terserOptions: {
+ compress: true, // 默认使用terser压缩
+ // mangle: false,
+ keep_classnames: true, // 不改变class名称
+ keep_fnames: true // 不改变函数名称
+ }
+ }]
+ }
+ }
+ })
+ }
+ },
h5: {},
alias: {
'@': path.resolve(__dirname, '..', 'src'),
diff --git a/src/common/constant.js b/src/common/constant.js
index deed9aa..346a828 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -4,14 +4,14 @@
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:40001/lymarket`
// export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
-// export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
+export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
// export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
+// export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
// CDN
diff --git a/src/components/orderBtns/index.module.scss b/src/components/orderBtns/index.module.scss
index 252b22e..e121bca 100644
--- a/src/components/orderBtns/index.module.scss
+++ b/src/components/orderBtns/index.module.scss
@@ -3,6 +3,7 @@
// margin-top: 30px;
display: flex;
align-content: center;
+ padding-bottom: 20px;
.more{
font-size: 28px;
width: 143px;
diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx
index cc029c9..b245395 100644
--- a/src/components/shopCart/index.tsx
+++ b/src/components/shopCart/index.tsx
@@ -231,18 +231,25 @@ export default ({show = false, onClose}: param) => {
let res = await useFetchData()
if(res.data.order_access_status !== 3) {
if(res.data.order_access_status == 1) applyOrderAccessFetchData()
- Taro.showModal({
- title: '提示',
- content: '暂未开通下单权限功能，稍后有客服联系您，请注意接受电话。',
- cancelText: '联系客服',
- confirmText: '我知道',
- success: function (res) {
- if (res.confirm) {
- } else if (res.cancel) {
- console.log('用户点击取消')
- }
- }
- })
+ let modal_res = await Taro.showModal({
+ title: '提示',
+ content: '暂未开通下单权限功能，稍后有客服联系您，请注意接受电话。',
+ confirmText: '联系客服',
+ cancelText: '我知道',
+ })
+ if (modal_res.confirm) {
+ let res = await Taro.showModal({
+ title: '是否拨打服务热线',
+ confirmText: '拨打',
+ content: '(0757) 8270 6695',
+ cancelText: '取消',
+ })
+ if(res.confirm) {
+ Taro.makePhoneCall({
+ phoneNumber: '(0757)82706695'
+ })
+ }
+ }
return false
}
getSelectId()
diff --git a/src/pages/order/components/estimatedAmount/index.module.scss b/src/pages/order/components/estimatedAmount/index.module.scss
index 4b4a958..c005ce8 100644
--- a/src/pages/order/components/estimatedAmount/index.module.scss
+++ b/src/pages/order/components/estimatedAmount/index.module.scss
@@ -3,6 +3,15 @@
align-items: center;
justify-content: space-between;
width: 100%;
+ .close{
+ width: 100vw;
+ height: 100vh;
+ position: fixed;
+ z-index: 999;
+ top: 0;
+ left: 0;
+ word-break: break-all;
+ }
&:nth-last-child(n+2) {
margin-bottom: 30px;
}
@@ -12,6 +21,7 @@
display: flex;
.iconfont_msg{
position: relative;
+
}
.miconfont{
font-size: 26px;
@@ -28,16 +38,15 @@
padding: 10px;
box-sizing: border-box;
&::before{
- z-index: 1;
+ z-index: 99;
position: absolute;
- bottom: -7px;
- left: 10px;
- width: 15px;
- height: 15px;
+ width: 0;
+ height: 0;
content: " ";
- transform: rotate(45deg);
- background: #A8B3BD;
- box-sizing: border-box;
+ left: 10px;
+ bottom: -20px;
+ border: 10px solid transparent;
+ border-top-color: #A8B3BD;
}
}
}
diff --git a/src/pages/order/components/estimatedAmount/index.tsx b/src/pages/order/components/estimatedAmount/index.tsx
index 04bc49a..f00371f 100644
--- a/src/pages/order/components/estimatedAmount/index.tsx
+++ b/src/pages/order/components/estimatedAmount/index.tsx
@@ -10,19 +10,23 @@ type Param = {
title?: string,
titleStatus?: true|false, //true 标题加大加深
numberStatus?: 0|1|2, //数字尺寸
+ messageTitle: string,
+ messageHeight: number,
+ messageWidth: number
}
-export default memo(({style, number = 0, titleStatus = true, title = '', numberStatus = 1}:Param) => {
+export default memo(({style, number = 0, titleStatus = true, title = '', numberStatus = 1, messageHeight = 100, messageWidth = 260}:Param) => {
return (
<>
{title}
+ {/* 1231231231212123123123lll12312123123lll12312123123lll12312 */}
- {/* 123123123121212312312312312 */}
+ {/* */}
)
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index e6b727b..3cdb744 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -11,14 +11,17 @@ import { userassets, userorderStatistics } from "@/api/mine"
import { formatPriceDiv } from "@/common/fotmat"
import { useDidShow, } from '@tarojs/taro'
import { GetAdminUserInfoApi } from "@/api/user";
+
+
+
export default () => {
//重新获取用户信息
- const {fetchData: useFetchData} = GetAdminUserInfoApi()
- const [userDataAgain, setUserDataAgain] = useState({})
- const getUserData = async () => {
- let res = await useFetchData()
- setUserDataAgain(res.data)
- }
+ // const {fetchData: useFetchData} = GetAdminUserInfoApi()
+ // const [userDataAgain, setUserDataAgain] = useState({})
+ // const getUserData = async () => {
+ // let res = await useFetchData()
+ // setUserDataAgain(res.data)
+ // }
// 用户信息
@@ -42,7 +45,7 @@ export default () => {
}, [])
useDidShow(() => {
ApigetTotal()
- getUserData()
+ // getUserData()
})
const checkGo = () => {
if (adminUserInfo?.authentication_status === 0 || adminUserInfo?.authentication_status === 1 || adminUserInfo?.authentication_status === 2 || adminUserInfo?.authentication_status === 3) {
@@ -67,8 +70,8 @@ export default () => {
}
return (
-
- checkGo()} userInfo={userDataAgain}/>
+
+ checkGo()} userInfo={adminUserInfo}/>
{/* {(adminUserInfo as any)?.authentication_status==1&&} */}
{/* 测试暂时添加 */}