yxt_product
/
yxt-yythmall-ui-miniprogram
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1111111

master
guoxing 1 year ago
parent
2eb92c14f9
commit
73a486c2c6
12 changed files with 313 additions and 154 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      components/NavBar/NavBar.vue
  2. 4
      pages/SelectAddressActivity.vue
  3. 218
      pages/bind/bind_cloudCard.vue
  4. 2
      pages/bind/bind_pickUpCard.vue
  5. 2
      pages/bind/bind_pickUpCard2.vue
  6. 8
      pages/good/reservation.vue
  7. 143
      pages/home/cloudCard2.vue
  8. 14
      pages/home/myCellar.vue
  9. 8
      pages/home/myHome.vue
  10. 23
      pages/records/orderDetail.vue
  11. 2
      pages/records/transferRecords.vue
  12. 9
      uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

4
components/NavBar/NavBar.vue
View File

@ -173,8 +173,8 @@
uni.navigateBack(1)
return;
}else{
uni.switchTab({
url: '/pages/home/myCellar'
uni.redirectTo({
url:'/pages/login/login'
})
}

4
pages/SelectAddressActivity.vue
View File

@ -88,8 +88,8 @@
<image src="https://supervise.yxtsoft.com/lpk/image/location.png" style="width: 20px;height: 20px;">
</image>
<text style="margin-left: 5px;font-size: 12px; color: #999;flex: 1;">门店地址：{{item.address}}</text>
<image src="https://supervise.yxtsoft.com/lpk/image/navigation.png"
style="width: 20px;height: 20px; margin-right: 20px;"></image>
<!-- <image src="https://supervise.yxtsoft.com/lpk/image/navigation.png"
style="width: 20px;height: 20px; margin-right: 20px;"></image> -->
</view>
<view style="display: flex;flex-direction: row;margin-top: 38rpx;border-top: 1rpx #f1f2f3 solid; justify-content: space-between;

218
pages/bind/bind_cloudCard.vue
View File

@ -1,89 +1,109 @@
<template>
<view style="display: flex;flex-direction: column;background-color: #fff;">
<view style="display: flex;flex-direction: column;background-color: #fff;height: 100%;">
<view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖" :showIcon="true" :start-change-height="page.startHeight"
<NavBar ref="nav" navTitle=" " :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight">
</NavBar>
<view>
<image src="https://supervise.yxtsoft.com/lpk/image/bind_bj_new.png" mode="scaleToFill"
<image src="https://supervise.yxtsoft.com/lpk/image/bind_bj_new1.png" mode="scaleToFill"
style="width: 100%;height: 70vw"></image>
</view>
</view>
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖卡</view>
<view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码"
style="font-size: 30rpx;flex: 1;background: #F8F8F8;border-radius: 5px;height: 40px;line-height: 40px;margin-right: 10px;padding-left: 10px;"
type="number" :value="page.code" @input="onKeyInput1" />
<uni-icons type="camera-filled" color="#c0c4cc" size="22" style="flex-shrink: 0;" @click="scan" />
</view>
<view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;margin-top: 10px;">
<input maxlength="6" placeholder="请输入提货密码"
style="font-size: 30rpx;flex: 1;background: #F8F8F8;border-radius: 5px;height: 40px;line-height: 40px;padding-left: 10px;"
type="number" :value="page.codeKey" @input="onKeyInput2" />
</view>
<view
style="height: calc(100vh - 75vw - 98px); overflow: scroll; padding-left: 12px;padding-right: 12px;padding-bottom: 24px;box-sizing: border-box;">
<view style="display: flex;flex-direction: row;align-items: center;">
<view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view>
<text style="margin-left: 8px;font-size: 18px;color: #333;">好友赠与的礼品</text>
</view>
</view>
<view v-for="(item,index) in data.list"
style="display: flex;flex-direction: row;width: 100%;margin-top: 5px;">
<view
style="margin: 30px;background-color: #fd3655;width: calc(100% - 60px);border-radius: 100rpx;height: 80rpx;display: flex;flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;"
@click="save">
绑定</view> -->
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;width: 100%;
padding-left: 20px;padding-right: 20px;margin-top: 8px;">
<!-- <text style="font-size: 12px;color: #666;">{{item.goodsName}}</text>
<text style="font-size: 12px;color: #666;">{{item.remarks}}</text> -->
<view style="display: flex;flex-direction: column;padding:20px;">
<view style="display: flex;flex-direction: row;align-items: center;box-sizing: border-box;">
<view style="display: flex;flex-direction: row;align-items: center;">
<image :src="item.goodsPicUrl" mode="aspectFill"
style="width: 90px;height: 90px;border-radius: 10px;flex-shrink: 0;"></image>
<view style="display: flex;flex-direction: column;margin-left:16px;box-sizing: border-box;">
<text
style="color: #000;font-size: 14px;font-weight: 600;font-family: sans-serif;">{{item.goodsName}}</text>
<text style="margin-top: 6px;color: #999;font-size: 12px;">{{item.goodsContent}}</text>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
<text style="color: #E36443;font-size: 12px;">{{item.goodsFs}}</text>
<text style="color: #E36443;margin-left: 10px;font-size: 12px;">{{item.goodsJs}}</text>
<text
style="margin-left: 10px;color: #E36443;border: 1px #E36443 solid;border-radius: 8px;padding: 1px 10px;font-size: 12px;">{{item.price}}</text>
</view>
</view>
</view>
</view>
</view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;"
v-if="data.remarks!=''">
<view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view>
<text style="margin-left: 8px;font-size: 18px;color: #333;">绑定云菜窖</text>
<text style="margin-left: 8px;font-size: 18px;color: #333;">转赠留言</text>
</view>
<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">转赠单号</text>
<view style="display: flex;flex-direction: row;justify-content: space-between;
background: #F8F8F8;border-radius: 5px;box-sizing: border-box;
width: calc(100vw -40px);align-items: center; padding:10px 0px;margin-top: 5px;">
<input maxlength="20" placeholder="请输入"
style="font-size: 30rpx;flex: 1;margin-right: 20px;padding-left: 10px;" type="number"
:value="page.code" @input="onKeyInput1" />
<!-- <view style="width: 1px;height: 20px;background: #ccc; margin-right: 10px;"></view> -->
<!-- <uni-icons type="camera-filled" color="#c0c4cc" size="22" style="flex-shrink: 0;margin-right: 10px;"
@click="scan" /> -->
</view>
<!-- <text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货密码</text>
<view style="display: flex;flex-direction: row;justify-content: space-between;
background: #F8F8F8;border-radius: 5px; padding:10px 0px;
box-sizing: border-box;width: calc(100vw - 40px);align-items: center;margin-top: 10px;">
<input maxlength="6" placeholder="请输入提货密码" style="font-size: 30rpx;flex: 1;padding-left: 10px;"
type="number" :value="page.codeKey" @input="onKeyInput2" />
</view> -->
<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">转赠内容</text>
<scroll-view scroll-y="true" style="height:20vh; width: 100%;margin-top: 10px;" bindscrolltoupper="upper"
bindscrolltolower="lower" bindscroll="scroll">
<view v-for="(item,index) in data" style="display: flex;flex-direction: row;width: 100%;">
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;width: 100%;
padding-left: 20px;padding-right: 20px;margin-top: 8px;">
<text style="font-size: 12px;color: #666;">{{item.goodsName}}</text>
<text style="font-size: 12px;color: #666;">{{item.remarks}}</text>
</view>
<text v-if="data.remarks!=''"
style="margin-top: 12px; padding-left: 20px;padding-right: 20px;text-indent: 2em;font-size: 16px;color: #333;
overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;">{{data.remarks}}</text>
</view>
</scroll-view>
</view>
<view v-if="codeType" style="position: absolute; bottom: 24px; display: flex;flex-direction: column;width: 100%;
padding-left: 21.5px;padding-right: 21.5px;box-sizing: border-box;border-top: 1px solid #EFEFEF; ">
<text
style=" text-align: center;width: 100%;color: #4F4F4F;font-size: 12px;margin-top: 12px;">温馨提示:您的好友赠送您一份健康蔬菜，请接收。</text>
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B);
width: 100%;border-radius: 25px;height: 50px;text-align: center;
margin-top: 12px;line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="save">
接收</view>
</view>
<!-- 恢复预约提货弹框 -->
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal'></view>
<view class="modalDlg2" catchtouchmove='preventTouchMove' v-if='showModal'>
<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;
width: 80%; border-radius: 20px; background: linear-gradient(#FFF4E4, #fff);">
<image src="../../static/notices.png" style="width: 60px;height: 60px; margin-top: -30px;"
mode="scaleToFill"></image>
<text
style="margin-top: 16px;font-size: 18px;color: #101010;font-weight: 600;font-family: sans-serif;">温馨提示</text>
<text
style="margin-top: 12px;font-size: 14px;color: #333;padding-left: 30px;padding-right: 30px;">此卡已被领取，请核对转增信息。</text>
<text style="margin-top: 25px;margin-bottom: 20px;border: 1px #FF9900 solid; color: #FF9900;font-size: 14px;
border-radius: 20px;height: 40px; line-height: 40px;padding-left: 30px;padding-right: 30px;"
@click="colseDialog()">确定</text>
</view>
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px;
width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;
flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;" @click="save">
绑定</view>
</view>
</view>
</template>
@ -101,7 +121,11 @@
startHeight: 0,
endHeight: 0
},
data:[]
data: {
remarks: ""
},
codeType: false,
showModal: false
}
},
onLoad(options) {
@ -111,6 +135,7 @@
this.page.customerSid = getApp().globalData.sid
let info = uni.getSystemInfoSync();
this.page.startHeight = info.windowWidth * 0.6
@ -118,11 +143,32 @@
this.getData()
},
methods: {
getData(){
let _this = this
colseDialog() {
this.showModal = false
},
getData() {
let _this = this
_this.$api.getTransferByCode(this.page.code).then((resp) => {
_this.data = resp
// 1 未领取 2 已绑定
// 已绑定
if ('2' == resp.state) {
if (resp.recipientSid == _this.page.customerSid) {
uni.redirectTo({
url: '/pages/login/login'
})
} else {
_this.showModal = true
}
} else {
_this.data = resp
_this.codeType = true
}
}).catch(e => {
_this.longToast(e.msg)
@ -175,8 +221,8 @@
uni.navigateBack(1)
return;
} else {
uni.switchTab({
url: '/pages/home/myCellar'
uni.redirectTo({
url: '/pages/login/login'
})
}
@ -194,4 +240,34 @@
width: 100vw;
height: 70vw;
}
/* 弹窗样式 */
.model {
position: absolute;
width: 100%;
height: 100%;
background: #000;
z-index: 100000;
opacity: 0.7;
top: 0;
left: 0;
}
.modalDlg2 {
/* 设置超出滚动 */
overflow: auto;
position: fixed;
z-index: 100000;
display: flex;
width: 100%;
height: 100%;
top: 0;
left: 0;
flex-direction: column;
justify-content: center;
align-items: center;
}
</style>

2
pages/bind/bind_pickUpCard.vue
View File

@ -67,7 +67,7 @@
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px;
width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;
flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;" @click="save">
绑定</view>
接收</view>
</view>
</view>
</template>

2
pages/bind/bind_pickUpCard2.vue
View File

@ -70,7 +70,7 @@
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px;
width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;
flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;" @click="save">
绑定</view>
接收</view>
</view>
</view>
</template>

8
pages/good/reservation.vue
View File

@ -63,13 +63,15 @@
<view
style="display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 1;">
style="display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 16px;">
<text
style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif; flex: 1;">提货时间</text>
<uni-datetime-picker type="date" v-model="info.reserveDate" :start="info.start"
<uni-datetime-picker type="date" v-model="info.reserveDate" :start="info.start" :clearIcon="false" :border="false"
:end="info.end" :disabledDate="disabledDate" />
<image src="../../static/right_icon.png"
style="width: 15px;height: 15px;margin-left: 5px;">
</image>
</view>

143
pages/home/cloudCard2.vue
View File

@ -75,14 +75,15 @@
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
<image :src="item.iconUrl"
style="width: 90px;height: 90px; border-radius: 10px; " mode="aspectFill"
@click="itemClick(item.goodsSid)"></image>
style="width: 90px;height: 90px; border-radius: 10px; " mode="aspectFill">
</image>
<view
style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;"
:style="{'border-bottom':(index == goods.length-1 ? 'none' : '1px #EFEFEF solid')}">
<text style="font-size: 13px;color: #000;">{{item.name}}</text>
<text style="font-size: 13px;color: #000;"
@click="itemClick(item.goodsSid)">{{item.name}}</text>
<text
style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text>
@ -103,21 +104,25 @@
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
margin-right: 15px;">
<text
style="font-size: 14px;color: #FF5006;">￥{{item.mefenPrice}}</text>
style="font-size: 14px;color: #FF5006;">￥{{item.mefenPrice}}元</text>
<view style="display: flex;flex-direction: row;align-items: center;">
<view v-if="!item.showCart"
style="display: flex;flex-direction: row;align-items: center;">
<image src="../../static/jian_icon.png" mode="aspectFill"
style="width: 20px;height: 20px;" @click.stop="jian(item)">
</image>
<text
style="font-size: 14px;margin-left: 8px;margin-right: 8px;">{{item.goodsNumber}}</text>
<text v-if="!item.showCart"
style="font-size: 14px;padding:5px; margin-left: 8px;margin-right: 8px;"
@click.stop="numberClick(item)">{{item.goodsNumber}}</text>
<image src="../../static/jia_icon.png" mode="aspectFill"
style="width: 20px;height: 20px;" @click.stop="jia(item)">
</image>
</view>
</view>
</view>
@ -161,7 +166,7 @@
style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
，{{data.brandVos[selectIndex2].qssl}}斤起订。</view>
<view style="display: flex;flex-direction: row;align-items: center;"
<!-- <view style="display: flex;flex-direction: row;align-items: center;"
@click="showPop2()">
<text
style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
@ -169,7 +174,7 @@
<text
style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;margin-left: 2px;">
>></text>
</view>
</view> -->
</view>
</view>
@ -306,17 +311,38 @@
</view>
<!-- 获取手机号弹框 -->
<!-- 输入数量 -->
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal1' @click="colseDialog1()"></view>
<view class="modalDlg4" catchtouchmove='preventTouchMove' v-if='showModal1'>
<view
style="display: flex;flex-direction: column;background: #fff; width: 80%; border-radius: 20px;box-sizing: border-box;">
<input type="number" placeholder="请输入数量" v-model="goodsItem.goodsNumber"
style="margin: 20px;border: 1px #bbb solid; padding: 5px;line-height: 30px;height: 30px;border-radius: 6px;" />
<view
style="flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;">
<button class="button1" @click="colseDialog1()">取消</button>
<button class="button2" @click="inCart()">确定</button>
</view>
</view>
</view>
<!-- 获取手机号弹框 -->
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal4' @click="colseDialog4()"></view>
<view class="modalDlg4" catchtouchmove='preventTouchMove' v-if='showModal4'>
<view style="display: flex;flex-direction: column;background: #fff; width: 80%; border-radius: 20px;
">
<view
style="display: flex;flex-direction: column;align-items: center;justify-content: center;width: 100%;margin-top: 20px;">
<image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill">
</image>
<text style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">云菜窖</text>
<text
style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">云菜窖</text>
</view>
@ -327,7 +353,7 @@
<view
style="flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 20px;">
<button class="button1" @click="colseDialog1()">拒绝</button>
<button class="button1" @click="colseDialog4()">拒绝</button>
<button class="button2" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">同意</button>
</view>
@ -337,6 +363,7 @@
</view>
</view>
</template>
@ -349,6 +376,10 @@
notData: false,
showModal: false,
showModal1: false,
showModal4: false,
goodsItem: {
goodsNumber: "",
},
showModal2: false,
newPerGiftList: [
@ -415,9 +446,8 @@
if (getApp().globalData.isPurchase == '1')
this.showModal = true
if (getApp().globalData.mobile == '')
this.showModal1 = true
this.showModal4 = true
},
@ -493,6 +523,9 @@
colseDialog2() {
this.showModal2 = false
},
colseDialog4(){
this.showModal4 = false
},
getBannerList() {
let _this = this
_this.$api.bannerList().then((resp) => {
@ -605,35 +638,36 @@
jian(item) {
const that = this
console.log("item》》》》", item)
if (Number(item.goodsNumber) == 1) {
wx.showModal({
content: '确定不要了吗',
cancelText: "再想想",
confirmText: "删除",
confirmColor: "#FF9900",
success(res) {
if (res.confirm) {
console.log('用户点击确定')
item.goodsNumber = 0
item.subtotal = 0
that.upDateShoppCart(item)
} else if (res.cancel) {
}
}
})
} else {
if (Number(item.goodsNumber) > 0) {
item.goodsNumber = Number(item.goodsNumber) - 1
}
// if (Number(item.goodsNumber) == 1) {
// wx.showModal({
// content: '确定不要了吗',
// cancelText: "再想想",
// confirmText: "删除",
// confirmColor: "#FF9900",
// success(res) {
// if (res.confirm) {
// console.log('用户点击确定')
// item.goodsNumber = 0
// item.subtotal = 0
// that.upDateShoppCart(item)
// } else if (res.cancel) {
// }
// }
// })
// } else {
if (Number(item.goodsNumber) > 0) {
item.goodsNumber = Number(item.goodsNumber) - 1
item.subtotal = Number(item.goodsNumber) * Number(item.mefenPrice)
that.upDateShoppCart(item)
}
// }
},
jia(item) {
@ -642,6 +676,34 @@
this.upDateShoppCart(item)
},
numberClick(item) {
this.showModal1 = true
this.goodsItem = {
goodsSid: item.goodsSid,
goodsName: item.name,
goodsNumber: item.goodsNumber,
affiliation: this.data.brandVos[this.selectIndex2].id,
price: item.mefenPrice,
weight: item.weight,
customerSid: getApp().globalData.sid
}
},
inCart() {
let _this = this
// console.log("inCart",_this.goodsItem);
_this.$api.addShoppingCart(_this.goodsItem).then((resp) => {
_this.getgoods()
this.goodsItem = {}
this.showModal1 = false
}).catch(e => {
_this.getgoods()
this.goodsItem = {}
this.showModal1 = false
})
},
getallPrice() {
@ -886,7 +948,7 @@
userSid: getApp().globalData.sid,
code: e.detail.code
}).then((resp) => {
_this.showModal1 = false
_this.showModal4 = false
getApp().globalData.mobile = resp
}).catch(e => {
console.log(e);
@ -899,7 +961,6 @@
</script>
<style>
.button1 {
background: #fff;

14
pages/home/myCellar.vue
View File

@ -66,7 +66,7 @@
position: absolute;border-radius: 20px;color: #fff;">已失效</text>
<image :src="item.iconUrl"
style="width: 90px;height: 90px; border-radius: 10px;z-index: 100;"
mode="aspectFill" @click="itemClick(item.goodsSid)"></image>
mode="aspectFill"></image>
</view>
@ -75,7 +75,8 @@
style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;"
:style="{'border-bottom':(index == goods.length-1 ? 'none' : '1px #EFEFEF solid')}">
<text style="font-size: 14px;color: #000;font-weight: 600;">{{item.name}}</text>
<text style="font-size: 14px;color: #000;font-weight: 600;"
@click="itemClick(item.goodsSid)">{{item.name}}</text>
<text
style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text>
@ -364,7 +365,7 @@
<!-- 恢复预约提货弹框 -->
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal2' ></view>
<!-- <view class="model" catchtouchmove='preventTouchMove' v-if='showModal2' ></view>
<view class="modalDlg2" catchtouchmove='preventTouchMove' v-if='showModal2'>
<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;
@ -381,7 +382,7 @@
</view>
</view>
</view> -->
@ -468,11 +469,12 @@
}
console.log("mobile>>>", getApp().globalData.mobile);
if (getApp().globalData.mobile == '')
this.showModal1 = true
console.log("mobile>>>", getApp().globalData.mobile);
this.request()
this.getNotice()
this.page.count = 0

8
pages/home/myHome.vue
View File

@ -44,7 +44,7 @@
mode="aspectFill"></image>
<!-- <view v-if="data.count>0" class="count">{{data.count}}</view> -->
</view>
<text class="name">待提菜</text>
<text class="name">待提取</text>
</view>
<!-- 已提菜 -->
<view class="icon-name" @click="itemClick('已提菜')">
@ -52,7 +52,7 @@
<image class="img" src="../../static/img/record-query/extracted.png" mode="aspectFill">
</image>
</view>
<text class="name">已提菜</text>
<text class="name">已提取</text>
</view>
<view class="icon-name"></view>
<view class="icon-name"></view>
@ -93,7 +93,7 @@
<image class="img" src="../../static/img/record-query/gifted_to_me.png"
mode="aspectFill"></image>
</view>
<text class="name">赠与我的</text>
<text class="name">收到的礼品</text>
</view>
<!-- 我的转赠 -->
<view class="icon-name" @click="itemClick('我的转赠')">
@ -101,7 +101,7 @@
<image class="img" src="../../static/img/record-query/my_gift.png" mode="aspectFill">
</image>
</view>
<text class="name">我的转赠</text>
<text class="name">发出的礼品</text>
</view>
<view class="icon-name"></view>
<view class="icon-name"></view>

23
pages/records/orderDetail.vue
View File

@ -24,11 +24,28 @@
<view style="display: flex;flex-direction: row;width: 100%;">
<text style="flex: 1;">{{item.goodsName}}</text>
<text>￥{{item.pricePart}}</text>
<text
style="flex: 1;font-weight: 600;font-family: sans-serif;font-size: 14px;">{{item.goodsName}}</text>
<text
style="font-weight: 600;font-family: sans-serif;font-size: 14px;">￥{{item.pricePart}}</text>
</view>
<text style="margin-top: 10px;font-size: 12px;color: #999;">{{item.remarks}}</text>
<!-- <text style="margin-top: 10px;font-size: 12px;color: #999;">{{item.remarks}}</text> -->
<view style="margin-top: 8px;display: flex;flex-direction: column;">
<view style="display: flex;flex-direction: row;align-items: center;">
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.priceUnit}}元/{{item.specificationUnit}}</text>
<text
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F; margin-left: 10px; margin-right: 10px; ">{{item.numofPart}}{{item.specificationUnit}}/{{item.unitName}}</text>
</view>
<text
style="margin-top: 12px;font-size: 12px;color: #999;">份数：{{item.partNumber}}{{item.unitName}}</text>
</view>
</view>

2
pages/records/transferRecords.vue
View File

@ -27,7 +27,7 @@
style="display: flex;flex-direction: row;margin-top: 5px;align-items: center;justify-content: space-between;width: 100%;">
<text style="flex: 1;font-size: 12px; color: #A5A5A5; margin-right: 10px;">- {{item.goodss}}</text>
<button v-show="item.state=='1'" class='sharebtn' :data-info="item"
open-type="share">分享窖</button>
open-type="share">待转赠</button>
<button v-show="item.state=='2'" class='sharebtn2'>转赠成功</button>
</view>

9
uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
View File

@ -5,14 +5,15 @@
<view class="uni-date-editor--x"
:class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}">
<view v-if="!isRange" class="uni-date-x uni-date-single">
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22" v-if="showClearIcon"
style="padding-right: 5px;"></uni-icons>
<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
<view class="uni-date__x-input" v-if="showClearIcon" >{{ displayValue || singlePlaceholderText }}</view>
<view class="uni-date__x-input" style="text-align: right;color: #FF9900; font-size: 14px;" v-if="!showClearIcon" >{{ displayValue || singlePlaceholderText }}</view>
</view>
<view v-else class="uni-date-x uni-date-range">
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
<view class="uni-date__x-input text-center">
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22" ></uni-icons>
<view class="uni-date__x-input text-center" >
{{ displayRangeValue.startDate || startPlaceholderText }}
</view>

Write Preview
Loading…
Cancel
Save