liangxin/xdd-uniapp-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-AI-v5

Browse Source
This commit is contained in:
lifizer
2026-06-11 09:04:42 +08:00
parent 04b6a8d384 26c5c4d115
commit 85c3e45dc9
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/ProductWindow.vue
+11 -2
View File
@@ -75,7 +75,7 @@
<view class="v12-px-2 v12-mt-3" v-if="showOk"> <view class="v12-px-2 v12-mt-3" v-if="showOk">
<u-button <u-button
shape="circle" shape="circle"
color="#C52733" :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'"
@click="$emit('ok')" @click="$emit('ok')"
:disabled="(attr.productSelect.stock === 0 && attr.cartAttr)" :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
>{{ okText }}</u-button> >{{ okText }}</u-button>
@@ -83,7 +83,7 @@
<view class="v12-px-2 v12-mt-3" v-if="isGift"> <view class="v12-px-2 v12-mt-3" v-if="isGift">
<u-button <u-button
shape="circle" shape="circle"
color="#C52733" :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'"
@click="$emit('gift')" @click="$emit('gift')"
:disabled="(attr.productSelect.stock === 0 && attr.cartAttr)" :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
>送给朋友</u-button> >送给朋友</u-button>
@@ -255,6 +255,15 @@ export default {
} }
</script> </script>
<style scope> <style scope>
.btn-car-disabled {
border: 2rpx solid #9D9D9D !important;
color: #9D9D9D !important;
}
.btn-buy-disabled {
background: #9D9D9D !important;
color: #FFFFFF !important;
}
.itemn{ .itemn{
margin: 28rpx 0 0 34rpx !important; margin: 28rpx 0 0 34rpx !important;
width: auto; width: auto;
pages/shop/GoodsCon/index.vue
+4 -3
View File
@@ -1872,8 +1872,8 @@ export default {
} }
.btn-car-disabled { .btn-car-disabled {
border: 2rpx solid #707070; border: 2rpx solid #9D9D9D !important;
color: #707070; color: #9D9D9D !important;
} }
.btn-buy { .btn-buy {
@@ -1886,7 +1886,8 @@ export default {
} }
.btn-buy-disabled { .btn-buy-disabled {
background: #9D9D9D; background: #9D9D9D !important;
color: #FFFFFF !important;
} }
} }
utils/index.js
+3 -3
View File
@@ -379,7 +379,7 @@ export const login = loginInfo => {
}) })
}) })
.catch(error => { .catch(error => {
reject('登录接口调用失败') reject('请联系管理员')
}) })
} else { } else {
reject('用户未授权') reject('用户未授权')
@@ -413,7 +413,7 @@ export const login = loginInfo => {
}) })
}) })
.catch(error => { .catch(error => {
reject('登录接口调用失败') reject('请联系管理员')
}) })
}, },
fail() { fail() {
@@ -423,7 +423,7 @@ export const login = loginInfo => {
} }
}, },
fail() { fail() {
reject('调用登录接口失败') reject('请联系管理员')
}, },
}) })
}) })