Browse Source

1111111111

master
guoxing 1 year ago
parent
commit
7a7da3c558
  1. 2
      common/config.js
  2. 10
      pages/bind/bind_cloudCard.vue
  3. 26
      pages/good/reservation.vue
  4. 6
      pages/good/shoppCart.vue
  5. 7
      pages/good/transfer.vue
  6. 2
      pages/home/cloudCard2.vue
  7. 2
      pages/home/myCellar.vue
  8. 3
      pages/home/myHome.vue
  9. 10
      pages/records/orderDetail.vue
  10. 2
      pages/records/reservationRecords3.vue
  11. 2
      pages/records/reservationRecords4.vue
  12. 2
      pages/records/transferRecords.vue
  13. 2
      pages/records/transferRecords2.vue

2
common/config.js

@ -10,7 +10,7 @@ module.exports = {
// baseUrl: 'https://lpk.yyundong.com/lpkapi', // 测试服务器
// baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器
baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
tokenName: "Authorization", // 请求头中token的名字,与服务器端对应
// tokenName: "Authorization", // 请求头中token的名字,与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下,服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面
}

10
pages/bind/bind_cloudCard.vue

@ -27,23 +27,23 @@
<!-- <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: row;align-items: center;box-sizing: border-box;" @click="itemClick(item.goodsSid)">
<view style="display: flex;flex-direction: row;align-items: center;box-sizing: border-box;" >
<image :src="item.goodsPicUrl" mode="aspectFill"
<image :src="item.goodsPicUrl" mode="aspectFill" @click="itemClick(item.goodsSid)"
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>
style="color: #000;font-size: 14px;font-weight: 600;font-family: sans-serif;" @click="itemClick(item.goodsSid)">{{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>
<!-- <text
style="margin-left: 10px;color: #E36443;border: 1px #E36443 solid;border-radius: 8px;padding: 1px 10px;font-size: 12px;">{{item.price}}</text> -->
</view>

26
pages/good/reservation.vue

@ -116,12 +116,12 @@
" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
<view style="width: 100%; display: flex;flex-direction: column; margin-top: 10px;">
<view v-for="(item,index) in pickingUpGoods" @click="itemClick(item.goodsSid)"
<view v-for="(item,index) in pickingUpGoods"
style="display: flex;flex-direction: column;justify-content: center;width: 100%; margin-top: 15px; ">
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
<image :src="item.iconUrl"
<image :src="item.iconUrl" @click="itemClick(item.goodsSid)"
style="width: 90px;height: 90px; border-radius: 10px; " mode="aspectFill">
</image>
@ -129,7 +129,7 @@
style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;"
:style="{'border-bottom':(index == pickingUpGoods.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>
@ -192,11 +192,11 @@
</view>
<view
<view
style="position: fixed;bottom: 0; width: 100%; box-sizing: border-box; padding-left: 10vw;padding-right: 10vw;display: flex;flex-direction: row; justify-content: center;align-items: center;">
<text style=" background: #FF9900;color: #fff;margin-bottom: 20px; border-radius: 20px;
padding-top: 10px;padding-bottom: 10px;padding-left: 25vw;padding-right: 25vw; text-align: center;"
@click="congirmExtract()">确认提菜</text>
@click="congirmExtract()" >确认提菜</text>
</view>
</view>
@ -217,6 +217,7 @@
disabledDate: [
// '2023-12-16'
],
btnDisabled:false
}
},
onLoad(options) {
@ -252,6 +253,11 @@
uni.$off('changePer');
},
methods: {
itemClick(goodsSid) {
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + goodsSid
})
},
getSun() {
let _this = this
_this.$api.getExtractSaturAndSun().then((resp) => {
@ -324,6 +330,13 @@
congirmExtract() {
let _this = this
if(this.btnDisabled){
this.shortToast('请勿重复点击')
return
}
this.btnDisabled = true
if (_this.info.storeSid == '') {
this.shortToast('请完善提货点信息')
return
@ -357,7 +370,6 @@
return
}
var params = {
customerSid: getApp().globalData.sid,
affiliation: _this.affiliation,
@ -371,8 +383,10 @@
_this.$api.submissionExtract(params).then((resp) => {
uni.navigateBack()
_this.btnDisabled = false
}).catch(e => {
console.log(e);
_this.btnDisabled = false
})
},
}

6
pages/good/shoppCart.vue

@ -7,18 +7,18 @@
bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll"> -->
<view style="width: 100%; display: flex;flex-direction: column;">
<view v-for="(item,index) in data" @click="itemClick(item.goodsSid)" style="display: flex;flex-direction: column;justify-content: center; margin: 10px 10px 0px 10px;
<view v-for="(item,index) in data" style="display: flex;flex-direction: column;justify-content: center; margin: 10px 10px 0px 10px;
padding: 10px; border-radius: 15px; background-color: #fff; ">
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
<image :src="item.iconUrl" @click="itemClick(item.goodsSid)" style="width: 90px;height: 90px; border-radius: 10px; "
mode="aspectFill"></image>
<view style="display: flex;flex-direction: column;flex: 1;
margin-left: 10px;">
<text style="font-size: 13px;color: #000;">{{item.goodsName}}</text>
<text style="font-size: 13px;color: #000;" @click="itemClick(item.goodsSid)">{{item.goodsName}}</text>
<text style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remarks}}</text>

7
pages/good/transfer.vue

@ -23,7 +23,7 @@
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>
@ -136,6 +136,11 @@
this.$refs.nav.defaultColorBgAlpha(res)
},
methods: {
itemClick(goodsSid) {
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + goodsSid
})
},
onKeyInput(event) {
this.transferInfo.remarks = event.target.value
},

2
pages/home/cloudCard2.vue

@ -82,7 +82,7 @@
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
<image :src="item.iconUrl"
<image :src="item.iconUrl" @click="itemClick(item.goodsSid)"
style="width: 90px;height: 90px; border-radius: 10px; " mode="aspectFill">
</image>

2
pages/home/myCellar.vue

@ -64,7 +64,7 @@
<text v-if="item.state == '1'" style="opacity: 0.7; font-size: 14px;font-weight: 600;font-family: sans-serif;z-index: 101;
margin-top: 30px; margin-left: 5px; width: 80px; height: 30px;line-height: 30px; text-align: center; background: #6d6d6d;
position: absolute;border-radius: 20px;color: #fff;">已失效</text>
<image :src="item.iconUrl"
<image :src="item.iconUrl" @click="itemClick(item.goodsSid)"
style="width: 90px;height: 90px; border-radius: 10px;z-index: 100;"
mode="aspectFill"></image>

3
pages/home/myHome.vue

@ -262,7 +262,8 @@
methods: {
makePhoneCall() {
wx.makePhoneCall({
phoneNumber: '15632127890',
// phoneNumber: '15632127890',
phoneNumber: '15511457061',
})
},

10
pages/records/orderDetail.vue

@ -17,7 +17,7 @@
<view v-for="(item,index) in data.ordOrderDetails"
style=" display: flex;flex-direction: row;align-items: center; margin-bottom: 15px;">
<image :src="item.picUrl" style="width: 70px;height: 70px;border-radius: 15px;" mode="scaleToFill">
<image :src="item.picUrl" @click="itemClick(item.goodsSid)" style="width: 70px;height: 70px;border-radius: 15px;" mode="scaleToFill">
</image>
<view style="margin-left: 10px;display: flex;flex-direction: column;flex: 1;">
@ -25,7 +25,7 @@
<view style="display: flex;flex-direction: row;width: 100%;">
<text
style="flex: 1;font-weight: 600;font-family: sans-serif;font-size: 14px;">{{item.goodsName}}</text>
style="flex: 1;font-weight: 600;font-family: sans-serif;font-size: 14px;" @click="itemClick(item.goodsSid)">{{item.goodsName}}</text>
<text
style="font-weight: 600;font-family: sans-serif;font-size: 14px;">{{item.pricePart}}</text>
</view>
@ -168,8 +168,12 @@
this.request()
},
methods: {
itemClick(goodsSid) {
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + goodsSid
})
},
//
request() {
let _this = this

2
pages/records/reservationRecords3.vue

@ -16,7 +16,7 @@
<view class="item-top" style="margin-left: 16px;margin-right: 16px;">
<text class="item-top-code">预约单号{{item.reserveCode}}</text>
<text class="item-top-code">预约单号{{item.newCode}}</text>
<text class="item-top-state">{{item.stateValue}}</text>
</view>

2
pages/records/reservationRecords4.vue

@ -16,7 +16,7 @@
<view class="item-top" style="margin-left: 16px;margin-right: 16px;">
<text class="item-top-code">预约单号{{item.reserveCode}}</text>
<text class="item-top-code">预约单号{{item.newCode}}</text>
<text class="item-top-state">{{item.stateValue}}</text>
</view>
<view

2
pages/records/transferRecords.vue

@ -9,7 +9,7 @@
<view class="item">
<text class="item_left">转赠单号</text>
<text class="item_rifht">{{item.transferCode}}</text>
<text class="item_rifht">{{item.newCode}}</text>
</view>
<view class="item">
<text class="item_left">转赠时间</text>

2
pages/records/transferRecords2.vue

@ -9,7 +9,7 @@
<view class="item">
<text class="item_left">转赠单号</text>
<text class="item_rifht">{{item.transferCode}}</text>
<text class="item_rifht">{{item.newCode}}</text>
</view>
<view class="item">
<text class="item_left">转赠时间</text>

Loading…
Cancel
Save