tianyi 1 week ago
parent
commit
a9e6aa52a5
  1. 11
      pages/login/login.vue
  2. 6
      pages/worker/index.vue
  3. 10
      pages/worker/ranking.vue

11
pages/login/login.vue

@ -5,8 +5,11 @@
<view @click="changelogintype" v-if="false">{{i18n.login.passLogin}}</view> <view @click="changelogintype" v-if="false">{{i18n.login.passLogin}}</view>
<view @click="changelogintype" v-if="false">{{i18n.login.kuaijieLogin}}</view> <view @click="changelogintype" v-if="false">{{i18n.login.kuaijieLogin}}</view>
</view> </view>
<view v-if="loginType == true" class="logintitle">{{i18n.login.shoujikuaijieLogin}}</view> <!-- <view v-if="loginType == true" class="logintitle">{{i18n.login.shoujikuaijieLogin}}</view>
<view v-if="loginType == false" class="logintitle">{{i18n.login.zhpassLogin}}</view> <view v-if="loginType == false" class="logintitle">{{i18n.login.zhpassLogin}}</view> -->
<view v-if="peisongyuan == true" class="logintitle">配送员登录</view>
<view v-if="peisongyuan == false" class="logintitle">账号密码登录</view>
<view class="vview"></view> <view class="vview"></view>
<view class="codephoneinput row"> <view class="codephoneinput row">
<input :placeholder="i18n.login.placePhone" v-model="mobile" @input="mobileinpit" :maxlength="11" <input :placeholder="i18n.login.placePhone" v-model="mobile" @input="mobileinpit" :maxlength="11"
@ -39,6 +42,9 @@
<!-- <view class="reg-btn" @click="loginType = !loginType"> <!-- <view class="reg-btn" @click="loginType = !loginType">
切换登录方式 切换登录方式
</view> --> </view> -->
<view class="reg-btn" @click="peisongyuan = !peisongyuan">
{{peisongyuan?'切换商家登录':'切换配送员登录'}}
</view>
<!-- <navigator v-if="loginType == false" class="forget-pass" url="/pages/login/regist?type=3"> <!-- <navigator v-if="loginType == false" class="forget-pass" url="/pages/login/regist?type=3">
{{i18n.login.forgetPass}} {{i18n.login.forgetPass}}
</navigator> --> </navigator> -->
@ -70,6 +76,7 @@
components: {}, components: {},
data() { data() {
return { return {
peisongyuan:false,
shopList:[], shopList:[],
captchaId:'', captchaId:'',
wayValue:0, wayValue:0,

6
pages/worker/index.vue

@ -204,7 +204,7 @@
<view class="delivery-list-wrap"> <view class="delivery-list-wrap">
<view class="empty-delivery" v-if="deliveryItem.length <= 0"> <view class="empty-delivery" v-if="deliveryItem">
<view class="empty-delivery-icon">校园</view> <view class="empty-delivery-icon">校园</view>
<view class="empty-delivery-title">暂时没有可抢订单</view> <view class="empty-delivery-title">暂时没有可抢订单</view>
<view class="empty-delivery-desc">可以切换分类或调整筛选条件新的校园订单会在这里出现</view> <view class="empty-delivery-desc">可以切换分类或调整筛选条件新的校园订单会在这里出现</view>
@ -645,7 +645,7 @@
<view class="product-popup-title">订单详情</view> <view class="product-popup-title">订单详情</view>
<view class="product-popup-subtitle">请核对商品规格和数量</view> <view class="product-popup-subtitle">请核对商品规格和数量</view>
</view> </view>
<view class="product-popup-list" v-if="productData != null && productData.length > 0"> <view class="product-popup-list" v-if="productData">
<view class="product-popup-card" v-for="(item1,index1) in productData" :key="index1"> <view class="product-popup-card" v-for="(item1,index1) in productData" :key="index1">
<view class="product-popup-img"> <view class="product-popup-img">
<img :src="item1.productPicture" alt=""> <img :src="item1.productPicture" alt="">
@ -676,7 +676,7 @@
<view class="product-popup-title">商品详情</view> <view class="product-popup-title">商品详情</view>
<view class="product-popup-subtitle">请核对商品规格和数量</view> <view class="product-popup-subtitle">请核对商品规格和数量</view>
</view> </view>
<view class="product-popup-list" v-if="productGoodsList.length > 0"> <view class="product-popup-list" v-if="productGoodsList > 0">
<view class="product-popup-card" v-for="(item1,index1) in productGoodsList" :key="index1"> <view class="product-popup-card" v-for="(item1,index1) in productGoodsList" :key="index1">
<view class="product-popup-img"> <view class="product-popup-img">
<img :src="item1.productPicture" alt=""> <img :src="item1.productPicture" alt="">

10
pages/worker/ranking.vue

@ -37,21 +37,21 @@
<view class="podium"> <view class="podium">
<view class="podium-card podium-second" :class="{'podium-empty': !rankItem(1).workerName}"> <view class="podium-card podium-second" :class="{'podium-empty': !rankItem(1).workerName}">
<view class="podium-crown silver">2</view> <view class="podium-crown silver">2</view>
<image class="podium-avatar" :src="rankItem(1).icon || '/static/images/img/songshu.png'" mode="aspectFill"></image> <image class="podium-avatar" :src="rankItem(1).icon || '../../static/image/songshu.png'" mode="aspectFill"></image>
<view class="podium-name">{{displayName(rankItem(1))}}</view> <view class="podium-name">{{displayName(rankItem(1))}}</view>
<view class="podium-count">{{displayCount(rankItem(1))}}</view> <view class="podium-count">{{displayCount(rankItem(1))}}</view>
<view class="podium-base">NO.2</view> <view class="podium-base">NO.2</view>
</view> </view>
<view class="podium-card podium-first" :class="{'podium-empty': !rankItem(0).workerName}"> <view class="podium-card podium-first" :class="{'podium-empty': !rankItem(0).workerName}">
<view class="podium-crown gold">1</view> <view class="podium-crown gold">1</view>
<image class="podium-avatar champion" :src="rankItem(0).icon || '/static/images/img/songshu.png'" mode="aspectFill"></image> <image class="podium-avatar champion" :src="rankItem(0).icon || '../../static/image/songshu.png'" mode="aspectFill"></image>
<view class="podium-name">{{displayName(rankItem(0))}}</view> <view class="podium-name">{{displayName(rankItem(0))}}</view>
<view class="podium-count">{{displayCount(rankItem(0))}}</view> <view class="podium-count">{{displayCount(rankItem(0))}}</view>
<view class="podium-base">NO.1</view> <view class="podium-base">NO.1</view>
</view> </view>
<view class="podium-card podium-third" :class="{'podium-empty': !rankItem(2).workerName}"> <view class="podium-card podium-third" :class="{'podium-empty': !rankItem(2).workerName}">
<view class="podium-crown bronze">3</view> <view class="podium-crown bronze">3</view>
<image class="podium-avatar" :src="rankItem(2).icon || '/static/images/img/songshu.png'" mode="aspectFill"></image> <image class="podium-avatar" :src="rankItem(2).icon || '../../static/image/songshu.png'" mode="aspectFill"></image>
<view class="podium-name">{{displayName(rankItem(2))}}</view> <view class="podium-name">{{displayName(rankItem(2))}}</view>
<view class="podium-count">{{displayCount(rankItem(2))}}</view> <view class="podium-count">{{displayCount(rankItem(2))}}</view>
<view class="podium-base">NO.3</view> <view class="podium-base">NO.3</view>
@ -68,7 +68,7 @@
<view class="list-total">{{fireList.length}} 人上榜</view> <view class="list-total">{{fireList.length}} 人上榜</view>
</view> </view>
<view v-if="fireList.length == 0" class="empty-box"> <view v-if="fireList.length == 0" class="empty-box">
<image src="/static/images/img/songshu.png" mode="aspectFit"></image> <image src="../../static/image/songshu.png" mode="aspectFit"></image>
<view>暂无配送员上榜</view> <view>暂无配送员上榜</view>
</view> </view>
<view v-for="(item,index) in fireList" :key="index" class="content-item"> <view v-for="(item,index) in fireList" :key="index" class="content-item">
@ -76,7 +76,7 @@
<uni-icons v-if="index < 3" type="medal-filled" size="22" :color="medalColor(index)"></uni-icons> <uni-icons v-if="index < 3" type="medal-filled" size="22" :color="medalColor(index)"></uni-icons>
<text v-else>{{index + 1}}</text> <text v-else>{{index + 1}}</text>
</view> </view>
<image class="box-avatar" :src="item.icon || '/static/images/img/songshu.png'" mode="aspectFill"></image> <image class="box-avatar" :src="item.icon || '../../static/image/songshu.png'" mode="aspectFill"></image>
<view class="box-right"> <view class="box-right">
<view class="box-right-num">{{item.workerName == null?'暂无':item.workerName}}</view> <view class="box-right-num">{{item.workerName == null?'暂无':item.workerName}}</view>
<view class="box-right-name">当前排名第 {{index + 1}}</view> <view class="box-right-name">当前排名第 {{index + 1}}</view>

Loading…
Cancel
Save