Jelajahi Sumber

fix: 我的页面,提现等按钮修改为根据接口状态展示,登录页添加登录时openid获取

ext.zhangbin71 1 hari lalu
induk
melakukan
87b395dc73
3 mengubah file dengan 16 tambahan dan 9 penghapusan
  1. 4 4
      config/app.js
  2. 9 2
      pages/user/index.vue
  3. 3 3
      pages/users/login/index.vue

+ 4 - 4
config/app.js

@@ -1,14 +1,14 @@
 // let domain = "https://www.shuibeibyg.com/front-api"; // 正式环境IP
 // let domain = "https://www.shuibeibyg.com/front-api"; // 正式环境IP
-let domain = "https://test.shuibeibyg.com/front-api"; // 测试环境IP
-// let domain = 'http://192.168.100.199:8081' // 晋守桦IP
+// let domain = "https://test.shuibeibyg.com/front-api"; // 测试环境IP
+let domain = 'http://192.168.100.199:8081' // 晋守桦IP
 // let domain = 'http://192.168.100.246:8081' // 韩朝龙IP
 // let domain = 'http://192.168.100.246:8081' // 韩朝龙IP
 let share = "https://www.shuibeibyg.com";
 let share = "https://www.shuibeibyg.com";
 
 
 let imgUrl = "https://sb-admin.oss-cn-shenzhen.aliyuncs.com/shuibei-mini/new-mini/" //服務器上图片地址
 let imgUrl = "https://sb-admin.oss-cn-shenzhen.aliyuncs.com/shuibei-mini/new-mini/" //服務器上图片地址
 
 
 // export const H5_BASE_URL = "http://192.168.3.10:5174"; // 本地测试
 // export const H5_BASE_URL = "http://192.168.3.10:5174"; // 本地测试
-export const H5_BASE_URL = "http://192.168.100.35:5175"; // 本地测试
-// export const H5_BASE_URL = "https://www.shuibeibyg.com/web-h5/"; // 正式环境H5地址
+// export const H5_BASE_URL = "http://192.168.100.35:5175"; // 本地测试
+export const H5_BASE_URL = "https://www.shuibeibyg.com/web-h5/"; // 正式环境H5地址
 
 
 // PC 后台 API 地址(用于上传图片)
 // PC 后台 API 地址(用于上传图片)
 export const HTTP_ADMIN_URL = domain;
 export const HTTP_ADMIN_URL = domain;

+ 9 - 2
pages/user/index.vue

@@ -74,12 +74,12 @@
         </view>
         </view>
       </view>
       </view>
 
 
-      <view class="wallet-actions" v-if="tradeList&&tradeList.length>0">
+      <view class="wallet-actions" v-if="tradeList&&tradeList.length>0&&showIcons">
         <view class="wallet-btn withdraw" @click="goDetail(tradeList[0].jumpUrl)">{{tradeList[0].iconName}}</view>
         <view class="wallet-btn withdraw" @click="goDetail(tradeList[0].jumpUrl)">{{tradeList[0].iconName}}</view>
         <view class="wallet-btn recharge" @click="goDetail(tradeList[1].jumpUrl)">{{tradeList[1].iconName}}</view>
         <view class="wallet-btn recharge" @click="goDetail(tradeList[1].jumpUrl)">{{tradeList[1].iconName}}</view>
       </view>
       </view>
 
 
-      <view class="functions" v-if="useList&&useList.length>0">
+      <view class="functions" v-if="useList&&useList.length>0&&showIcons">
         <view class="function-item" v-for="item in useList" :key="item.iconName" @click="goDetail(item.jumpUrl)">
         <view class="function-item" v-for="item in useList" :key="item.iconName" @click="goDetail(item.jumpUrl)">
           <view class="function-icon">
           <view class="function-icon">
             <image class="img" :src="item.src" mode="widthFix"></image>
             <image class="img" :src="item.src" mode="widthFix"></image>
@@ -163,6 +163,8 @@ import { getMetalBalance } from "@/api/vault";
 import { footprintList } from "@/api/merchant.js";
 import { footprintList } from "@/api/merchant.js";
 import { toLogin } from "@/libs/login.js";
 import { toLogin } from "@/libs/login.js";
 
 
+
+const showIcons = ref(false)
 const appStore = useAppStore();
 const appStore = useAppStore();
 const { Toast } = useToast();
 const { Toast } = useToast();
 const isLogin = appStore.isLogin;
 const isLogin = appStore.isLogin;
@@ -260,6 +262,11 @@ watch(
     const configDate = newVal || appStore.$wxConfig;
     const configDate = newVal || appStore.$wxConfig;
     wxConfig.value = configDate;
     wxConfig.value = configDate;
 	const list = JSON.parse(configDate.essentialFunctions);
 	const list = JSON.parse(configDate.essentialFunctions);
+	if(list[0].status==false){
+		showIcons.value = false;
+	}else{
+		showIcons.value = true;
+	}
     tradeList.value = [list[0],list[1]];
     tradeList.value = [list[0],list[1]];
 	useList.value = [{
 	useList.value = [{
 		...list[2],
 		...list[2],

+ 3 - 3
pages/users/login/index.vue

@@ -199,9 +199,9 @@ const getLogoImage = async () => {
 const getWechatOpenid = async () => {
 const getWechatOpenid = async () => {
   try {
   try {
     const { code, errMsg } = await uni.login();
     const { code, errMsg } = await uni.login();
-    if (!errMsg) return uni.showToast({ title: errMsg, icon: "none" }); // debug
+    // if (!errMsg) return uni.showToast({ title: errMsg, icon: "none" }); // debug
     // if (!code) return uni.showToast({ title: "无code", icon: "none" }); // debug
     // if (!code) return uni.showToast({ title: "无code", icon: "none" }); // debug
-    console.log(code)
+    console.log(code,errMsg)
     const res = await getUserOpenId({ code });
     const res = await getUserOpenId({ code });
     if (res.data?.code === 200 && res.data?.data?.openid) {
     if (res.data?.code === 200 && res.data?.data?.openid) {
       const openid = res.data.data.openid;
       const openid = res.data.data.openid;
@@ -322,7 +322,7 @@ const submit = async () => {
 const getUserInfoFn = async (data) => {
 const getUserInfoFn = async (data) => {
   try {
   try {
     appStore.SETUID(data.uid);
     appStore.SETUID(data.uid);
-    // await getWechatOpenid();
+    await getWechatOpenid();
     const res = await getUserInfo();
     const res = await getUserInfo();
     appStore.UPDATE_USERINFO(res.data);
     appStore.UPDATE_USERINFO(res.data);
     userInfo.value = res.data;
     userInfo.value = res.data;