diff --git a/pages/index/index.vue b/pages/index/index.vue index 1f2fcfd..cfa4561 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -48,7 +48,7 @@ <view class="nav-item" @click="navTo('/pagesOrder/order/order?type=0')"> <image src="@/static/tab/da.png"></image> <text>我的订单</text> - <view class="badge">{{ userStore.userInfo.no_writeoff }}</view> + <view class="badge">{{ userStore.userInfo.no_writeoff }}</view> </view> <view class="nav-item" @click="navTo('/pages/my/my')"> <image src="@/static/tab/ca.png"></image> @@ -146,7 +146,7 @@ </view> </view> <view style="display: flex;" v-if='item.batch>0'> - <view>{{item.batch}}{{item.unit_name }}起卖</view> + <view style="color: red;">起批量: {{item.batch}}{{item.unit_name }}起卖</view> </view> <view style="display: flex;align-items: center;" v-if='userStore?.userInfo?.user_ship==1'> <text class='price' style="font-size: 24rpx;">会员价¥</text> @@ -664,23 +664,23 @@ flex-direction: column; align-items: center; justify-content: center; - position: relative; + position: relative; image { height: 40rpx; width: 40rpx; } - - .badge{ - position: absolute; - top: -10rpx; - right: 0; - background-color: #FF0000; - color: #FFFFFF; - padding: 0 5rpx; - border-radius: 50rpx; - font-size: 18rpx; - } + + .badge { + position: absolute; + top: -10rpx; + right: 0; + background-color: #FF0000; + color: #FFFFFF; + padding: 0 5rpx; + border-radius: 50rpx; + font-size: 18rpx; + } } } diff --git a/pages/login/login.vue b/pages/login/login.vue index 1f7d2df..2600075 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -9,7 +9,7 @@ <view class="login-box"> <image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png"> </image> - <view class="tips">欢迎登录惠农批发</view> + <view class="tips">欢迎登录泸优采</view> <block v-if="showWeixin"> <up-transition :show="showWeixin"> <view class="btn"> @@ -18,7 +18,7 @@ </view> <view class="btn" v-if="config.ENV=='dev'"> <up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon - name="weixin-fill" color="#fff" size="28"></up-icon>账号登录</up-button> + name="account-fill" color="#fff" size="28"></up-icon>账号登录</up-button> </view> <!-- <view class="btn"> <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff" diff --git a/pages/login/test.vue b/pages/login/test.vue index 83fc13b..4611f40 100644 --- a/pages/login/test.vue +++ b/pages/login/test.vue @@ -3,12 +3,13 @@ <view style="text-align: center;"> <image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png"> </image> - <view class="tips">欢迎登录惠农批发</view> + <view class="tips">欢迎登录泸优采</view> </view> <view class='card'> <view style="display: flex;align-items: center;"> - <text>手机号:</text> <up-input v-model="formData.account" placeholder="请输入手机号"></up-input> + <text>手机号:</text> + <up-input v-model="formData.account" placeholder="请输入手机号"></up-input> </view> <view style="margin: 30rpx 0;"> </view> @@ -24,18 +25,12 @@ </view> </view> </view> - - <view class="submit-btn"> <up-button @click="submit" color="#20B128" size="large"> 登录</up-button> </view> - - - - </view> </template> @@ -92,16 +87,11 @@ const submit = () => { userLoginApi({ - account: zh.value, - "password": "123456", - "terminal": 2, - "scene": 1 + ...formData }).then(res => { - getStoreInfo().then(res => { uni.setStorageSync("STORE_INFO", JSON.stringify(res.data)) }) - uni.setStorageSync('token', res.data.token); userStore.setToken(res.data.token); console.log(res.data.token)