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

2023-12-1

master
guoxing 2 years ago
parent
83f1e822c1
commit
7d72abd693
15 changed files with 114 additions and 26 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. 2
      common/config.js
  2. 16
      pages.json
  3. 28
      pages/card/card.vue
  4. 2
      pages/card/card_bind.vue
  5. 2
      pages/card/card_bind2.vue
  6. 20
      pages/card/card_booking.vue
  7. 18
      pages/card/card_detail.vue
  8. 8
      pages/card/card_record.vue
  9. 22
      pages/good/goodsDetail.vue
  10. BIN
      static/btn_bj.png
  11. BIN
      static/edit_bg.png
  12. BIN
      static/gift3.png
  13. 9
      uni_modules/loading-state/components/loading-state/loading-state.vue
  14. 3
      uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
  15. 10
      uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

2
common/config.js
View File

@ -6,7 +6,7 @@
* loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
*/
module.exports = {
// baseUrl: 'http://192.168.2.110:7201',
// baseUrl: 'http://192.168.2.113:7201',
baseUrl: 'https://supervise.yxtsoft.com/lpkapi',
// baseUrl: 'http://jianguan.yyundong.com/api',
tokenName: "Authorization", // 请求头中token的名字，与服务器端对应

16
pages.json
View File

@ -10,13 +10,13 @@
{
"path": "pages/card/card_detail",
"style": {
"navigationBarTitleText": "礼包详情"
"navigationBarTitleText": "详情"
}
},
{
"path": "pages/card/card",
"style": {
"navigationBarTitleText": "礼包"
"navigationBarTitleText": "云菜窖"
}
},
{
@ -35,7 +35,7 @@
{
"path": "pages/card/card_bind",
"style": {
"navigationBarTitleText": "绑定礼包卡",
"navigationBarTitleText": "绑定云菜窖卡",
"enablePullDownRefresh": false
}
},
@ -44,7 +44,7 @@
{
"path": "pages/card/card_bind2",
"style": {
"navigationBarTitleText": "绑定礼包卡",
"navigationBarTitleText": "绑定云菜窖卡",
"enablePullDownRefresh": false
}
}, {
@ -81,6 +81,14 @@
{
"navigationBarTitleText" : "预约记录"
}
},
{
"path" : "pages/good/goodsDetail",
"style" :
{
"navigationBarTitleText" : "商品详情",
"enablePullDownRefresh" : false
}
}
],

28
pages/card/card.vue
View File

@ -4,13 +4,15 @@
<z-paging ref="paging" v-model="data" @query="queryList" :auto='true'>
<view @click="bind"
style="background: #f1f2f3;width: 100%;height: 35px;line-height: 35px;text-align: center;color: red;">
绑定新卡</view>
style="background: #f1f2f3;width: 100%;height: 35px;display: flex;flex-direction: row;justify-content: center;align-items: center;">
<image src="../../static/btn_bj.png" style="width: 15px;height: 15px;"></image>
<text style="line-height: 35px;text-align: center;color: red;margin-left: 5px;">绑定新卡</text>
</view>
<view style="display: flex;flex-direction: column;padding-top: 10px;">
<view v-for="(item,index) in data" style="display: flex;flex-direction: column;align-items: center;"
:class="item.showBtn==true?'oragin':'gray'" @click="detail(item.sid)">
<view v-for="(item,index) in data" :key="index" style="display: flex;flex-direction: column;align-items: center;"
:class="item.showBtn==true?'oragin':'gray'" @click="detail(item)">
<view
style="display: flex;flex-direction: column;border: 1px solid #e29a68;width: 90%;border-radius: 20rpx;margin-top: 8px;">
@ -94,10 +96,20 @@
url: '/pages/card/card_bind'
})
},
detail(sid) {
uni.navigateTo({
url: '/pages/card/card_detail?sid=' + sid
})
detail(item) {
if (item.state == '失效') {
// 记录
uni.navigateTo({
url: '/pages/card/card_record?sid=' + item.sid
})
} else {
// 详情
uni.navigateTo({
url: '/pages/card/card_detail?sid=' + item.sid
})
}
},
booking(sid) {
uni.navigateTo({

2
pages/card/card_bind.vue
View File

@ -5,7 +5,7 @@
<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="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="请输入/扫码 提货编码"

2
pages/card/card_bind2.vue
View File

@ -8,7 +8,7 @@
<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="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="请输入/扫码 提货编码"

20
pages/card/card_booking.vue
View File

@ -40,15 +40,15 @@
</view>
<view
style="display: flex;align-items: center;padding-right: 10px;margin-top: 6px;margin-bottom: 8px;">
<text style="flex-shrink: 0;font-size: 13px;margin-left: 10px;margin-right: 10px;">提货人员</text>
<input placeholder="请输入提货人员"
<text style="flex-shrink: 0;font-size: 13px;margin-left: 10px;margin-right: 10px; " decode="true">提&ensp;货&ensp;人</text>
<input placeholder="请输入提货人"
style="font-size: 30rpx;flex: 1;background: #F8F8F8;border-radius: 5px;height: 40px;line-height: 40px;padding-left: 10px;"
:value="data.userName" @input="onKeyInput1" />
</view>
<view
style="display: flex;align-items: center;padding-right: 10px;margin-top: 6px;margin-bottom: 8px;">
<text style="flex-shrink: 0;font-size: 13px;margin-left: 10px;margin-right: 10px;">手机号码</text>
<input maxlength="11" placeholder="请输入手机号码"
<text style="flex-shrink: 0;font-size: 13px;margin-left: 10px;margin-right: 10px;">联系电话</text>
<input maxlength="11" placeholder="请输入联系电话"
style="font-size: 30rpx;flex: 1;background: #F8F8F8;border-radius: 5px;height: 40px;line-height: 40px;padding-left: 10px;"
type="number" :value="data.userPhone" @input="onKeyInput2" />
</view>
@ -64,12 +64,14 @@
</view>
<view v-for="(item,index) in data.goodsVos"
style="display: flex;flex-direction: row;margin-top: 15px;">
<image :src="item.pic" style="width: 60px;height: 60px;flex-shrink: 0;"></image>
<image :src="item.pic" style="width: 60px;height: 60px;flex-shrink: 0;" @click="goodDetail(item.goodsSid)"></image>
<view
style="margin-left: 10px;margin-right: 10px;flex: 1;display: flex;flex-direction: column;justify-content: space-between;align-items: flex-end;">
<text class="text" style="font-weight: 500;width: 100%;">{{item.goods}}
</text>
<uni-number-box ref="box" :min="0" :max="item.lnum" v-model="item.select"
<text class="text" style="width: 100%;font-size: 12px; color: #666666;margin-top: 10px;">{{item.remarks}}
</text>
<uni-number-box ref="box" style="margin-top: -25px;" :min="0" :max="item.lnum" v-model="item.select"
:showTextView="page.showTextView"></uni-number-box>
</view>
</view>
@ -181,6 +183,12 @@
_this.shortToast('发生异常')
})
},
goodDetail(sid){
// 商品详情
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + sid
})
}
}
}

18
pages/card/card_detail.vue
View File

@ -36,15 +36,19 @@
<image src="../../static/mingxi.png" style="width: 15px;height: 15px;"></image>
<view style="margin-left: 10px;font-size: 14px;">商品明细</view>
</view>
<view v-for="(item,index) in data.goodsVos"
<view v-for="(item,index) in data.goodsVos" :key="index"
style="display: flex;flex-direction: row;margin-top: 15px;">
<image :src="item.pic" style="width: 60px;height: 60px;flex-shrink: 0;"></image>
<image :src="item.pic" style="width: 60px;height: 60px;flex-shrink: 0;" @click="goodDetail(item.goodsSid)"></image>
<view style="margin-left: 10px;margin-right: 10px;flex: 1;">
<text class="text" style="font-weight: 500;">{{item.goods}}
</text>
<view style="font-size: 12px;color: #666666;">剩余数量：{{item.lnum}}</view>
<view style="font-size: 12px;color: #666666;margin-top: 10px;">{{item.remarks}}</view>
</view>
<view style="display: flex;flex-direction: row;">
<text style="font-size: 12px;color: #666666;margin-right: 10px;">总数：{{item.num}}
</text>
<view style="font-size: 12px;color: #666666;">剩余：{{item.lnum}}</view>
</view>
<view style="flex-shrink: 0;font-size: 12px;color: #666666;">x{{item.num}}</view>
</view>
</view>
</view>
@ -119,6 +123,12 @@
uni.navigateTo({
url: '/pages/card/card_booking?sid=' + sid
})
},
goodDetail(sid){
// 商品详情
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + sid
})
}
}
}

8
pages/card/card_record.vue
View File

@ -62,6 +62,14 @@
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2)
})
// 无数据
if(_this.data.length==0){
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(100)
})
}
}).catch(e => {
// 错误 1
_this.$nextTick(() => {

22
pages/good/goodsDetail.vue
View File

@ -0,0 +1,22 @@
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

BIN
static/btn_bj.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 574 B

BIN
static/edit_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
static/gift3.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

9
uni_modules/loading-state/components/loading-state/loading-state.vue
View File

@ -12,6 +12,12 @@
<view v-if="state != 0 && state != 1">
<slot></slot>
</view>
<!-- 无数据 -->
<z-paging-empty-view v-if="state === 100" emptyViewText="没有数据哦~"
:emptyViewImg="notDataImg" @reload="reload">
</z-paging-empty-view>
</view>
</template>
<script>
@ -25,6 +31,9 @@
computed: {
errorImg() {
return zStatic.base64Error
},
notDataImg() {
return zStatic.base64Empty
}
},
methods: {

3
uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
View File

@ -14,7 +14,8 @@
'uni-calendar-item--disable':weeks.disable,
}">
<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text"
v-if="weeks.year!=null">{{weeks.date}}</text>
</view>
<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
</view>

10
uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
View File

@ -266,6 +266,7 @@
this.cale.setStartDate(val)
this.cale.setDate(this.nowDate.fullDate)
this.weeks = this.cale.weeks
console.log("this.weeks11 ",this.weeks )
},
endDate(val) {
// 字节小程序 watch 早于 created
@ -275,6 +276,7 @@
this.cale.setEndDate(val)
this.cale.setDate(this.nowDate.fullDate)
this.weeks = this.cale.weeks
console.log("this.weeks22 ",this.weeks )
},
selected(newVal) {
// 字节小程序 watch 早于 created
@ -283,6 +285,7 @@
}
this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
this.weeks = this.cale.weeks
console.log("this.weeks33 ",this.weeks )
},
pleStatus: {
immediate: true,
@ -318,9 +321,11 @@
if (which === 'left' && before) {
this.setDate(before)
this.weeks = this.cale.weeks
console.log("this.weeks44 ",this.weeks )
} else if(after) {
this.setDate(after)
this.weeks = this.cale.weeks
console.log("this.weeks55 ",this.weeks )
}
this.cale.lastHover = true
}
@ -410,6 +415,7 @@
// 设置范围选
this.cale.setHoverMultiple(this.calendar.fullDate)
this.weeks = this.cale.weeks
console.log("this.weeks66 ",this.weeks )
// hover时，进入一个日历，更新另一个
if (this.firstEnter) {
this.$emit('firstEnterCale', this.cale.multipleStatus)
@ -583,6 +589,7 @@
// 设置多选
this.cale.setMultiple(this.calendar.fullDate, true)
this.weeks = this.cale.weeks
console.log("this.weeks77 ",this.weeks )
this.tempSingleDate = this.calendar.fullDate
const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
const afterDate = new Date(this.cale.multipleStatus.after).getTime()
@ -611,8 +618,11 @@
* @param {Object} date
*/
setDate(date) {
console.log("this.weeks88 ",date )
this.cale.setDate(date)
console.log("this.weeks88 ",this.cale )
this.weeks = this.cale.weeks
console.log("this.weeks88 ",this.weeks )
this.nowDate = this.cale.getInfo(date)
}
}

Write Preview
Loading…
Cancel
Save