product_platform/yxt-yythmall-ui-miniprogram
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1111111

Browse Source
This commit is contained in:
guoxing
2024-04-01 16:23:07 +08:00
parent d223d48125
commit 3caf534ec3
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/config.js
View File

@@ -6,10 +6,10 @@
* loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
*/ */
module.exports = { module.exports = {
baseUrl: 'http://192.168.2.117:7211', // 本地 // baseUrl: 'http://192.168.2.117:7211', // 本地
// baseUrl: 'https://lpk.yyundong.com/lpkapi', // 测试服务器 // baseUrl: 'https://lpk.yyundong.com/lpkapi', // 测试服务器
// baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器 // baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器
// baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器 baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
// tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 // tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面

42
pages/home/cloudCard2.vue
View File

@@ -33,8 +33,7 @@
<view class="center" style=""> <view class="center" style="">
<view <view style="width: 24%; display: flex;flex-direction: column;
style="width: 24%; display: flex;flex-direction: column;
position: relative;"> position: relative;">
<view style="width: 100%;display: flex;flex-direction: column; <view style="width: 100%;display: flex;flex-direction: column;
@@ -46,7 +45,7 @@
</view> </view>
<view v-if="isPurchase == '1'" @click="newUserGift()" style="display: flex;flex-direction: column;justify-content: center;align-items: center;width: 100%; <view v-if="isPurchase == '1'&&newPerGiftList.length>0" @click="newUserGift()" style="display: flex;flex-direction: column;justify-content: center;align-items: center;width: 100%;
position: absolute; bottom: 0; margin-bottom: 10px;"> position: absolute; bottom: 0; margin-bottom: 10px;">
<image src="../../static/newUserGift.png" style="width: 40px;height: 40px;"></image> <image src="../../static/newUserGift.png" style="width: 40px;height: 40px;"></image>
<text style="font-size: 12px;margin-top: 5px;color: #666;">新人专享</text> <text style="font-size: 12px;margin-top: 5px;color: #666;">新人专享</text>
@@ -114,8 +113,7 @@
<text <text
style="font-size: 14px;color: #FF5006;">￥{{item.mefenPrice}}元</text> style="font-size: 14px;color: #FF5006;">￥{{item.mefenPrice}}元</text>
<view <view style="display: flex;flex-direction: row;align-items: center;">
style="display: flex;flex-direction: row;align-items: center;">
<image src="../../static/jian_icon.png" mode="aspectFill" <image src="../../static/jian_icon.png" mode="aspectFill"
style="width: 20px;height: 20px;" @click.stop="jian(item)"> style="width: 20px;height: 20px;" @click.stop="jian(item)">
@@ -157,7 +155,8 @@
style="width: 80px;height: 80px; "></image> style="width: 80px;height: 80px; "></image>
<view style="display: flex;flex-direction: column;align-items: center; justify-content: center;margin: 20px 30px; <view style="display: flex;flex-direction: column;align-items: center; justify-content: center;margin: 20px 30px;
"> ">
<text style="text-indent: 2em; font-size: 16px; color: #999;">您好，【企业菜窖】需要通过认证才能进行购买</text> <text
style="text-indent: 2em; font-size: 16px; color: #999;">您好，【企业菜窖】需要通过认证才能进行购买</text>
<text style="font-size: 14px;color: #fff;padding: 10px 40px; border-radius: 20px; <text style="font-size: 14px;color: #fff;padding: 10px 40px; border-radius: 20px;
background: #FF9901;margin-top: 20px;" @click="authentication()">立即认证</text> background: #FF9901;margin-top: 20px;" @click="authentication()">立即认证</text>
@@ -554,7 +553,7 @@
initWeight: "0", initWeight: "0",
shareSid: "", shareSid: "",
baseDataSuccess: false, baseDataSuccess: false,
isPurchase:"0",// 0 不显示 1显示 isPurchase: getApp().globalData.isPurchase, // 0 不显示 1显示
} }
}, },
@@ -572,10 +571,10 @@
console.log("isPurchase", getApp().globalData.isPurchase); console.log("isPurchase", getApp().globalData.isPurchase);
if (getApp().globalData.isPurchase == '1'){ // if (getApp().globalData.isPurchase == '1'){
this.showModal = true // this.showModal = true
this.isPurchase = '1' // this.isPurchase = '1'
} // }
if (getApp().globalData.mobile == '') if (getApp().globalData.mobile == '')
@@ -595,28 +594,37 @@
this.request() this.request()
this.shareGift() this.getGiftList()
this.getBannerList() this.getBannerList()
}, },
methods: { methods: {
newUserGift(){ newUserGift() {
this.showModal = true this.showModal = true
this.isPurchase = '1' // this.isPurchase = '1'
}, },
showGift() { getGiftList() {
let _this = this let _this = this
_this.$api.newUserQuota().then((resp) => { _this.$api.newUserQuota().then((resp) => {
// console.log("--------", resp); // console.log("--------", resp);
_this.newPerGiftList = resp _this.newPerGiftList = resp
_this.showModal = false if (_this.newPerGiftList.length > 0 && _this.isPurchase=="1") {
_this.showModal2 = true _this.showModal = true
// _this.isPurchase = getApp().globalData.isPurchase
}
// _this.showModal = false
// _this.showModal2 = true
}).catch(e => { }).catch(e => {
}) })
},
showGift() {
this.showModal = false
this.showModal2 = true
}, },
radioChange(event) { radioChange(event) {