myTest383 6 months ago
parent
commit
80c3c6edc4
  1. 4
      common/config.js
  2. 31
      common/request.api.js
  3. 6
      components/NavBar/NavBar.vue
  4. 2
      custom-tab-bar/index.js
  5. 2
      custom-tab-bar/index.wxss
  6. 13
      pages.json
  7. 13
      pages/SelectAddressActivity.vue
  8. 30
      pages/bind/bind_cloudCard.vue
  9. 6
      pages/bind/bind_pickUpCard2.vue
  10. 2
      pages/card/card_detail.vue
  11. 2
      pages/card/card_detail2.vue
  12. 2
      pages/detail/detail_affeection.vue
  13. 2
      pages/detail/detail_affeection2.vue
  14. 2
      pages/detail/detail_enterprise.vue
  15. 2
      pages/detail/detail_enterprise2.vue
  16. 2
      pages/detail/detail_family.vue
  17. 2
      pages/detail/detail_family2.vue
  18. 2
      pages/enterprise/corporate_card_detail.vue
  19. 2
      pages/enterprise/corporate_card_detail2.vue
  20. 2
      pages/enterprise/welfare_card_detail.vue
  21. 2
      pages/enterprise/welfare_card_detail2.vue
  22. 8
      pages/good/changePersonnel.vue
  23. 20
      pages/good/goodsDetail.vue
  24. 5
      pages/good/goodsDetail2.vue
  25. 79
      pages/good/reservation.vue
  26. 424
      pages/good/reservation2.vue
  27. 13
      pages/good/transfer.vue
  28. 32
      pages/home/cloudCard2.vue
  29. 63
      pages/home/myCellar.vue
  30. 6
      pages/home/myHome.vue
  31. 2
      pages/me/RealInfo.vue
  32. 23
      pages/me/addInvoice.vue
  33. 14
      pages/me/makeInvoice.vue
  34. 5
      pages/records/orderDetail.vue
  35. 4
      pages/records/orderRecords.vue
  36. 2
      pages/records/reservationRecords.vue
  37. 2
      pages/records/reservationRecords2.vue
  38. 23
      pages/records/reservationRecords3.vue
  39. 35
      pages/records/reservationRecords4.vue
  40. 4
      pages/records/transferRecords.vue
  41. 4
      pages/records/transferRecords2.vue
  42. 8
      uni_modules/common-pay/pages/pay/pay.vue
  43. 9
      uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

4
common/config.js

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

31
common/request.api.js

@ -71,11 +71,15 @@ export default {
// 自选菜窖 商品信息 // 自选菜窖 商品信息
getAllGiftBag: (params = {}) => request.get("/lpkgoods/getAllGiftBag", params), getAllGiftBag: (params = {}) => request.get("/lpkgoods/getAllGiftBag", params),
// 結算商品 // 結算商品
createOrder: (params = {}) => request.post("/empsreservoorder/createOrder", params), // createOrder: (params = {}) => request.post("/empsreservoorder/createOrder", params),
createOrder: (params = {}) => request.post("/order/createOrder", params),
// 预约记录 // 预约记录
orderListByUserSid: (params = {}) => request.post("/lpksreservoorder/orderListByUserSid", params, {}, {}), orderListByUserSid: (params = {}) => request.post("/lpksreservoorder/orderListByUserSid", params, {}, {}),
// 取消预约记录 // 取消预约记录
cancelReservation: (params = {}) => request.get("/lpksreservoorders/cancelReservation/" + params, params, {}, {}), cancelReservation: (params = {}) => request.get("/lpksreservoorders/cancelReservation/" + params, params, {}, {}),
// 取消预约记录 客户手动填写地址 2024-12-26
cancelReservation2: (params = {}) => request.get("/vegecellarreserveorder/cancelReservation/" + params,
params, {}, {}),
// 转赠记录 // 转赠记录
transferRecordsList: (params = {}) => request.post("/transferrecords/transferRecordsList", params, {}, {}), transferRecordsList: (params = {}) => request.post("/transferrecords/transferRecordsList", params, {}, {}),
@ -107,14 +111,20 @@ export default {
saveTuiJianZhiHang: (params = {}) => request.formpost("/lpkcustomer/updateCustomerBank", params), saveTuiJianZhiHang: (params = {}) => request.formpost("/lpkcustomer/updateCustomerBank", params),
// 我的 预约记录 // 我的 预约记录
myOrderListByUserSid: (params = {}) => request.post("/lpksreservoorders/orderListByUserSid", params, {}, {}), myOrderListByUserSid: (params = {}) => request.post("/lpksreservoorders/orderListByUserSid", params, {}, {}),
// 我的 预约记录 客户手动填写地址 2024-12-26
myOrderListByUserSid2: (params = {}) => request.post("/vegecellarreserveorder/orderListByUserSid", params, {}, {}),
// 我的 订单列表 // 我的 订单列表
ordersList: (params = {}) => request.post("/empsreservoorder/ordersList", params, {}, {}), // ordersList: (params = {}) => request.post("/empsreservoorder/ordersList", params, {}, {}),
ordersList: (params = {}) => request.post("/order/ordersList", params, {}, {}),
// 我的 订单详情 // 我的 订单详情
orderDetails: (params = {}) => request.get("/empsreservoorder/OrderDetails/" + params, params, {}, {}, true), // orderDetails: (params = {}) => request.get("/empsreservoorder/OrderDetails/" + params, params, {}, {}, true),
orderDetails: (params = {}) => request.get("/order/OrderDetails/" + params, params, {}, {}, true),
// 我的 订单详情 修改订单状态 // 我的 订单详情 修改订单状态
changePayState: (params = {}) => request.get("/empsreservoorder/changePayState/" + params, params, {}, {}, true), // changePayState: (params = {}) => request.get("/empsreservoorder/changePayState/" + params, params, {}, {}, true),
changePayState: (params = {}) => request.get("/order/changePayState/" + params, params, {}, {}, true),
// 订单发票获取授权页链接 // 订单发票获取授权页链接
wxElectronicInvoice: (params = {}) => request.post("/empsreservoorder/wxElectronicInvoice", params, {}, {}), // wxElectronicInvoice: (params = {}) => request.post("/empsreservoorder/wxElectronicInvoice", params, {}, {}),
wxElectronicInvoice: (params = {}) => request.post("/order/wxElectronicInvoice", params, {}, {}),
// 我的 失效商品 // 我的 失效商品
vegeCellarInvalidList: (params = {}) => request.post("/lpkgoods/vegeCellarInvalidList", params, {}, {}), vegeCellarInvalidList: (params = {}) => request.post("/lpkgoods/vegeCellarInvalidList", params, {}, {}),
@ -153,7 +163,8 @@ export default {
// 结算 跳过支付 // 结算 跳过支付
saveGoods: (params = {}) => request.post("/vegetablecellar/saveGoods", params), saveGoods: (params = {}) => request.post("/vegetablecellar/saveGoods", params),
// 正式结算 支付 // 正式结算 支付
createVegeOrder: (params = {}) => request.post("/empsreservoorder/createVegeOrder", params), // createVegeOrder: (params = {}) => request.post("/empsreservoorder/createVegeOrder", params),
createVegeOrder: (params = {}) => request.post("/order/createVegeOrder", params),
// 我的菜窖 通知公告 // 我的菜窖 通知公告
@ -161,7 +172,8 @@ export default {
// 我的菜窖 新人礼包列表 // 我的菜窖 新人礼包列表
newUserQuota: (params = {}) => request.post("/appletgiftbag/newUserQuota", params), newUserQuota: (params = {}) => request.post("/appletgiftbag/newUserQuota", params),
// 结算新人礼包 支付 // 结算新人礼包 支付
createNewUserBagOrder: (params = {}) => request.post("/empsreservoorder/createNewUserBagOrder", params), // createNewUserBagOrder: (params = {}) => request.post("/empsreservoorder/createNewUserBagOrder", params),
createNewUserBagOrder: (params = {}) => request.post("/order/createNewUserBagOrder", params),
// 我的菜窖 类型列表 // 我的菜窖 类型列表
vegeCellarTypeList: (params = {}) => request.post("/lpkgoods/vegeCellarTypeList", params), vegeCellarTypeList: (params = {}) => request.post("/lpkgoods/vegeCellarTypeList", params),
// 我的菜窖 商品列表 // 我的菜窖 商品列表
@ -175,10 +187,13 @@ export default {
// 我的菜窖 绑定之前发出的礼品卡 // 我的菜窖 绑定之前发出的礼品卡
bindAllCard: (params = {}) => request.post("/lpkgiftcard/bindAllCard", params), bindAllCard: (params = {}) => request.post("/lpkgiftcard/bindAllCard", params),
// 我的菜窖 预约提菜 // 我的菜窖 预约提菜
getStoreBySid: (params = {}) => request.get("/customerstore/getStoreBySid/" + params, params), getStoreBySid: (params = {}) => request.get("/customerstore/getStoreBySid/" + params.customerSid + "/" + params
.delivery, {}, {}, {}, true),
// 我的菜窖 预约提菜 选择时间范围 // 我的菜窖 预约提菜 选择时间范围
getExtractSaturAndSun: (params = {}) => request.get("/customerstore/isSaturAndSun", params), getExtractSaturAndSun: (params = {}) => request.get("/customerstore/isSaturAndSun", params),
// 我的菜窖 保存预约提菜 // 我的菜窖 保存预约提菜
submissionExtract: (params = {}) => request.post("/lpksreservoorders/submission", params, {}, {}, true), submissionExtract: (params = {}) => request.post("/lpksreservoorders/submission", params, {}, {}, true),
// 预约提货 客户手动填写地址 2024-12-26
submissionExtract2: (params = {}) => request.post("/vegecellarreserveorder/submission", params, {}, {}, true),
} }

6
components/NavBar/NavBar.vue

@ -54,7 +54,7 @@
/** /**
* 全局默认背景透明supportChange= false 会对默认色变成不透明 * 全局默认背景透明supportChange= false 会对默认色变成不透明
*/ */
const defaultTransparentBg = "linear-gradient(89.26deg, rgba(254,144,56,0) 0.75%,rgba(255,177,118,0) 99.78%)"; const defaultTransparentBg = "linear-gradient(89.26deg, rgba(97,204,44,0) 0.75%,rgba(128,200,90,0) 99.78%)";
export default { export default {
name: "NavBar", name: "NavBar",
@ -161,8 +161,8 @@
*/ */
defaultColorBgAlpha(res) { defaultColorBgAlpha(res) {
let x = this.alpha(res) let x = this.alpha(res)
this.navBackground = "linear-gradient(89.26deg, rgba(254,144,56," + x + this.navBackground = "linear-gradient(89.26deg, rgba(97,204,44," + x +
") 0.75%,rgba(255,177,118," + x + ") 99.78%)" ") 0.75%,rgba(128,200,90," + x + ") 99.78%)"
}, },
clickIcon() { clickIcon() {
// uni.navigateBack() // uni.navigateBack()

2
custom-tab-bar/index.js

@ -3,7 +3,7 @@ Component({
selected: 0, selected: 0,
"color": "#FFEEE1", "color": "#FFEEE1",
"selectedColor": "#FFFFFF", "selectedColor": "#FFFFFF",
"backgroundColor": "#F69448", "backgroundColor": "#60CA2C",
list: [ list: [
// { // {
// "pagePath": "/pages/home/cloudCard", // "pagePath": "/pages/home/cloudCard",

2
custom-tab-bar/index.wxss

@ -10,7 +10,7 @@
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
/* 加载背景图 */ /* 加载背景图 */
background-image: url(https://supervise.yxtsoft.com/lpk/image/bom_navigation.png); background-image: url(https://supervise.yxtsoft.com/lpk/image/bom_navigation_new.png);
/* 让背景图基于容器大小伸缩 */ /* 让背景图基于容器大小伸缩 */
background-size: 100% 100%; background-size: 100% 100%;
/* padding-bottom: env(safe-area-inset-bottom); */ /* padding-bottom: env(safe-area-inset-bottom); */

13
pages.json

@ -298,6 +298,13 @@
"disableScroll": true "disableScroll": true
} }
}, },
{
"path": "pages/good/reservation2",
"style": {
"navigationStyle": "custom",
"disableScroll": true
}
},
{ {
"path": "pages/good/changePersonnel", "path": "pages/good/changePersonnel",
"style": { "style": {
@ -435,15 +442,15 @@
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarTitleText": "惠享云菜窖", "navigationBarTitleText": "惠享云菜窖",
"navigationBarBackgroundColor": "#FE9039", "navigationBarBackgroundColor": "#60CA2C",
"backgroundColor": "#FE9039" "backgroundColor": "#60CA2C"
}, },
"tabBar": { "tabBar": {
"custom": true, //tabBar "custom": true, //tabBar
"color": "#FFEEE1", "color": "#FFEEE1",
"selectedColor": "#191919", "selectedColor": "#191919",
"borderStyle": "white", "borderStyle": "white",
"backgroundColor": "#F69448", "backgroundColor": "#60CA2C",
"list": [ "list": [
// { // {
// "pagePath": "pages/home/cloudCard", // "pagePath": "pages/home/cloudCard",

13
pages/SelectAddressActivity.vue

@ -1,6 +1,6 @@
<template> <template>
<view> <view>
<view style="position: sticky;top: 0;background-color: #FE9039;"> <view style="position: sticky;top: 0;background-color: #60CA2C;">
<view class="search-container"> <view class="search-container">
<!-- 搜索框 --> <!-- 搜索框 -->
<view class="search-container-bar"> <view class="search-container-bar">
@ -23,7 +23,8 @@
<loading-state ref="pageView" @request="request"> <loading-state ref="pageView" @request="request">
<!-- 搜索联想 --> <!-- 搜索联想 -->
<view style="display: flex;flex-direction: column;background: #FFFFFF; <view
style="display: flex;flex-direction: column;background: #FFFFFF;
border-top-left-radius: 30px;border-top-right-radius: 30px; padding:10px 20px;margin-top: 10px;box-sizing: border-box;padding-bottom: 0px;" border-top-left-radius: 30px;border-top-right-radius: 30px; padding:10px 20px;margin-top: 10px;box-sizing: border-box;padding-bottom: 0px;"
v-for="(item,index) in dataList" :key="index"> v-for="(item,index) in dataList" :key="index">
<!-- <!--
@ -96,7 +97,8 @@
padding-left: 30px;padding-right:30px;"> padding-left: 30px;padding-right:30px;">
<view class="btn" @click.stop="phone(item.phone)"> <view class="btn" @click.stop="phone(item.phone)">
<image src="https://supervise.yxtsoft.com/lpk/image/phone.png" style="width: 20px;height: 20px;"> <image src="https://supervise.yxtsoft.com/lpk/image/phone.png"
style="width: 20px;height: 20px;">
</image> </image>
<text style="margin-left: 5px;font-size: 14px; color: #666;">电话咨询</text> <text style="margin-left: 5px;font-size: 14px; color: #666;">电话咨询</text>
</view> </view>
@ -196,7 +198,8 @@
margin-top: 10px; margin-top: 10px;
border: 1px solid #FEA561; border: 1px solid #FEA561;
border-radius: 20px; border-radius: 20px;
display: flex;flex-direction: row; display: flex;
flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 5px 10px; padding: 5px 10px;
@ -237,7 +240,7 @@
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
background: #FE9039; background: #60CA2C;
} }
} }
} }

30
pages/bind/bind_cloudCard.vue

@ -15,8 +15,8 @@
<view <view
style="height: calc(100vh - 75vw - 98px); overflow: scroll; padding-left: 12px;padding-right: 12px;padding-bottom: 24px;box-sizing: border-box;"> 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="display: flex;flex-direction: row;align-items: center;">
<view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #32ff00; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #d1ff7c; 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> </view>
<view v-for="(item,index) in data.list" <view v-for="(item,index) in data.list"
@ -36,12 +36,19 @@
<text style="color: #000;font-size: 14px;font-weight: 600;font-family: sans-serif;" <text style="color: #000;font-size: 14px;font-weight: 600;font-family: sans-serif;"
@click="itemClick(item.goodsSid)">{{item.goodsName}}</text> @click="itemClick(item.goodsSid)">{{item.goodsName}}</text>
<text style="margin-top: 6px;color: #999;font-size: 12px;">{{item.goodsContent}}</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;"> <view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
<text style="color: #E36443;font-size: 12px;">{{item.goodsFs}}</text> <text
<text style="color: #E36443;margin-left: 10px;font-size: 12px;">{{item.goodsJs}}</text> style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
<text v-show="item.remarks!=''" style="margin-left: 10px; border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.remarks}}</text>
<!-- <text style="color: #E36443;font-size: 12px;">{{item.goodsFs}}</text>
<text style="color: #E36443;margin-left: 10px;font-size: 12px;">{{item.goodsJs}}</text> -->
<!-- <text <!-- <text
style="margin-left: 10px;color: #E36443;border: 1px #E36443 solid;border-radius: 8px;padding: 1px 10px;font-size: 12px;">{{item.price}}</text> --> style="margin-left: 10px;color: #E36443;border: 1px #E36443 solid;border-radius: 8px;padding: 1px 10px;font-size: 12px;">{{item.price}}</text> -->
@ -49,6 +56,11 @@
</view> </view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 5px;">
<text style="font-size: 14px;color: #FF5006;">{{item.goodsFs}}</text>
</view>
</view> </view>
</view> </view>
@ -58,8 +70,8 @@
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;" <view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;"
v-if="data.remarks!=''"> v-if="data.remarks!=''">
<view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #32ff00; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #d1ff7c; 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> </view>
@ -75,7 +87,7 @@
<text <text
style=" text-align: center;width: 100%;color: #4F4F4F;font-size: 12px;margin-top: 12px;">温馨提示:您的好友赠送您一份心意请接收</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); <view style="background: -webkit-linear-gradient(left,#d1ff7c,#32ff00);
width: 100%;border-radius: 25px;height: 50px;text-align: center; width: 100%;border-radius: 25px;height: 50px;text-align: center;
margin-top: 12px;line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="save"> margin-top: 12px;line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="save">
接收</view> 接收</view>

6
pages/bind/bind_pickUpCard2.vue

@ -43,8 +43,8 @@
<view style="display: flex;flex-direction: column;padding:20px;"> <view style="display: flex;flex-direction: column;padding:20px;">
<view style="display: flex;flex-direction: row;align-items: center;"> <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: #32ff00; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #d1ff7c; 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> </view>
@ -67,7 +67,7 @@
type="number" :value="page.codeKey" @input="onKeyInput2" /> type="number" :value="page.codeKey" @input="onKeyInput2" />
</view> </view>
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px; <view style="background: -webkit-linear-gradient(left,#d1ff7c,#32ff00); position: absolute; bottom: 30px;
width: 90%;border-radius: 100rpx;height: 80rpx;display: flex; 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"> flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;" @click="save">
接收</view> 接收</view>

2
pages/card/card_detail.vue

@ -530,7 +530,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', // title: '-',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

2
pages/card/card_detail2.vue

@ -244,7 +244,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', // title: '-',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

2
pages/detail/detail_affeection.vue

@ -610,7 +610,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链ss-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4

2
pages/detail/detail_affeection2.vue

@ -276,7 +276,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4

2
pages/detail/detail_enterprise.vue

@ -620,7 +620,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4

2
pages/detail/detail_enterprise2.vue

@ -272,7 +272,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4

2
pages/detail/detail_family.vue

@ -613,7 +613,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4

2
pages/detail/detail_family2.vue

@ -276,7 +276,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4

2
pages/enterprise/corporate_card_detail.vue

@ -545,7 +545,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', // title: '-',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share.png', // 5:4
success: function(res) { success: function(res) {

2
pages/enterprise/corporate_card_detail2.vue

@ -231,7 +231,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', // title: '-',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share.png', // 5:4
success: function(res) { success: function(res) {

2
pages/enterprise/welfare_card_detail.vue

@ -513,7 +513,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', // title: '-',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

2
pages/enterprise/welfare_card_detail2.vue

@ -233,7 +233,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', // title: '-',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

8
pages/good/changePersonnel.vue

@ -3,7 +3,7 @@
<view <view
style="display: flex;flex-direction: column; background: #f7f7f7;height: 100%;box-sizing: border-box;position: absolute;width: 100%;"> style="display: flex;flex-direction: column; background: #f7f7f7;height: 100%;box-sizing: border-box;position: absolute;width: 100%;">
<NavBar ref="nav" navTitle="提货人信息" :showIcon="true" :supportChange="false"> <NavBar ref="nav" navTitle="联系人信息" :showIcon="true" :supportChange="false">
</NavBar> </NavBar>
<view style="display: flex;flex-direction: column; margin: 10px; border-radius: 15px; background: #fff; <view style="display: flex;flex-direction: column; margin: 10px; border-radius: 15px; background: #fff;
@ -11,9 +11,9 @@
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<text style="font-size: 14px;color: #999;">提货</text> <text style="font-size: 14px;color: #999;">联系</text>
<input placeholder="请输入提货人" style="font-size: 25rpx;flex: 1;height: 35px;line-height: 35px;padding-left: 10px;padding-right: 10px; margin-left: 15px; <input placeholder="请输入联系人" style="font-size: 25rpx;flex: 1;height: 35px;line-height: 35px;padding-left: 10px;padding-right: 10px; margin-left: 15px;
border-bottom: 1px #EFEFEF solid;padding-bottom: 1px;" :value="page.name" @input="onKeyInput1" /> border-bottom: 1px #EFEFEF solid;padding-bottom: 1px;" :value="page.name" @input="onKeyInput1" />
</view> </view>
@ -29,7 +29,7 @@
<view <view
style=" width: 100%; box-sizing: border-box; padding-left: 10vw;padding-right: 10vw;display: flex;flex-direction: row; justify-content: center;align-items: center;"> style=" 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-top: 20px;margin-bottom: 20px; border-radius: 20px; <text style=" background: #60CA2C;color: #fff;margin-top: 20px;margin-bottom: 20px; border-radius: 20px;
padding-top: 10px;padding-bottom: 10px;padding-left: 25vw;padding-right: 25vw; text-align: center;" padding-top: 10px;padding-bottom: 10px;padding-left: 25vw;padding-right: 25vw; text-align: center;"
@click="confirm()">确认</text> @click="confirm()">确认</text>
</view> </view>

20
pages/good/goodsDetail.vue

@ -1,7 +1,7 @@
<template> <template>
<view style="height: 100vh;background: #fff;"> <view style="height: 100vh;background: #fff;">
<loading-state ref="pageView" @request="request"> <loading-state ref="pageView" @request="request">
<view style="height: 85vh;overflow: hidden;overflow-y: auto;"> <view style="height: 100vh;overflow: hidden;overflow-y: auto;">
<image :src="data.picUrl" style="width: 100vw;height: 80vw;" mode="scaleToFill"></image> <image :src="data.picUrl" style="width: 100vw;height: 80vw;" mode="scaleToFill"></image>
<view style="display: flex;flex-direction: column;background: #fff;padding: 20px 20px 0px 20px;margin-top: 10px; <view style="display: flex;flex-direction: column;background: #fff;padding: 20px 20px 0px 20px;margin-top: 10px;
@ -14,19 +14,19 @@
</view> </view>
<view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;"> <view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;">
<text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text> <text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text>
<text <text
style="font-size: 13px;color: #999;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text> style="font-size: 13px;color: #999;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;"> <view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;">
<text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text> <text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text>
<text style="font-size: 13px;color: #999;">{{data.remarks}}</text> <text style="font-size: 13px;color: #999;">{{data.remarks}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;"> <view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;">
<view style="width: 2px;height: 15px;background: #FF7A11;margin-right: 10px;"></view> <view style="width: 2px;height: 15px;background: #61CB29;margin-right: 10px;"></view>
<text style="font-size: 14px;font-weight: 600;font-family: sans-serif;color: #333;">商品详情</text> <text style="font-size: 14px;font-weight: 600;font-family: sans-serif;color: #333;">商品详情</text>
</view> </view>
@ -40,9 +40,9 @@
</view> </view>
</loading-state> </loading-state>
<view <!-- <view
style="position: absolute; bottom: 0px; display: flex;flex-direction: column;width: 100%; style="position: absolute; bottom: 0px; display: flex;flex-direction: column;width: 100%;
box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 12vh;border-top: 1px solid #EFEFEF;"> box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 12vh;border-top: 1px solid #EFEFEF;"> -->
<!-- <view <!-- <view
style="display: flex;flex-direction: row;align-items: center; justify-content: center; margin-top:10px;"> style="display: flex;flex-direction: row;align-items: center; justify-content: center; margin-top:10px;">
@ -69,11 +69,11 @@
</view> </view>
</view> --> </view> -->
<view <!-- <view
style="display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 10px;padding: 0px 10px;margin-bottom: 20px;"> style="display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 10px;padding: 0px 10px;margin-bottom: 20px;">
<text style="background: #FF9900; color: #fff;font-size: 14px; padding: 0px 15px;height: 50px;line-height:50px;flex: 1;text-align: center; <text style="background: #FF9900; color: #fff;font-size: 14px; padding: 0px 15px;height: 50px;line-height:50px;flex: 1;text-align: center;
border: 1px #FF9900 solid; border-radius: 25px;" @click="showDialog()">加入购物车</text> border: 1px #FF9900 solid; border-radius: 25px;" @click="showDialog()">加入购物车</text> -->
<!-- <view style="border: 1px #FF9900 solid;border-top-right-radius: 25px; border-bottom-right-radius: 25px;padding: 0px 5px;height: 50px;line-height:50px;flex: 1; <!-- <view style="border: 1px #FF9900 solid;border-top-right-radius: 25px; border-bottom-right-radius: 25px;padding: 0px 5px;height: 50px;line-height:50px;flex: 1;
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;" display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;"
@ -89,8 +89,8 @@
</view> </view>
</view> --> </view> -->
</view> <!-- </view> -->
</view> <!-- </view> -->
<!-- 弹窗蒙版 --> <!-- 弹窗蒙版 -->

5
pages/good/goodsDetail2.vue

@ -14,15 +14,16 @@
</view> </view>
<view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;"> <view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;">
<text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text> <text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text>
<text <text
style="font-size: 13px;color: #999;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text> style="font-size: 13px;color: #999;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;"> <view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;">
<text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text> <text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text>
<text style="font-size: 13px;color: #999;">{{data.remarks}}</text> <text style="font-size: 13px;color: #999;">{{data.remarks}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;"> <view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;">
<view style="width: 2px;height: 15px;background: #FF7A11;margin-right: 10px;"></view> <view style="width: 2px;height: 15px;background: #FF7A11;margin-right: 10px;"></view>

79
pages/good/reservation.vue

@ -1,5 +1,5 @@
<template> <template>
<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;"> <view style="width: 100%;height: 100%;background: #60CA2C;display: flex;flex-direction: column;">
<NavBar ref="nav" navTitle="预约提货" :showIcon="true" :supportChange="false"> <NavBar ref="nav" navTitle="预约提货" :showIcon="true" :supportChange="false">
</NavBar> </NavBar>
@ -14,7 +14,7 @@
<view style="display: flex;flex-direction: column;background: #fff; <view style="display: flex;flex-direction: column;background: #fff;
border-radius: 15px;padding: 15px 10px;"> border-radius: 15px;padding: 15px 10px;">
<!--
<view v-if="info.storeSid!=''" <view v-if="info.storeSid!=''"
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;"> style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
@ -58,16 +58,31 @@
</image> </image>
<text style="margin-left: 5px;flex: 1; color: #666;font-size: 14px;">{{info.address}}</text> <text style="margin-left: 5px;flex: 1; color: #666;font-size: 14px;">{{info.address}}</text>
</view> -->
<view style="display: flex;flex-direction: row;align-items: center;">
<text
style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif; ">配送地址</text>
<textarea bindblur="bindTextAreaBlur" :value="info.userAddress" @input="onKeyInput2"
style=" margin-left: 15px;border-bottom: 1px solid #ccc; padding-bottom: 5px; flex: 1;"
auto-height placeholder="请输入详细配送地址精确到门牌号" />
<!-- <input placeholder="."
style="font-size: 25rpx;flex: 1;height: 35px;line-height: 35px;padding-left: 10px;padding-right: 10px; margin-left: 15px;"
:value="page.phone" @input="onKeyInput2" /> -->
</view> </view>
<view <view
style="display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 16px;"> style="display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 16px;">
<text <text
style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif; flex: 1;">提货时间</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" /> :clearIcon="false" :border="false" :disabledDate="disabledDate" />
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;margin-left: 5px;"> <image src="../../static/right_icon.png" style="width: 15px;height: 15px;margin-left: 5px;">
</image> </image>
</view> </view>
@ -78,7 +93,7 @@
<view style="margin-top: 10px;display: flex;flex-direction: row;background: #fff;align-items: center; <view style="margin-top: 10px;display: flex;flex-direction: row;background: #fff;align-items: center;
border-radius: 15px;padding: 15px 10px;justify-content: space-between;"> border-radius: 15px;padding: 15px 10px;justify-content: space-between;">
<text style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif;">提货</text> <text style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif;">联系</text>
<view v-if="info.name!=''" style="display: flex;flex-direction: row;align-items: center;" <view v-if="info.name!=''" style="display: flex;flex-direction: row;align-items: center;"
@click="changePer()"> @click="changePer()">
@ -109,7 +124,7 @@
<text style="font-size: 15px; color: #000; font-weight: 600;font-family: sans-serif;">提货列表</text> <text style="font-size: 15px; color: #000; font-weight: 600;font-family: sans-serif;">提货列表</text>
<scroll-view scroll-y="true" style="max-height:calc(100vh - 450px); width: 100%; box-sizing: border-box; margin-top: 10px;; <scroll-view scroll-y="true" style="max-height:calc(100vh - 400px); width: 100%; box-sizing: border-box; margin-top: 10px;;
" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll"> " bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
<view style="width: 100%; display: flex;flex-direction: column; margin-top: 10px;"> <view style="width: 100%; display: flex;flex-direction: column; margin-top: 10px;">
@ -129,15 +144,16 @@
<text style="font-size: 13px;color: #000;" <text style="font-size: 13px;color: #000;"
@click="itemClick(item.goodsSid)">{{item.name}}</text> @click="itemClick(item.goodsSid)">{{item.name}}</text>
<text <!-- <text
style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text> style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text> -->
<view <view
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;"> style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
<text <text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px; font-size: 10px;color: #EE752F; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
font-size: 10px;color: #EE752F; margin-right: 10px; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
<text v-show="item.remarks!=''" style="margin-left: 10px; border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.remarks}}</text>
<text <text
style="border: 1px #EE752F solid; background: #FF9900; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;" style="border: 1px #EE752F solid; background: #FF9900; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
v-if="item.type=='0'">百姓菜!</text> v-if="item.type=='0'">百姓菜!</text>
@ -157,7 +173,7 @@
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<text style="font-size: 12px;color: #FF5006;">存量</text> <text style="font-size: 12px;color: #FF5006;">存量</text>
<text <text
style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</text> style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}</text>
</view> </view>
@ -192,7 +208,7 @@
<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;"> 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; <text style=" background: #60CA2C;color: #fff;margin-bottom: 20px; border-radius: 20px;
padding-top: 10px;padding-bottom: 10px;padding-left: 25vw;padding-right: 25vw; text-align: center;" padding-top: 10px;padding-bottom: 10px;padding-left: 25vw;padding-right: 25vw; text-align: center;"
@click="congirmExtract()">确认提货</text> @click="congirmExtract()">确认提货</text>
</view> </view>
@ -208,6 +224,7 @@
data() { data() {
return { return {
affiliation: "", affiliation: "",
delivery: "",
info: { info: {
}, },
@ -234,23 +251,26 @@
this.info.phone = e.phone; this.info.phone = e.phone;
}) })
this.request()
this.getSun()
this.pickingUpGoods = JSON.parse(decodeURIComponent(options.pickingUpGoods)) this.pickingUpGoods = JSON.parse(decodeURIComponent(options.pickingUpGoods))
this.affiliation = options.affiliation this.affiliation = options.affiliation
this.delivery = options.delivery
console.log(">>>>>", options); console.log(">>>>>", options);
console.log(">>>>>", this.pickingUpGoods); console.log(">>>>>", this.pickingUpGoods);
console.log(">>>>>", this.affiliation); console.log(">>>>>", this.affiliation);
console.log(">>>>>", this.delivery);
this.request()
this.getSun()
}, },
onUnload() { onUnload() {
uni.$off('address'); uni.$off('address');
uni.$off('changePer'); uni.$off('changePer');
}, },
methods: { methods: {
onKeyInput2(val) {
this.info.userAddress = val.detail.value
},
itemClick(goodsSid) { itemClick(goodsSid) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + goodsSid url: '/pages/good/goodsDetail?sid=' + goodsSid
@ -279,7 +299,15 @@
// //
request() { request() {
let _this = this let _this = this
_this.$api.getStoreBySid(getApp().globalData.sid).then((resp) => {
var params = {
customerSid: getApp().globalData.sid,
delivery: _this.delivery
}
console.log(">>>>>", params);
_this.$api.getStoreBySid(params).then((resp) => {
_this.info = resp _this.info = resp
_this.$nextTick(() => { _this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2) _this.$refs.pageView.setLoadState(2)
@ -335,19 +363,24 @@
this.btnDisabled = true this.btnDisabled = true
if (_this.info.storeSid == '') { console.log('用户点击确定', _this.info.userAddress)
this.shortToast('请完善提货点信息')
if (_this.info.userAddress == '' || _this.info.userAddress == undefined) {
this.shortToast('请完善配送地址')
this.btnDisabled = false
return return
} }
if (_this.info.reserveDate == '') { if (_this.info.reserveDate == '') {
this.shortToast('请选择日期') this.shortToast('请选择日期')
this.btnDisabled = false
return return
} }
if (this.info.name == "" || this.info.phone == '') { if (this.info.name == "" || this.info.phone == '') {
this.shortToast('请完善提菜人信息') this.shortToast('请完善联系人信息')
this.btnDisabled = false
return return
} }
@ -365,6 +398,7 @@
if (list.length == 0) { if (list.length == 0) {
this.shortToast('请添加商品') this.shortToast('请添加商品')
this.btnDisabled = false
return return
} }
@ -373,13 +407,14 @@
affiliation: _this.affiliation, affiliation: _this.affiliation,
reserveDate: _this.info.reserveDate, reserveDate: _this.info.reserveDate,
storeSid: _this.info.storeSid, storeSid: _this.info.storeSid,
userAddress: _this.info.userAddress,
userName: _this.info.name, userName: _this.info.name,
userPhone: _this.info.phone, userPhone: _this.info.phone,
goodsVos: list goodsVos: list
} }
console.log("pppp", params); console.log("pppp", params);
_this.$api.submissionExtract(params).then((resp) => { _this.$api.submissionExtract2(params).then((resp) => {
uni.navigateBack() uni.navigateBack()
_this.btnDisabled = false _this.btnDisabled = false
}).catch(e => { }).catch(e => {

424
pages/good/reservation2.vue

@ -0,0 +1,424 @@
<template>
<view style="width: 100%;height: 100%;background: #60CA2C;display: flex;flex-direction: column;">
<NavBar ref="nav" navTitle="预约提货" :showIcon="true" :supportChange="false">
</NavBar>
<loading-state ref="pageView" @request="request">
<!-- <view style="background: #FFA35A;width: 100%;height: 100%;"> -->
<view style="display: flex;flex-direction: column;background: #F2F2F2; width: 100%;
border-radius: 25px;height: 100vh; padding: 10px;box-sizing: border-box;">
<view style="display: flex;flex-direction: column;background: #fff;
border-radius: 15px;padding: 15px 10px;">
<view v-if="info.storeSid!=''"
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<text
style="font-size: 16px;color: #000; font-weight: 600;font-family: sans-serif;">{{info.storeName}}</text>
<view style="display: flex;flex-direction: row;align-items: center;" @click="address()">
<text style="font-size: 12px;color: #FF9900;">切换</text>
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;margin-left: 5px;">
</image>
</view>
</view>
<view v-if="info.storeSid==''"
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<text
style="font-size: 16px;color: #000; font-weight: 600;font-family: sans-serif;">暂无提货点信息</text>
<view style="display: flex;flex-direction: row;align-items: center;" @click="address()">
<text style="font-size: 12px;color: #FF9900;">去完善</text>
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;margin-left: 5px;">
</image>
</view>
</view>
<view v-if="info.storeSid!=''"
style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
<image src="https://supervise.yxtsoft.com/lpk/image/date.png" style="width:20px;height: 20px;">
</image>
<text
style="margin-left: 5px;flex: 1;color: #666;font-size: 14px;">{{info.businessHours}}</text>
</view>
<view v-if="info.storeSid!=''"
style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
<image src="https://supervise.yxtsoft.com/lpk/image/location.png"
style="width: 20px;height: 20px;">
</image>
<text style="margin-left: 5px;flex: 1; color: #666;font-size: 14px;">{{info.address}}</text>
</view>
<!-- <view style="display: flex;flex-direction: row;align-items: center;">
<text
style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif; ">配送地址</text>
<textarea bindblur="bindTextAreaBlur" :value="info.userAddress" @input="onKeyInput2"
style=" margin-left: 15px;border-bottom: 1px solid #ccc; padding-bottom: 5px; flex: 1;"
auto-height placeholder="请输入详细配送地址精确到门牌号" />
</view>
-->
<view
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"
:clearIcon="false" :border="false" :disabledDate="disabledDate" />
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;margin-left: 5px;">
</image>
</view>
</view>
<view style="margin-top: 10px;display: flex;flex-direction: row;background: #fff;align-items: center;
border-radius: 15px;padding: 15px 10px;justify-content: space-between;">
<text style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif;">联系人</text>
<view v-if="info.name!=''" style="display: flex;flex-direction: row;align-items: center;"
@click="changePer()">
<text
style="font-size: 14px;color: #000; font-weight: 600;font-family: sans-serif;">{{info.name}}</text>
<text style="font-size: 12px;color: #999; margin-left: 8px;">{{info.phone}}</text>
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;margin-left: 5px;">
</image>
</view>
<view v-if="info.name==''" style="display: flex;flex-direction: row;align-items: center;"
@click="changePer()">
<text style="font-size: 12px;color: #999; margin-left: 8px;">去完善</text>
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;margin-left: 5px;">
</image>
</view>
</view>
<view
style="margin-top: 10px;display: flex;flex-direction: column;background: #fff;border-radius: 15px;padding: 10px;">
<text style="font-size: 15px; color: #000; font-weight: 600;font-family: sans-serif;">提货列表</text>
<scroll-view scroll-y="true" style="max-height:calc(100vh - 400px); width: 100%; box-sizing: border-box; margin-top: 10px;;
" 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"
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" @click="itemClick(item.goodsSid)"
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 == pickingUpGoods.length-1 ? 'none' : '1px #EFEFEF solid')}">
<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> -->
<view
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
<text v-show="item.remarks!=''" style="margin-left: 10px; border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.remarks}}</text>
<text
style="border: 1px #EE752F solid; background: #FF9900; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
v-if="item.type=='0'">百姓菜!</text>
<text
style="border: 1px #3AA15F solid; background: #40C772; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
v-if="item.type=='1'">精品菜!</text>
<text
style="border: 1px #1D60C7 solid; background: #2489F7; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
v-if="item.type=='2'">企业菜!</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
margin-right: 15px;">
<view style="display: flex;flex-direction: row;align-items: center;">
<text style="font-size: 12px;color: #FF5006;">存量</text>
<text
style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}</text>
</view>
<view 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.count}}</text>
<image src="../../static/jia_icon.png" mode="aspectFill"
style="width: 20px;height: 20px;" @click.stop="jia(item)">
</image>
</view>
</view>
</view>
</view>
</view>
</view>
</scroll-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: #60CA2C;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>
</view>
</view>
<!-- </view> -->
</loading-state>
</view>
</template>
<script>
export default {
data() {
return {
affiliation: "",
delivery: "",
info: {
},
pickingUpGoods: [],
disabledDate: [
// '2023-12-16'
],
btnDisabled: false
}
},
onLoad(options) {
uni.$on("address", (e) => {
//
this.info.storeSid = e.sid;
this.info.storeName = e.name;
this.info.businessHours = e.businessHours;
this.info.address = e.address;
})
uni.$on("changePer", (e) => {
//
this.info.name = e.name;
this.info.phone = e.phone;
})
this.pickingUpGoods = JSON.parse(decodeURIComponent(options.pickingUpGoods))
this.affiliation = options.affiliation
this.delivery = options.delivery
console.log(">>>>>", options);
console.log(">>>>>", this.pickingUpGoods);
console.log(">>>>>", this.affiliation);
console.log(">>>>>", this.delivery);
this.request()
this.getSun()
},
onUnload() {
uni.$off('address');
uni.$off('changePer');
},
methods: {
onKeyInput2(val) {
this.info.userAddress = val.detail.value
},
itemClick(goodsSid) {
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + goodsSid
})
},
getSun() {
let _this = this
_this.$api.getExtractSaturAndSun().then((resp) => {
_this.disabledDate = resp
}).catch(e => {
})
},
address() {
uni.navigateTo({
url: '/pages/SelectAddressActivity'
})
},
changePer() {
uni.navigateTo({
url: '/pages/good/changePersonnel?name=' + this.info.name + "&phone=" + this.info.phone
})
},
//
request() {
let _this = this
var params = {
customerSid: getApp().globalData.sid,
delivery: _this.delivery
}
console.log(">>>>>", params);
_this.$api.getStoreBySid(params).then((resp) => {
_this.info = resp
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2)
})
}).catch(e => {
console.log(e);
})
},
jian(item) {
console.log("item》》》》", item)
const that = this
if (Number(item.count) == 1) {
wx.showModal({
content: '确定不要了吗',
cancelText: "再想想",
confirmText: "删除",
confirmColor: "#FF9900",
success(res) {
if (res.confirm) {
console.log('用户点击确定')
item.count = 0
const index = that.pickingUpGoods.findIndex((info) => info.goodsSid === item
.goodsSid)
console.log("index》》》》", index)
that.pickingUpGoods.splice(index, 1)
} else if (res.cancel) {
}
}
})
} else {
if (Number(item.count) > 0) {
item.count = Number(item.count) - 1
}
}
},
jia(item) {
if (item.count < item.goodsNumber)
item.count = Number(item.count) + 1
},
congirmExtract() {
let _this = this
if (this.btnDisabled) {
this.shortToast('请勿重复点击')
return
}
this.btnDisabled = true
if (_this.info.storeSid == '') {
this.shortToast('请完善提货点信息')
return
}
if (_this.info.reserveDate == '') {
this.shortToast('请选择日期')
this.btnDisabled = false
return
}
if (this.info.name == "" || this.info.phone == '') {
this.shortToast('请完善联系人信息')
this.btnDisabled = false
return
}
let list = []
for (var i = 0; i < this.pickingUpGoods.length; i++) {
var item = this.pickingUpGoods[i]
if (item.count > 0)
list.push({
goodsSid: item.goodsSid,
select: item.count,
})
}
// console.log("ddd", list);
if (list.length == 0) {
this.shortToast('请添加商品')
this.btnDisabled = false
return
}
var params = {
customerSid: getApp().globalData.sid,
affiliation: _this.affiliation,
reserveDate: _this.info.reserveDate,
storeSid: _this.info.storeSid,
userAddress: '',
userName: _this.info.name,
userPhone: _this.info.phone,
goodsVos: list
}
console.log("pppp", params);
_this.$api.submissionExtract2(params).then((resp) => {
uni.navigateBack()
_this.btnDisabled = false
}).catch(e => {
console.log(e);
_this.btnDisabled = false
})
},
}
}
</script>
<style>
</style>

13
pages/good/transfer.vue

@ -1,5 +1,5 @@
<template> <template>
<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;"> <view style="width: 100%;height: 100%;background: #60CA2C;display: flex;flex-direction: column;">
<!-- <NavBar ref="nav" navTitle="转赠亲友" :showIcon="true" :supportChange="false"> <!-- <NavBar ref="nav" navTitle="转赠亲友" :showIcon="true" :supportChange="false">
</NavBar> --> </NavBar> -->
@ -26,12 +26,14 @@
<text style="font-size: 14px;color: #000; font-weight: 600;" <text style="font-size: 14px;color: #000; font-weight: 600;"
@click="itemClick(item.goodsSid)">{{item.name}}</text> @click="itemClick(item.goodsSid)">{{item.name}}</text>
<text style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text> <!-- <text style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text> -->
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;"> <view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px; <text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text> font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
<text v-show="item.remarks!=''" style="margin-left: 10px; border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.remarks}}</text>
<text <text
style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;" style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
v-if="item.type=='0'">百姓菜!</text> v-if="item.type=='0'">百姓菜!</text>
@ -47,8 +49,7 @@
margin-right: 15px;"> margin-right: 15px;">
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<text style="font-size: 10px;color: #FF5006;">存量</text> <text style="font-size: 10px;color: #FF5006;">存量</text>
<text <text style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}</text>
style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
@ -233,7 +234,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4
@ -259,7 +260,7 @@
<style> <style>
button { button {
background: #FF9900; background: #60CA2C;
color: #fff; color: #fff;
margin-top: 20px; margin-top: 20px;
height: 40px; height: 40px;

32
pages/home/cloudCard2.vue

@ -1,7 +1,7 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);"> style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
<view class="top" style="position: fixed;"> <view class="top" style="position: fixed;">
@ -173,7 +173,7 @@
<view style="display: flex;flex-direction: row;align-items: center;margin-left: 20px; "> <view style="display: flex;flex-direction: row;align-items: center;margin-left: 20px; ">
<view style=" display: flex;flex-direction: row;align-items: center; border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 5px;height: 42px;flex: 1; <view style=" display: flex;flex-direction: row;align-items: center; border: 1px #60CA2C solid;margin-left: 5px;margin-right: 5px;padding: 0px 5px;height: 42px;flex: 1;
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;"> display: flex;flex-direction: row;align-items: center;box-sizing: border-box;">
<view <view
@ -199,8 +199,8 @@
<text <text
style="background: #FF9900; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px; style="background: #60CA2C; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;margin-right: 20px;" border: 1px #60CA2C solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;margin-right: 20px;"
@click="settlement()">去结算</text> @click="settlement()">去结算</text>
</view> </view>
@ -313,7 +313,7 @@
<view v-for="(item,index) in newPerGiftList" class="device-list" style="overflow-y: auto;"> <view v-for="(item,index) in newPerGiftList" class="device-list" style="overflow-y: auto;">
<view style=""> <view style="">
<radio :value="item.sid" style="transform:scale(0.8)" color="#FF9900" /> <radio :value="item.sid" style="transform:scale(0.8)" color="#60CA2C" />
</view> </view>
<view <view
@ -354,7 +354,7 @@
<view <view
style=" height: 15vw; flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;" style=" height: 15vw; flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;"
class="newpor_bom"> class="newpor_bom">
<text style="background: #FF9900;color: #fff;text-align: center;border-radius: 20px; <text style="background: #60CA2C;color: #fff;text-align: center;border-radius: 20px;
padding:8px 25px ;" @click="newporGift">确认结算</text> padding:8px 25px ;" @click="newporGift">确认结算</text>
</view> </view>
@ -1140,7 +1140,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', // 5:4
@ -1198,7 +1198,7 @@
.button2 { .button2 {
background: #fff; background: #fff;
color: #FF9900; color: #60CA2C;
border-radius: 0px; border-radius: 0px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
flex: 1; flex: 1;
@ -1206,7 +1206,7 @@
} }
button { button {
background: #FF9900; background: #60CA2C;
color: #fff; color: #fff;
height: 42px; height: 42px;
line-height: 40px; line-height: 40px;
@ -1335,7 +1335,7 @@
.swiper /deep/ .wx-swiper-dot-active { .swiper /deep/ .wx-swiper-dot-active {
width: 44rpx; width: 44rpx;
height: 12rpx; height: 12rpx;
background: #FF9900; background: #60CA2C;
border-radius: 8rpx; border-radius: 8rpx;
} }
@ -1374,7 +1374,7 @@
.label2 { .label2 {
background: #FFF; background: #FFF;
color: #FFF; color: #FFF;
background-color: #FF9900; background-color: #60CA2C;
font-size: 12px; font-size: 12px;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
@ -1388,7 +1388,7 @@
} }
.top_img1 { .top_img1 {
border: 1px #FF9900 solid; border: 1px #60CA2C solid;
} }
.top_img2 { .top_img2 {
@ -1396,8 +1396,8 @@
} }
.top_text1 { .top_text1 {
border: 1px #FF9900 solid; border: 1px #60CA2C solid;
background: #FF5006; background: #81C95D;
color: #fff; color: #fff;
font-weight: 800; font-weight: 800;
font-family: sans-serif; font-family: sans-serif;
@ -1410,9 +1410,9 @@
} }
.top_text2 { .top_text2 {
border: 1px #FF9900 solid; border: 1px #60CA2C solid;
background: #fff; background: #fff;
color: #F6894B; color: #81C95D;
font-weight: 800; font-weight: 800;
padding: 5px 12px; padding: 5px 12px;
font-family: sans-serif; font-family: sans-serif;

63
pages/home/myCellar.vue

@ -1,7 +1,7 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);"> style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight"
@ -86,6 +86,9 @@
<!-- :class="item.state=='0'?'oragin':'gray'" --> <!-- :class="item.state=='0'?'oragin':'gray'" -->
<text :class="item.state=='0'?'oragin':'gray'" style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px; <text :class="item.state=='0'?'oragin':'gray'" style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text> font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
<text v-show="item.remarks!=''" :class="item.state=='0'?'oragin':'gray'"
style="margin-left: 10px; border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.remarks}}</text>
<text <text
style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;" style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
@ -112,7 +115,7 @@
<text style="font-size: 12px;color: #666;">存量</text> <text style="font-size: 12px;color: #666;">存量</text>
<!-- :style="{color:(item.state == '1' ? '#999' : '#FF5006')}" --> <!-- :style="{color:(item.state == '1' ? '#999' : '#FF5006')}" -->
<text :style="{color:(item.state == '1' ? '#999' : '#FF5006')}" <text :style="{color:(item.state == '1' ? '#999' : '#FF5006')}"
style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</text> style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}</text>
</view> </view>
<!-- :class="item.state=='0'?'oragin':'gray'" --> <!-- :class="item.state=='0'?'oragin':'gray'" -->
@ -147,7 +150,7 @@
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;"> <view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
<text style="font-size: 14px; color: #666;margin-right: 5px;">您的订单为空,</text> <text style="font-size: 14px; color: #666;margin-right: 5px;">您的订单为空,</text>
<text <text
style="background: #FF9900; border-radius: 8px; padding: 3px 8px; color: #fff;" style="background: #61CB29; border-radius: 8px; padding: 3px 8px; color: #fff;"
@click="gotoShopp()">补充商品</text> @click="gotoShopp()">补充商品</text>
</view> </view>
</view> </view>
@ -165,11 +168,11 @@
style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;padding: 0px 20px;"> style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;padding: 0px 20px;">
<text <text
style="background: #FF9900;color: #fff;height: 40px;line-height: 40px;font-size: 13px;padding: 0px 15px;border: 1px #FF5006 solid; style="background: #61CB29;color: #fff;height: 40px;line-height: 40px;font-size: 13px;padding: 0px 15px;border: 1px #61CB29 solid;
border-top-left-radius: 25px;border-bottom-left-radius: 25px;border-top-right-radius: 0px;border-bottom-right-radius: 0px;" border-top-left-radius: 25px;border-bottom-left-radius: 25px;border-top-right-radius: 0px;border-bottom-right-radius: 0px;"
@click="transfer()">转赠亲友</text> @click="transfer()">转赠亲友</text>
<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1; <view style="border: 1px #61CB29 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;" display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;"
@click="gotoCart()"> @click="gotoCart()">
<!-- image src="../../static/shoppCart_icon.png" mode="aspectFill" <!-- image src="../../static/shoppCart_icon.png" mode="aspectFill"
@ -178,8 +181,8 @@
<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">{{page.count}}</text> <text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">{{page.count}}</text>
<text style="font-size: 12px;color: #666;margin-left: 10px; "></text> <text style="font-size: 12px;color: #666;margin-left: 10px; "></text>
</view> </view>
<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px; <text style="background: #61CB29; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;" border: 1px #61CB29 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;"
@click="reservation()">预约提货</text> @click="reservation()">预约提货</text>
@ -271,7 +274,7 @@
style="width: 50vw;height: 50vw;"></image> style="width: 50vw;height: 50vw;"></image>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;"> <view style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;">
<text <text
style="background: #FF9900; border-radius: 8px; padding: 3px 8px; color: #fff;">请添加~</text> style="background: #61CB29; border-radius: 8px; padding: 3px 8px; color: #fff;">请添加~</text>
</view> </view>
</view> </view>
@ -456,6 +459,7 @@
scrollLeftTop: "0", scrollLeftTop: "0",
scrollRightTop: "0", scrollRightTop: "0",
brandType: "0", brandType: "0",
brandItem: {},
styleObject: { styleObject: {
// 'position': 'fixed', // 'position': 'fixed',
// 'top':'80vw', // 'top':'80vw',
@ -620,10 +624,14 @@
labelClick(index, item) { labelClick(index, item) {
this.selectIndex = index this.selectIndex = index
this.brandType = item.id this.brandType = item.id
this.brandItem = item
this.pickingUpGoods = [] this.pickingUpGoods = []
this.page.count = 0 this.page.count = 0
this.getgoods() this.getgoods()
console.log("labelClick>>>>", this.brandType);
console.log("labelClick>>>>", this.brandItem);
}, },
request() { request() {
let _this = this let _this = this
@ -636,6 +644,7 @@
_this.pickingUpGoods = [] _this.pickingUpGoods = []
_this.baseDataSuccess = true _this.baseDataSuccess = true
// _this.selectIndex = 0 // _this.selectIndex = 0
_this.brandItem = _this.data[_this.selectIndex]
_this.getgoods() _this.getgoods()
}).catch(e => { }).catch(e => {
_this.$nextTick(() => { _this.$nextTick(() => {
@ -788,14 +797,24 @@
}, },
reservation() { reservation() {
console.log("labelClick>>>>", this.brandItem);
console.log(">>>>>>>>>>", this.pickingUpGoods); console.log(">>>>>>>>>>", this.pickingUpGoods);
if (this.pickingUpGoods.length > 0) { if (this.pickingUpGoods.length > 0) {
if (this.brandItem.delivery == '1') {
uni.navigateTo({
url: '/pages/good/reservation?pickingUpGoods=' + encodeURIComponent(JSON.stringify(
this
.pickingUpGoods)) + "&affiliation=" + this.data[this.selectIndex].id +
"&delivery=" + this.brandItem.delivery,
})
} else {
uni.navigateTo({ uni.navigateTo({
url: '/pages/good/reservation?pickingUpGoods=' + encodeURIComponent(JSON.stringify(this url: '/pages/good/reservation2?pickingUpGoods=' + encodeURIComponent(JSON.stringify(
.pickingUpGoods)) + this.pickingUpGoods)) + "&affiliation=" + this.data[this.selectIndex].id +
"&affiliation=" + this.data[this.selectIndex].id, "&delivery=" + this.brandItem.delivery,
}) })
}
// this.showModal = true // this.showModal = true
} else { } else {
@ -869,7 +888,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4
@ -952,7 +971,7 @@
.button2 { .button2 {
background: #fff; background: #fff;
color: #FF9900; color: #61CB29;
border-radius: 0px; border-radius: 0px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
flex: 1; flex: 1;
@ -960,13 +979,13 @@
} }
button { button {
background: #FF9900; background: #61CB29;
color: #fff; color: #fff;
height: 42px; height: 42px;
line-height: 40px; line-height: 40px;
font-size: 13px; font-size: 13px;
padding: 0px 15px; padding: 0px 15px;
border: 1px #FF5006 solid; border: 1px #61CB29 solid;
border-top-left-radius: 25px; border-top-left-radius: 25px;
border-bottom-left-radius: 25px; border-bottom-left-radius: 25px;
border-top-right-radius: 0px; border-top-right-radius: 0px;
@ -984,7 +1003,7 @@
/* height: 126.66vw; */ /* height: 126.66vw; */
height: 65vw; height: 65vw;
/* 加载背景图 */ /* 加载背景图 */
background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1.png); background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1_new.png);
/* background-image: url(../../static/clound_bj1.png); */ /* background-image: url(../../static/clound_bj1.png); */
/* 让背景图基于容器大小伸缩 */ /* 让背景图基于容器大小伸缩 */
background-size: 100% 100%; background-size: 100% 100%;
@ -1023,7 +1042,7 @@
.label2 { .label2 {
background: #FFF; background: #FFF;
color: #FFF; color: #FFF;
background-color: #FF9900; background-color: #61CB29;
font-size: 12px; font-size: 12px;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
@ -1036,7 +1055,7 @@
} }
.top_img1 { .top_img1 {
border: 1px #FF9900 solid; border: 1px #61CB29 solid;
} }
.top_img2 { .top_img2 {
@ -1044,8 +1063,8 @@
} }
.top_text1 { .top_text1 {
border: 1px #FF9900 solid; border: 1px #61CB29 solid;
background: #FF5006; background: #61CB29;
color: #fff; color: #fff;
font-weight: 800; font-weight: 800;
font-family: sans-serif; font-family: sans-serif;
@ -1058,9 +1077,9 @@
} }
.top_text2 { .top_text2 {
border: 1px #FF9900 solid; border: 1px #61CB29 solid;
background: #fff; background: #fff;
color: #F6894B; color: #61CB29;
font-weight: 800; font-weight: 800;
padding: 5px 16px; padding: 5px 16px;
font-family: sans-serif; font-family: sans-serif;

6
pages/home/myHome.vue

@ -410,7 +410,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', // 5:4
@ -506,7 +506,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh; height: 100vh;
background: -webkit-linear-gradient(left, #FEA65F, #FB9440); background: -webkit-linear-gradient(left, #77E270, #9EECA0);
box-sizing: border-box; box-sizing: border-box;
} }
@ -517,7 +517,7 @@
/* height: 126.66vw; */ /* height: 126.66vw; */
height: 65vw; height: 65vw;
/* 加载背景图 */ /* 加载背景图 */
background-image: url(https://supervise.yxtsoft.com/lpk/image/my_bj.png); background-image: url(https://supervise.yxtsoft.com/lpk/image/my_bj_new.png);
/* 让背景图基于容器大小伸缩 */ /* 让背景图基于容器大小伸缩 */
background-size: 100% 100%; background-size: 100% 100%;

2
pages/me/RealInfo.vue

@ -41,7 +41,7 @@
</view> </view>
</pick-regions> </pick-regions>
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px; <view style="background: -webkit-linear-gradient(left,#61CB29,#60CA2C); position: absolute; bottom: 30px;
width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;margin-left: 5%; width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;margin-left: 5%;
flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;" flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;"
@click="realInfoAttestation"> @click="realInfoAttestation">

23
pages/me/addInvoice.vue

@ -10,9 +10,9 @@
<text class="item-text">发票类型</text> <text class="item-text">发票类型</text>
<radio-group @change="radioChange"> <radio-group @change="radioChange">
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="普通发票" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="普通发票"
:checked="info.invoiceType=='普通发票'">普通发票</radio> :checked="info.invoiceType=='普通发票'">普通发票</radio>
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="增值税发票" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="增值税发票"
:checked="info.invoiceType=='增值税发票'">增值税发票</radio> :checked="info.invoiceType=='增值税发票'">增值税发票</radio>
</radio-group> </radio-group>
</view> </view>
@ -22,10 +22,10 @@
<text class="item-text">抬头类型</text> <text class="item-text">抬头类型</text>
<radio-group @change="radioChange2"> <radio-group @change="radioChange2">
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="个人或事业单位" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="个人或事业单位"
:checked="info.headingType=='个人或事业单位'">个人或事业单位 :checked="info.headingType=='个人或事业单位'">个人或事业单位
</radio> </radio>
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="企业" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="企业"
:checked="info.headingType=='企业'">企业</radio> :checked="info.headingType=='企业'">企业</radio>
</radio-group> </radio-group>
@ -47,6 +47,17 @@
</view> </view>
</view> </view>
<view class="bom-item" style="margin-top: 12px;">
<text class="item-text">电子邮箱</text>
<view class="item-right" style="width: 100%;margin-left: 20px;padding-left: 5px;">
<input class="input" type="text" placeholder="选填" v-model="info.email" />
</view>
</view>
<view v-if="isPerson"> <view v-if="isPerson">
<view style="display: flex;flex-direction: column;" v-if="showDetail"> <view style="display: flex;flex-direction: column;" v-if="showDetail">
@ -120,14 +131,14 @@
<text class="item-text">设为默认</text> <text class="item-text">设为默认</text>
<radio :checked="radioDefault" @click="radioDefaultClick" style="transform:scale(0.8);" color="#FF9900"> <radio :checked="radioDefault" @click="radioDefaultClick" style="transform:scale(0.8);" color="#61CB29">
</radio> </radio>
</view> </view>
</view> </view>
<view style="position: absolute; bottom: 20px; display: flex;flex-direction: column;width: 100%; <view style="position: absolute; bottom: 20px; display: flex;flex-direction: column;width: 100%;
box-sizing: border-box;padding-left: 40px;padding-right: 40px; "> box-sizing: border-box;padding-left: 40px;padding-right: 40px; ">
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); <view style="background: -webkit-linear-gradient(left,#61CB29,#60CA2C);
width: 100%;border-radius: 25px;height: 50px;text-align: center; width: 100%;border-radius: 25px;height: 50px;text-align: center;
line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="save"> line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="save">
完成</view> 完成</view>

14
pages/me/makeInvoice.vue

@ -10,9 +10,9 @@
<text class="item-text">发票类型</text> <text class="item-text">发票类型</text>
<radio-group @change="radioChange"> <radio-group @change="radioChange">
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="普通发票" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="普通发票"
:checked="info.invoiceType=='普通发票'">普通发票</radio> :checked="info.invoiceType=='普通发票'">普通发票</radio>
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="增值税发票" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="增值税发票"
:checked="info.invoiceType=='增值税发票'">增值税发票</radio> :checked="info.invoiceType=='增值税发票'">增值税发票</radio>
</radio-group> </radio-group>
</view> </view>
@ -22,10 +22,10 @@
<text class="item-text">抬头类型</text> <text class="item-text">抬头类型</text>
<radio-group @change="radioChange2"> <radio-group @change="radioChange2">
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="个人或事业单位" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="个人或事业单位"
:checked="info.headingType=='个人或事业单位'">个人或事业单位 :checked="info.headingType=='个人或事业单位'">个人或事业单位
</radio> </radio>
<radio style="transform:scale(0.8);font-size: 20px;" color="#FF9900" value="企业" <radio style="transform:scale(0.8);font-size: 20px;" color="#61CB29" value="企业"
:checked="info.headingType=='企业'">企业</radio> :checked="info.headingType=='企业'">企业</radio>
</radio-group> </radio-group>
@ -125,7 +125,7 @@
</view> </view>
<view style="position: absolute; bottom: 20px; display: flex;flex-direction: column;width: 100%; <view style="position: absolute; bottom: 20px; display: flex;flex-direction: column;width: 100%;
box-sizing: border-box;padding-left: 40px;padding-right: 40px; "> box-sizing: border-box;padding-left: 40px;padding-right: 40px; ">
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); <view style="background: -webkit-linear-gradient(left,#61CB29,#60CA2C);
width: 100%;border-radius: 25px;height: 50px;text-align: center; width: 100%;border-radius: 25px;height: 50px;text-align: center;
line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="save"> line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="save">
提交申请</view> 提交申请</view>
@ -161,7 +161,7 @@
<view style="flex: 1;display: flex;flex-direction: row;align-items: center;"> <view style="flex: 1;display: flex;flex-direction: row;align-items: center;">
<text <text
style="font-size: 16px;font-weight: 600;font-family: sans-serif;">{{item.invoiceHeader}}</text> style="font-size: 16px;font-weight: 600;font-family: sans-serif;">{{item.invoiceHeader}}</text>
<text v-if="item.isDefault==1" style="background: #FFF0DA; color: #FF7200; <text v-if="item.isDefault==1" style="background: #FFF0DA; color: #61CB29;
font-size: 10px;margin-left: 6px;border-radius: 5px;padding: 2px 5px;">默认</text> font-size: 10px;margin-left: 6px;border-radius: 5px;padding: 2px 5px;">默认</text>
</view> </view>
@ -192,7 +192,7 @@
<view style="position: absolute; bottom: 20px; display: flex;flex-direction: column;width: 100%; <view style="position: absolute; bottom: 20px; display: flex;flex-direction: column;width: 100%;
box-sizing: border-box;padding-left: 40px;padding-right: 40px; "> box-sizing: border-box;padding-left: 40px;padding-right: 40px; ">
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); <view style="background: -webkit-linear-gradient(left,#61CB29,#60CA2C);
width: 100%;border-radius: 25px;height: 50px;text-align: center; width: 100%;border-radius: 25px;height: 50px;text-align: center;
line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="addInviice"> line-height: 50px;color: #FFFFFF;font-size: 16px;" @click="addInviice">
添加新的抬头</view> 添加新的抬头</view>

5
pages/records/orderDetail.vue

@ -36,11 +36,12 @@
<view style="margin-top: 8px;display: flex;flex-direction: column;"> <view style="margin-top: 8px;display: flex;flex-direction: column;">
<view style="display: flex;flex-direction: row;align-items: center;"> <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.unitName}}</text> -->
<text <text
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px; style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F; margin-right: 10px; ">{{item.numofPart}}{{item.specificationUnit}}/{{item.unitName}}</text> font-size: 10px;color: #EE752F; margin-right: 10px; ">{{item.numofPart}}{{item.specificationUnit}}/{{item.unitName}}</text>
<text v-show="item.remarks!=''" style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.remarks}}</text>
</view> </view>
<text <text

4
pages/records/orderRecords.vue

@ -146,9 +146,9 @@
} }
.label2 { .label2 {
color: #FF9900; color: #61CB29;
font-size: 14px; font-size: 14px;
border-bottom: 1px #FF9900 solid; border-bottom: 1px #61CB29 solid;
padding-bottom: 5px; padding-bottom: 5px;
margin-right: 30px; margin-right: 30px;
flex-shrink: 0; flex-shrink: 0;

2
pages/records/reservationRecords.vue

@ -1,6 +1,6 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);"> style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 --> <!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'> <z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>

2
pages/records/reservationRecords2.vue

@ -1,6 +1,6 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);"> style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 --> <!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'> <z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>

23
pages/records/reservationRecords3.vue

@ -1,6 +1,6 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);" style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);"
class="app"> class="app">
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 --> <!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'> <z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>
@ -20,10 +20,10 @@
<text class="item-top-state">{{item.stateValue}}</text> <text class="item-top-state">{{item.stateValue}}</text>
</view> </view>
<view <!-- <view
style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;"> style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;">
<text <text
style="font-size: 16px;margin-right: 8px;flex: 1;margin-right: 15px;">{{item.storeName}}</text> style="font-size: 16px;margin-right: 8px;flex: 1;margin-right: 15px;">{{item.storeName}}</text> -->
<!-- <view style="display: flex;flex-direction: row;align-items: center;" <!-- <view style="display: flex;flex-direction: row;align-items: center;"
@click="makePhoneCall(item.linkPhone)"> @click="makePhoneCall(item.linkPhone)">
@ -32,15 +32,14 @@
<text>咨询电话</text> <text>咨询电话</text>
</view> --> </view> -->
</view> <!-- </view> -->
<view <view
style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 6px;"> style="display: flex;flex-direction: row;align-items: center;margin-left: 15px;margin-right: 16px;margin-top: 15px;">
<image src="../../static/dingwei.png" style="width: 20px;height: 20px;margin-right: 5px;" <image src="../../static/dingwei.png" style="width: 20px;height: 23px;" mode="aspectFill">
mode="aspectFit">
</image> </image>
<text style="font-size: 12px;color: #666;">{{item.address}}</text> <text style="font-size: 16px;margin-left: 10px;">{{item.userAddress}}</text>
</view> </view>
<view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 10px;"> <view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 10px;">
@ -166,7 +165,7 @@
if (res.confirm) { if (res.confirm) {
// console.log('') // console.log('')
_this.$api.cancelReservation(item.reserveCode).then((resp) => { _this.$api.cancelReservation2(item.reserveCode).then((resp) => {
const index = _this.data.findIndex((info) => info.sid === item.sid) const index = _this.data.findIndex((info) => info.sid === item.sid)
console.log("index》》》》", index) console.log("index》》》》", index)
@ -191,10 +190,10 @@
}, },
makePhoneCall(phone) { makePhoneCall(phone) {
if (this.stringIsNotEmpty(phone)) // if (this.stringIsNotEmpty(phone))
wx.makePhoneCall({ wx.makePhoneCall({
phoneNumber: phone, phoneNumber: "13011576972",
}) })
}, },
@ -204,7 +203,7 @@
// //
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
let _this = this let _this = this
_this.$api.myOrderListByUserSid({ _this.$api.myOrderListByUserSid2({
"current": pageNo, "current": pageNo,
"size": pageSize, "size": pageSize,
"params": { "params": {

35
pages/records/reservationRecords4.vue

@ -1,6 +1,6 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);" style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);"
class="app"> class="app">
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 --> <!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'> <z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>
@ -20,31 +20,38 @@
<text class="item-top-state">{{item.stateValue}}</text> <text class="item-top-state">{{item.stateValue}}</text>
</view> </view>
<view <view
style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;"> style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 10px;">
<text <!-- <text
style="font-size: 16px;margin-right: 8px;color: #bbb;flex: 1;margin-right: 15px;">{{item.storeName}}</text> style="font-size: 16px;margin-right: 8px;color: #bbb;flex: 1;margin-right: 15px;">{{item.storeName}}</text> -->
<view style="display: flex;flex-direction: row;align-items: center;"
<view style="display: flex;flex-direction: row;align-items: center; flex: 1.5;">
<image src="../../static/dingwei.png" style="width: 20px;height: 23px;margin-right: 10px;"
mode="aspectFill">
</image>
<text style="font-size: 16px;">{{item.userAddress}}啊实打实大师大多啊撒大声地阿萨德阿斗阿萨德阿</text>
</view>
<!-- <view style="display: flex;flex-direction: row;align-items: center;"
@click="makePhoneCall(item.linkPhone)"> @click="makePhoneCall(item.linkPhone)">
<image src="../../static/phone-2.png" style="width: 20px;height: 20px;margin-right: 5px;"> <image src="../../static/phone-2.png" style="width: 20px;height: 20px;margin-right: 5px;">
</image> </image>
<text style="">咨询电话</text> <text style="">咨询电话</text>
</view> </view> -->
</view> </view>
<view <!-- <view
style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 6px;"> style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 6px;">
<image src="../../static/dingwei.png" style="width: 20px;height: 20px;margin-right: 5px;" <image src="../../static/dingwei.png" style="width: 20px;height: 20px;margin-right: 5px;"
mode="aspectFit"> mode="aspectFit">
</image> </image>
<text style="font-size: 12px;color: #BBBBBB;">{{item.address}}</text> <text style="font-size: 12px;color: #BBBBBB;">{{item.userAddress}}</text>
</view> </view> -->
<view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 10px;"> <view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 5px;">
<view class="item-bom-left"> <view class="item-bom-left">
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;"> <view style="display: flex;flex-direction: row;align-items: center;">
<image src="../../static/time.png" style="width: 15px;height: 15px;margin-right: 5px;"> <image src="../../static/time.png" style="width: 15px;height: 15px;margin-right: 5px;">
</image> </image>
<text style="font-size: 12px;color: #BBBBBB; margin-right: 5px;">提货日期</text> <text style="font-size: 12px;color: #BBBBBB; margin-right: 5px;">提货日期</text>
@ -69,11 +76,11 @@
<view class="item-bom_right" style="box-sizing: border-box;"> <view class="item-bom_right" style="box-sizing: border-box;">
<text style="opacity: 0.7;font-size: 18px;font-weight: 800;font-family: sans-serif;z-index: 101; <text style="opacity: 0.7;font-size: 18px;font-weight: 800;font-family: sans-serif;z-index: 101;
width: 104px; height: 104px;line-height: 104px; text-align: center; background: #666; width: 94px; height: 94px;line-height: 94px; text-align: center; background: #666;
position: absolute;border-radius: 20px;color: #fff;">已提货</text> position: absolute;border-radius: 20px;color: #fff;">已提货</text>
<image src="https://supervise.yxtsoft.com/lpk/image/daiticai.png" <image src="https://supervise.yxtsoft.com/lpk/image/daiticai.png"
style="width: 104px; height: 104px;z-index: 100;border-radius: 20px;"> style="width: 94px; height: 94px;z-index: 100;border-radius: 20px;">
</image> </image>
</view> </view>
@ -157,7 +164,7 @@
// //
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
let _this = this let _this = this
_this.$api.myOrderListByUserSid({ _this.$api.myOrderListByUserSid2({
"current": pageNo, "current": pageNo,
"size": pageSize, "size": pageSize,
"params": { "params": {

4
pages/records/transferRecords.vue

@ -1,6 +1,6 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);"> style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 --> <!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'> <z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>
@ -91,7 +91,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4

4
pages/records/transferRecords2.vue

@ -1,6 +1,6 @@
<template> <template>
<view <view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);"> style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 --> <!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'> <z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>
@ -90,7 +90,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', // title: '-',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', // 5:4

8
uni_modules/common-pay/pages/pay/pay.vue

@ -49,7 +49,7 @@
payType: 'wxpay', payType: 'wxpay',
pay: '微信', pay: '微信',
image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAADcUlEQVR4nO2ZfVLaUBDAdyFCAGekJyg9Qb2BMBX/lZ4APEHxBOIJSk+gnqD0X6EFT6A9QfUExZkCAUK2u1iYNF98+CiR8ptR92Xy8X4vm7cvEWFD2IqEjf9DJN3UMwMTihyunZgGV+2ccQ8++Iqk6vGPFkCZw9AQAah28v1TDl14iqQa8apF8IHD0BFB+NQ57LsG2CUi6dQ36QeHoSWu4RtnmrlEknW9QkBnHIaYyGkv36tyMOVFiiDgeTdvVMDGVmSdbEUWAx+QoIVR/rHgHmxwXcoCQQaQCgSwx5uWYsUieBMFqPzKGy2Yg2QjWSCyygB0wM2FWIkIn+AxAliYV8DJH6EqC73m5lwoF+EU+h7bSWTbuXabm0uTbqbTg2GvRQhvuTkTpSKqJCaITN80anxnDrgZiDIRPugxpiUyqiSEVEMvElGZAPa5GYg6EYy+7x52axw+C7kLw5FxbFlQ4VucAUYWhdaMBasSEUmp7lF/n8OlEYGBaXBnx3cgzZukI19iGpZlMZi81i8JqcibPVEiwmPmWrAJ0rlZqSYr68EIzoioBFPwgaftkn3We5rJRp859ESJiNcSetxBk24BoydeKbdb17MWQpFsAnzhR/5ddXZIkEHpm72fHHqCKkR6+b7rGCFZj9cI4DjCb3E7WuJc7o4IjADOOIWyYINPME0j8CFRjxP/8WSlIk+dpiaHY3inNvHgcmjDnUZ+rE1ESF7H77yKGh/gm0Z+rFwkriVeSdpw6CL1VS9ZFl1wOAUJr2I7UAlKIyfyzAW9bisRmVVD+FmRlNrjPW84jSrzpJETrwGxo0aER7h7ZJTABxnNIUTTnVznjptLwYNxSwEVXomIEJRez8U5aXihTAQRL7uHxgmHShnXj6HB9YgyEIAyEWHWs7IMyYZ+Qbai6YdaEa4TGMHTzjvjEhQwr4SgVGRCJIInz5FJNVP7ZJoXFPBwO1mJyKxZzA+Z3WQBCTT+EJHmTXOzGhHbSWXVyt9KjvmkrZ0o3DiL4O43/WBk4T6SlSUA3nc57NecwNf8m0VFooA5TdPvBmZP0mPpzi3CSkRkKiYLspxjGfhHrERkHWxFwsbGiHD1cn03cInI/B70LhAGvL4buESEjfhn6IQwyvhJCL4iwlOaYQGB0txcGwTYjmtUc6aTnUCRl8RWJGxsjMhvudpkUV3iI98AAAAASUVORK5CYII=', image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAADcUlEQVR4nO2ZfVLaUBDAdyFCAGekJyg9Qb2BMBX/lZ4APEHxBOIJSk+gnqD0X6EFT6A9QfUExZkCAUK2u1iYNF98+CiR8ptR92Xy8X4vm7cvEWFD2IqEjf9DJN3UMwMTihyunZgGV+2ccQ8++Iqk6vGPFkCZw9AQAah28v1TDl14iqQa8apF8IHD0BFB+NQ57LsG2CUi6dQ36QeHoSWu4RtnmrlEknW9QkBnHIaYyGkv36tyMOVFiiDgeTdvVMDGVmSdbEUWAx+QoIVR/rHgHmxwXcoCQQaQCgSwx5uWYsUieBMFqPzKGy2Yg2QjWSCyygB0wM2FWIkIn+AxAliYV8DJH6EqC73m5lwoF+EU+h7bSWTbuXabm0uTbqbTg2GvRQhvuTkTpSKqJCaITN80anxnDrgZiDIRPugxpiUyqiSEVEMvElGZAPa5GYg6EYy+7x52axw+C7kLw5FxbFlQ4VucAUYWhdaMBasSEUmp7lF/n8OlEYGBaXBnx3cgzZukI19iGpZlMZi81i8JqcibPVEiwmPmWrAJ0rlZqSYr68EIzoioBFPwgaftkn3We5rJRp859ESJiNcSetxBk24BoydeKbdb17MWQpFsAnzhR/5ddXZIkEHpm72fHHqCKkR6+b7rGCFZj9cI4DjCb3E7WuJc7o4IjADOOIWyYINPME0j8CFRjxP/8WSlIk+dpiaHY3inNvHgcmjDnUZ+rE1ESF7H77yKGh/gm0Z+rFwkriVeSdpw6CL1VS9ZFl1wOAUJr2I7UAlKIyfyzAW9bisRmVVD+FmRlNrjPW84jSrzpJETrwGxo0aER7h7ZJTABxnNIUTTnVznjptLwYNxSwEVXomIEJRez8U5aXihTAQRL7uHxgmHShnXj6HB9YgyEIAyEWHWs7IMyYZ+Qbai6YdaEa4TGMHTzjvjEhQwr4SgVGRCJIInz5FJNVP7ZJoXFPBwO1mJyKxZzA+Z3WQBCTT+EJHmTXOzGhHbSWXVyt9KjvmkrZ0o3DiL4O43/WBk4T6SlSUA3nc57NecwNf8m0VFooA5TdPvBmZP0mPpzi3CSkRkKiYLspxjGfhHrERkHWxFwsbGiHD1cn03cInI/B70LhAGvL4buESEjfhn6IQwyvhJCL4iwlOaYQGB0txcGwTYjmtUc6aTnUCRl8RWJGxsjMhvudpkUV3iI98AAAAASUVORK5CYII=',
btnColor: '#FE9039' btnColor: '#60CA2C'
}], }],
// 使App,h5() // 使App,h5()
use: [0], use: [0],
@ -122,12 +122,14 @@
let result = '支付剩余时间 ' let result = '支付剩余时间 '
if (hours > 0) { if (hours > 0) {
result += (hours < 10 ? '0' + hours : hours) + ":" + (minutes < 10 ? '0' + minutes : minutes) + ":" + ( result += (hours < 10 ? '0' + hours : hours) + ":" + (minutes < 10 ? '0' + minutes : minutes) +
":" + (
seconds < 10 ? '0' + seconds : seconds) seconds < 10 ? '0' + seconds : seconds)
} else { } else {
// //
if (minutes > 0) { if (minutes > 0) {
result += (minutes < 10 ? '0' + minutes : minutes) + ":" + (seconds < 10 ? '0' + seconds : seconds) result += (minutes < 10 ? '0' + minutes : minutes) + ":" + (seconds < 10 ? '0' + seconds :
seconds)
} else { } else {
result += "00:" + (seconds < 10 ? '0' + seconds : seconds) result += "00:" + (seconds < 10 ? '0' + seconds : seconds)
} }

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

@ -7,8 +7,10 @@
<view v-if="!isRange" class="uni-date-x uni-date-single"> <view v-if="!isRange" class="uni-date-x uni-date-single">
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22" v-if="showClearIcon" <uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22" v-if="showClearIcon"
style="padding-right: 5px;"></uni-icons> style="padding-right: 5px;"></uni-icons>
<view class="uni-date__x-input" v-if="showClearIcon" >{{ displayValue || singlePlaceholderText }}</view> <view class="uni-date__x-input" v-if="showClearIcon">{{ displayValue || singlePlaceholderText }}
<view class="uni-date__x-input" style="text-align: right;color: #FF9900; font-size: 14px;" v-if="!showClearIcon" >{{ displayValue || singlePlaceholderText }}</view> </view>
<view class="uni-date__x-input" style="text-align: right;color: #FF9900; font-size: 14px;"
v-if="!showClearIcon">{{ displayValue || singlePlaceholderText }}</view>
</view> </view>
<view v-else class="uni-date-x uni-date-range"> <view v-else class="uni-date-x uni-date-range">
@ -392,7 +394,8 @@
return this.i18nT("uni-datetime-picker.clear") return this.i18nT("uni-datetime-picker.clear")
}, },
showClearIcon() { showClearIcon() {
return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate &&
this
.displayRangeValue.endDate)) .displayRangeValue.endDate))
} }
}, },

Loading…
Cancel
Save