product_platform/ordermall_applet
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善小程序

Browse Source
This commit is contained in:
myTest383
2024-12-16 14:39:59 +08:00
parent dafca7a329
commit f4f427174c
27 changed files with 893 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
App.vue
View File

@@ -1,102 +1,103 @@
<script>
import config from "common/config.js";
import {
navParams
} from "common/nav-calc-utils.js";
export default {
globalData: {
wxSilentLoginURL: config.baseUrl + "/lpkcustomer/wxSilentLogin",
sid: "",
token: "",
mobile: "",
isNewUser: "", //是否新人 0 否 1 是 邀请新人助力
isPurchase: "", //是否购买过 1否 0是 首页新人礼包弹框
navInfo: {
import config from "common/config.js";
import {
navParams
} from "common/nav-calc-utils.js";
export default {
globalData: {
wxSilentLoginURL: config.baseUrl + "/lpkcustomer/wxSilentLogin",
orgPath: "b0ef543c-7061-4f10-8baa-17930f5170be", // 注册企业全路径 绑定小程序appid
sid: "",
token: "",
mobile: "",
isNewUser: "", //是否新人 0 否 1 是 邀请新人助力
isPurchase: "", //是否购买过 1否 0是 首页新人礼包弹框
navInfo: {
}
},
onLaunch: function() {
}
},
onLaunch: function() {
wx.hideTabBar()
wx.hideTabBar()
const updateManager = uni.getUpdateManager();
const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(function(res) {
// 请求完新版本信息的回调
console.log(res.hasUpdate);
});
updateManager.onCheckForUpdate(function(res) {
// 请求完新版本信息的回调
console.log(res.hasUpdate);
});
updateManager.onUpdateReady(function(res) {
uni.showModal({
title: '更新提示',
content: '新版本已经准备好，是否重启应用？',
success(res) {
if (res.confirm) {
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
}
}
});
updateManager.onUpdateReady(function(res) {
uni.showModal({
title: '更新提示',
content: '新版本已经准备好，是否重启应用？',
success(res) {
if (res.confirm) {
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
}
}
});
});
});
updateManager.onUpdateFailed(function(res) {
// 新的版本下载失败
});
updateManager.onUpdateFailed(function(res) {
// 新的版本下载失败
});
this.globalData.navInfo = navParams()
this.globalData.navInfo = navParams()
// let _this = this;
// wx.login({
// success: function(res) {
// uni.request({
// // 组装请求地址
// url:_this.globalData.wxSilentLoginURL + "?wxCode=" + res.code,
// method: "GET",
// header: {
// 'content-type': "application/x-www-form-urlencoded"
// },
// data: {
// "wxCode": res.code
// },
// success: res => {
// if (res.statusCode == 200) {
// if (!res.data.success) {
// if (res.data.code == "110") {
// // 需要绑定手机号
// uni.reLaunch({
// url: '/pages/index/BindPhone?openid=' +
// res.data.data.wxMpOpenid
// })
// } else {
// // _this.status = 'more'
// }
// } else {
// // 成功后跳转主页
// _this.globalData.sid = res.data.data.sid
// console.log("用户sid",_this.globalData.sid)
// }
// } else {
// }
// },
// fail: (err) => {
// }
// });
// },
// fail: function(res) {
// }
// });
},
onShow: function() {
console.log('App Show')
},
onHide: function() {
console.log('App Hide')
},
}
// let _this = this;
// wx.login({
// success: function(res) {
// uni.request({
// // 组装请求地址
// url:_this.globalData.wxSilentLoginURL + "?wxCode=" + res.code,
// method: "GET",
// header: {
// 'content-type': "application/x-www-form-urlencoded"
// },
// data: {
// "wxCode": res.code
// },
// success: res => {
// if (res.statusCode == 200) {
// if (!res.data.success) {
// if (res.data.code == "110") {
// // 需要绑定手机号
// uni.reLaunch({
// url: '/pages/index/BindPhone?openid=' +
// res.data.data.wxMpOpenid
// })
// } else {
// // _this.status = 'more'
// }
// } else {
// // 成功后跳转主页
// _this.globalData.sid = res.data.data.sid
// console.log("用户sid",_this.globalData.sid)
// }
// } else {
// }
// },
// fail: (err) => {
// }
// });
// },
// fail: function(res) {
// }
// });
},
onShow: function() {
console.log('App Show')
},
onHide: function() {
console.log('App Hide')
},
}
</script>
<style>
/*每个页面公共css */
/*每个页面公共css */
</style>

4
common/config.js
View File

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

2
common/request.api.js
View File

@@ -134,7 +134,7 @@ export default {
// 获取轮播图
bannerList: (params = {}) => request.get("/wxapi/banner/list", params),
// 获取分类和品牌
getGoodsTypeAndBrand: (params = {}) => request.get("/lpkgoods/getGoodsTypeAndBrand", {}, {}, {}, true),
getGoodsTypeAndBrand: (params = {}) => request.post("/lpkgoods/getGoodsTypeAndBrand", params, {}, {}, true),
// 判断企业菜窖是否认证
isEnterprise: (params = {}) => request.get("/lpkgoods/isEnterprise/" + params.customerSid + "/" + params.brandId, +
params, {}, {}, {}, true, true),

6
components/NavBar/NavBar.vue
View File

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

2
custom-tab-bar/index.js
View File

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

80
manifest.json
View File

@@ -1,28 +1,28 @@
{
"name" : "yxt-yyth",
"appid" : "__UNI__1500881",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : 101,
"transformPx" : false,
"name": "yxt-yyth",
"appid": "__UNI__1500881",
"description": "",
"versionName": "1.0.1",
"versionCode": 101,
"transformPx": false,
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
/* 模块配置 */
"modules" : {},
"modules": {},
/* 应用发布信息 */
"distribute" : {
"distribute": {
/* android打包配置 */
"android" : {
"permissions" : [
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -41,35 +41,35 @@
]
},
/* ios打包配置 */
"ios" : {},
"ios": {},
/* SDK配置 */
"sdkConfigs" : {}
"sdkConfigs": {}
}
},
/* 快应用特有相关 */
"quickapp" : {},
"quickapp": {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wx4724e3a3c27f36b5",
"setting" : {
"urlCheck" : false,
"postcss" : true,
"minified" : true
"mp-weixin": {
"appid": "wxc1a7e6792a779a52",
"setting": {
"urlCheck": false,
"postcss": true,
"minified": true
},
"usingComponents" : true,
"lazyCodeLoading" : "requiredComponents"
"usingComponents": true,
"lazyCodeLoading": "requiredComponents"
},
"mp-alipay" : {
"usingComponents" : true
"mp-alipay": {
"usingComponents": true
},
"mp-baidu" : {
"usingComponents" : true
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao" : {
"usingComponents" : true
"mp-toutiao": {
"usingComponents": true
},
"uniStatistics" : {
"enable" : false
"uniStatistics": {
"enable": false
},
"vueVersion" : "2"
}
"vueVersion": "2"
}

6
pages.json
View File

@@ -435,15 +435,15 @@
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "惠享云菜窖",
"navigationBarBackgroundColor": "#60CA2C",
"backgroundColor": "#60CA2C"
"navigationBarBackgroundColor": "#FE9039",
"backgroundColor": "#FE9039"
},
"tabBar": {
"custom": true, //自定义tabBar
"color": "#FFEEE1",
"selectedColor": "#191919",
"borderStyle": "white",
"backgroundColor": "#60CA2C",
"backgroundColor": "#F69448",
"list": [
// {
// "pagePath": "pages/home/cloudCard",

4
pages/SelectAddressActivity.vue
View File

@@ -1,6 +1,6 @@
<template>
<view>
<view style="position: sticky;top: 0;background-color: #60CA2C;">
<view style="position: sticky;top: 0;background-color: #FE9039;">
<view class="search-container">
<!-- 搜索框 -->
<view class="search-container-bar">
@@ -240,7 +240,7 @@
top: 0;
left: 0;
right: 0;
background: #60CA2C;
background: #FE9039;
}
}
}

32
pages/bind/bind_cloudCard.vue
View File

@@ -34,14 +34,31 @@
<view style="display: flex;flex-direction: column;margin-left:16px;box-sizing: border-box;">
<text style="color: #000;font-size: 14px;font-weight: 600;font-family: sans-serif;"
@click="itemClick(item.goodsSid)">{{item.goodsName}}</text>
<text style="margin-top: 6px;color: #999;font-size: 12px;">{{item.goodsContent}}</text>
<view style="display: flex;flex-direction: row;align-items: center;">
<text
style="color: #000;font-size: 14px;font-weight: 600;font-family: sans-serif;flex: 1;"
@click="itemClick(item.goodsSid)">{{item.goodsName}}</text>
<text
style="color: #FF5006;margin-left: 10px;font-size: 16px;">￥{{item.packprice}}</text>
</view>
<!-- <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: 8px;">
<!-- :class="item.state=='0'?'oragin':'gray'" -->
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.weight}}</text>
<text
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;margin-left: 10px;
font-size: 10px;color: #EE752F;">{{item.quantityOfPackage}}{{item.unitName}}/{{item.packUnit}}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
<text style="color: #E36443;font-size: 12px;">{{item.goodsFs}}</text>
<text style="color: #E36443;margin-left: 10px;font-size: 12px;">{{item.goodsJs}}</text>
<!-- <text style="color: #E36443;margin-left: 10px;font-size: 12px;">{{item.goodsJs}}</text> -->
<!-- <text
style="margin-left: 10px;color: #E36443;border: 1px #E36443 solid;border-radius: 8px;padding: 1px 10px;font-size: 12px;">{{item.price}}</text> -->
@@ -212,8 +229,11 @@
let _this = this
var params = {
customerSid: this.page.customerSid,
transferSid: this.page.codeKey
customerSid: this.page.customerSid, // c89f8631-e401-4010-a223-0caf3fabd5c6
transferSid: this.page.codeKey, //e2a9f5be-0abc-4146-a1e9-7e4148458d20
customerSid: 'c89f8631-e401-4010-a223-0caf3fabd5c6', // c89f8631-e401-4010-a223-0caf3fabd5c6
transferSid: 'e2a9f5be-0abc-4146-a1e9-7e4148458d20' //e2a9f5be-0abc-4146-a1e9-7e4148458d20
}
console.log("params+++++++++++++++", params);

70
pages/good/goodsDetail.vue
View File

@@ -1,8 +1,8 @@
<template>
<view style="height: 100vh;background: #fff;">
<loading-state ref="pageView" @request="request">
<view style="height: 100vh;overflow: hidden;overflow-y: auto;">
<image :src="data.picUrl" style="width: 100vw;height: 80vw;" mode="scaleToFill"></image>
<view style="height: 85vh;overflow: hidden;overflow-y: auto;">
<image :src="data.picUrl" style="width: 100vw;height: 80vw;"></image>
<view style="display: flex;flex-direction: column;background: #fff;padding: 20px 20px 0px 20px;margin-top: 10px;
border-top-left-radius: 20px;border-top-right-radius: 20px;height: 100%;">
@@ -10,23 +10,23 @@
<view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
<text
style="font-size: 18px;font-weight: 600;font-family: sans-serif;color: #333;">{{data.name}}</text>
<text style="font-size: 13px;color: #FF7A11;">￥{{data.price}}</text>
<text style="font-size: 13px;color: #FF5006;">￥{{data.mefenPrice}}</text>
</view>
<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: #999;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text>
<text style="font-size: 13px;color: #666;">规&ensp;&ensp;&ensp;&ensp;格</text>
<text style="font-size: 13px;color: #999;">{{data.weight}}</text>
</view>
<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: #999;">{{data.remarks}}</text>
<text style="font-size: 13px;color: #666;">包&ensp;&ensp;&ensp;&ensp;装</text>
<text
style="font-size: 13px;color: #999;">{{data.quantityOfPackage}}{{data.unitName}}/{{data.packUnit}}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;">
<view style="width: 2px;height: 15px;background: #61CB29;margin-right: 10px;"></view>
<view style="width: 2px;height: 15px;background: #FF7A11;margin-right: 10px;"></view>
<text style="font-size: 14px;font-weight: 600;font-family: sans-serif;color: #333;">商品详情</text>
</view>
@@ -40,7 +40,7 @@
</view>
</loading-state>
<!-- <view
<!-- <view
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;"> -->
@@ -69,7 +69,7 @@
</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;">
<text style="background: #FF9900; color: #fff;font-size: 14px; padding: 0px 15px;height: 50px;line-height:50px;flex: 1;text-align: center;
@@ -89,8 +89,8 @@
</view>
</view> -->
<!-- </view> -->
<!-- </view> -->
<!-- </view>
</view> -->
<!-- 弹窗蒙版 -->
@@ -337,9 +337,9 @@
_this.getAllPriceOrWeight()
// _this.$nextTick(() => {
// _this.$refs.pageView.setLoadState(2)
// })
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2)
})
}).catch(e => {
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(1)
@@ -348,33 +348,33 @@
},
getAllPriceOrWeight() {
let _this = this
// let _this = this
var params = {
customerSid: getApp().globalData.sid,
brandId: _this.data.brandId,
}
// var params = {
// customerSid: getApp().globalData.sid,
// brandId: _this.data.brandId,
// }
console.log("getGoodsWeight", params);
// console.log("getGoodsWeight", params);
_this.$api.getGoodsWeight(params).then((resp) => {
// _this.$api.getGoodsWeight(params).then((resp) => {
console.log("getGoodsWeight", resp);
// console.log("getGoodsWeight", resp);
_this.page.price = resp.totalPrice
_this.page.weight = resp.totalWeight
_this.page.remarks = resp.remarks
// _this.page.price = resp.totalPrice
// _this.page.weight = resp.totalWeight
// _this.page.remarks = resp.remarks
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2)
})
// _this.$nextTick(() => {
// _this.$refs.pageView.setLoadState(2)
// })
}).catch(e => {
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(1)
})
})
// }).catch(e => {
// _this.$nextTick(() => {
// _this.$refs.pageView.setLoadState(1)
// })
// })
},
inCart() {

15
pages/good/goodsDetail2.vue
View File

@@ -2,7 +2,7 @@
<view style="height: 100vh;background: #fff;">
<loading-state ref="pageView" @request="request">
<view style="height: 100vh;overflow: hidden;overflow-y: auto;">
<image :src="data.picUrl" style="width: 100vw;height: 80vw;" mode="aspectFill"></image>
<image :src="data.picUrl" style="width: 100vw;height: 80vw;"></image>
<view style="display: flex;flex-direction: column;background: #fff;padding: 20px 20px 0px 20px;margin-top: 10px;
border-top-left-radius: 20px;border-top-right-radius: 20px;height: 100%;">
@@ -10,19 +10,20 @@
<view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
<text
style="font-size: 18px;font-weight: 600;font-family: sans-serif;color: #333;">{{data.name}}</text>
<text style="font-size: 13px;color: #FF7A11;">￥{{data.price}}</text>
<text style="font-size: 13px;color: #FF5006;">￥{{data.mefenPrice}}</text>
</view>
<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: #999;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text>
<text style="font-size: 13px;color: #666;">规&ensp;&ensp;&ensp;&ensp;格</text>
<text style="font-size: 13px;color: #999;">{{data.weight}}</text>
</view>
<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: #999;">{{data.remarks}}</text>
<text style="font-size: 13px;color: #666;">包&ensp;&ensp;&ensp;&ensp;装</text>
<text
style="font-size: 13px;color: #999;">{{data.quantityOfPackage}}{{data.unitName}}/{{data.packUnit}}</text>
</view>
<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>

10
pages/good/reservation.vue
View File

@@ -1,5 +1,5 @@
<template>
<view style="width: 100%;height: 100%;background: #60CA2C;display: flex;flex-direction: column;">
<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;">
<NavBar ref="nav" navTitle="预约提货" :showIcon="true" :supportChange="false">
</NavBar>
@@ -134,9 +134,11 @@
<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}}</text>
<text
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F; margin-right: 10px; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;margin-left: 10px;
font-size: 10px;color: #EE752F;">{{item.quantityOfPackage}}{{item.unitName}}/{{item.specificationUnit}}</text>
<text
style="border: 1px #EE752F solid; background: #FF9900; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
@@ -192,7 +194,7 @@
<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;
<text style=" background: #FF9900;color: #fff;margin-bottom: 20px; border-radius: 20px;
padding-top: 10px;padding-bottom: 10px;padding-left: 25vw;padding-right: 25vw; text-align: center;"
@click="congirmExtract()">确认提货</text>
</view>

546
pages/good/transfer.vue
View File

@@ -1,5 +1,5 @@
<template>
<view style="width: 100%;height: 100%;background: #60CA2C;display: flex;flex-direction: column;">
<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;">
<!-- <NavBar ref="nav" navTitle="转赠亲友" :showIcon="true" :supportChange="false">
</NavBar> -->
@@ -259,7 +259,549 @@
<style>
button {
background: #60CA2C;
background: #FF9900;
color: #fff;
margin-top: 20px;
height: 40px;
width: 80%;
line-height: 40px;
text-align: center;
border-radius: 20px;
margin-bottom: 20px;
}
</style><template>
<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;">
<!-- <NavBar ref="nav" navTitle="转赠亲友" :showIcon="true" :supportChange="false">
</NavBar> -->
<view
style="display: flex;flex-direction: column;background: #f7f7f7;padding: 10px;border-radius: 15px; height: 100vh;width: 100%; box-sizing: border-box;">
<scroll-view scroll-y="true" style="height: calc(100vh - 150px); width: 100%; background: #fff;padding: 10px; box-sizing: border-box;
" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
<view style="display: flex;flex-direction: column;">
<view v-for="(item,index) in pickingUpGoods"
style=" display: flex;flex-direction: row;margin-top: 15px; margin-bottom: 10px;">
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
mode="aspectFill" @click="itemClick(item.goodsSid)"></image>
<view
style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;"
:style="{'border-bottom':(index == goods.length-1 ? 'none' : '1px #EFEFEF solid')}">
<text style="font-size: 14px;color: #000; font-weight: 600;"
@click="itemClick(item.goodsSid)">{{item.name}}</text>
<text style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text>
<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
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>
<text
style="border: 1px #3AA15F solid; background: #40C772;margin-left: 10px; 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;margin-left: 10px; 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: 10px;color: #FF5006;">存量：</text>
<text
style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</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 v-if="transferNotData"
style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin-top: 5vw;">
<image src="https://supervise.yxtsoft.com/lpk/image/supplementing.png" mode="aspectFit"
style="width: 50vw;height: 50vw;"></image>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;">
<text style=" border-radius: 8px; padding: 3px 8px; color: #999;">没有商品咯,请添加~</text>
</view>
</view>
</view>
</scroll-view>
</view>
<view style="position: fixed;bottom: 0;display: flex;flex-direction: column;
border-top: 1px solid #f7f7f7;
justify-content: center;background: #fff; width: 100%;box-sizing:border-box;">
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;
padding-left: 15px;padding-right: 15px;">
<text style="font-size: 14px;margin-right: 10px;font-weight: 600;">转赠留言</text>
<input placeholder="可以写下您对亲友的祝福"
style="font-size: 30rpx;flex: 1;background: #F2F2F2;border-radius: 5px;height: 40px;line-height: 40px;padding-left: 10px;padding-right: 10px;"
:value="transferInfo.remarks" @input="onKeyInput" />
</view>
<button open-type="share" :disabled="transferNotData">确认</button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
affiliation: "",
transferNotData: false,
transferInfo: {
},
pickingUpGoods: [],
}
},
onLoad(options) {
this.pickingUpGoods = JSON.parse(decodeURIComponent(options.pickingUpGoods))
this.affiliation = options.affiliation
console.log(">>>>>", options);
console.log(">>>>>", this.pickingUpGoods);
console.log(">>>>>", this.affiliation);
},
onPageScroll(res) {
// 渐变
this.$refs.nav.defaultColorBgAlpha(res)
},
methods: {
itemClick(goodsSid) {
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + goodsSid
})
},
onKeyInput(event) {
this.transferInfo.remarks = event.target.value
},
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)
that.transferNotData = that.pickingUpGoods.length == 0
} 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
},
onShareAppMessage: function(res) {
let _this = this
const promise = new Promise(resolve => {
// 模拟网络请求
setTimeout(() => {
var 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
})
}
}
var params = {
customerSid: getApp().globalData.sid,
brandId: _this.affiliation,
remarks: _this.transferInfo.remarks,
vos: list
}
// console.log("=========0", params);
_this.$api.transSubmission(params).then((resp) => {
uni.navigateBack()
// console.log("=========", resp);
let shareData = JSON.stringify({
params: {
code: resp.transferCode,
codeKey: resp.sid
},
functionName: 'bindCard',
url: '/pages/bind/bind_cloudCard?code=' + resp
.transferCode + "&codeKey=" + resp.sid
// url: '/pages/home/cloudCard2?shareSid=' + getApp().globalData.sid,
// functionName: 'share'
})
// 转码传输
let value = encodeURIComponent(shareData)
resolve({
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', //自定义图片路径，显示图片长宽比是 5:4。
})
}).catch(e => {
_this.shortToast('发生错误,请稍后再试.')
return
})
}, 0)
})
return promise
},
}
}
</script>
<style>
button {
background: #FF9900;
color: #fff;
margin-top: 20px;
height: 40px;
width: 80%;
line-height: 40px;
text-align: center;
border-radius: 20px;
margin-bottom: 20px;
}
</style><template>
<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;">
<!-- <NavBar ref="nav" navTitle="转赠亲友" :showIcon="true" :supportChange="false">
</NavBar> -->
<view
style="display: flex;flex-direction: column;background: #f7f7f7;padding: 10px;border-radius: 15px; height: 100vh;width: 100%; box-sizing: border-box;">
<scroll-view scroll-y="true" style="height: calc(100vh - 150px); width: 100%; background: #fff;padding: 10px; box-sizing: border-box;
" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
<view style="display: flex;flex-direction: column;">
<view v-for="(item,index) in pickingUpGoods"
style=" display: flex;flex-direction: row;margin-top: 15px; margin-bottom: 10px;">
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
mode="aspectFill" @click="itemClick(item.goodsSid)"></image>
<view
style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;"
:style="{'border-bottom':(index == goods.length-1 ? 'none' : '1px #EFEFEF solid')}">
<text style="font-size: 14px;color: #000; font-weight: 600;"
@click="itemClick(item.goodsSid)">{{item.name}}</text>
<text style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text>
<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
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>
<text
style="border: 1px #3AA15F solid; background: #40C772;margin-left: 10px; 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;margin-left: 10px; 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: 10px;color: #FF5006;">存量：</text>
<text
style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</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 v-if="transferNotData"
style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin-top: 5vw;">
<image src="https://supervise.yxtsoft.com/lpk/image/supplementing.png" mode="aspectFit"
style="width: 50vw;height: 50vw;"></image>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;">
<text style=" border-radius: 8px; padding: 3px 8px; color: #999;">没有商品咯,请添加~</text>
</view>
</view>
</view>
</scroll-view>
</view>
<view style="position: fixed;bottom: 0;display: flex;flex-direction: column;
border-top: 1px solid #f7f7f7;
justify-content: center;background: #fff; width: 100%;box-sizing:border-box;">
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;
padding-left: 15px;padding-right: 15px;">
<text style="font-size: 14px;margin-right: 10px;font-weight: 600;">转赠留言</text>
<input placeholder="可以写下您对亲友的祝福"
style="font-size: 30rpx;flex: 1;background: #F2F2F2;border-radius: 5px;height: 40px;line-height: 40px;padding-left: 10px;padding-right: 10px;"
:value="transferInfo.remarks" @input="onKeyInput" />
</view>
<button open-type="share" :disabled="transferNotData">确认</button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
affiliation: "",
transferNotData: false,
transferInfo: {
},
pickingUpGoods: [],
}
},
onLoad(options) {
this.pickingUpGoods = JSON.parse(decodeURIComponent(options.pickingUpGoods))
this.affiliation = options.affiliation
console.log(">>>>>", options);
console.log(">>>>>", this.pickingUpGoods);
console.log(">>>>>", this.affiliation);
},
onPageScroll(res) {
// 渐变
this.$refs.nav.defaultColorBgAlpha(res)
},
methods: {
itemClick(goodsSid) {
uni.navigateTo({
url: '/pages/good/goodsDetail?sid=' + goodsSid
})
},
onKeyInput(event) {
this.transferInfo.remarks = event.target.value
},
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)
that.transferNotData = that.pickingUpGoods.length == 0
} 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
},
onShareAppMessage: function(res) {
let _this = this
const promise = new Promise(resolve => {
// 模拟网络请求
setTimeout(() => {
var 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
})
}
}
var params = {
customerSid: getApp().globalData.sid,
brandId: _this.affiliation,
remarks: _this.transferInfo.remarks,
vos: list
}
// console.log("=========0", params);
_this.$api.transSubmission(params).then((resp) => {
uni.navigateBack()
// console.log("=========", resp);
let shareData = JSON.stringify({
params: {
code: resp.transferCode,
codeKey: resp.sid
},
functionName: 'bindCard',
url: '/pages/bind/bind_cloudCard?code=' + resp
.transferCode + "&codeKey=" + resp.sid
// url: '/pages/home/cloudCard2?shareSid=' + getApp().globalData.sid,
// functionName: 'share'
})
// 转码传输
let value = encodeURIComponent(shareData)
resolve({
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', //自定义图片路径，显示图片长宽比是 5:4。
})
}).catch(e => {
_this.shortToast('发生错误,请稍后再试.')
return
})
}, 0)
})
return promise
},
}
}
</script>
<style>
button {
background: #FF9900;
color: #fff;
margin-top: 20px;
height: 40px;

154
pages/home/cloudCard2.vue
View File

@@ -1,7 +1,7 @@
<template>
<view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);">
<view class="top" style="position: fixed;">
@@ -91,24 +91,24 @@
<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> -->
<!-- <text
style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remarks}}</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 style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F; margin-left: 10px; margin-right: 10px; ">{{item.remarks}}</text>
font-size: 10px;color: #EE752F;">{{item.title}}</text>
<text
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F; margin-left: 10px; margin-right: 10px; ">{{item.quantityOfPackage}}{{item.unitName}}/{{item.specificationUnit}}</text>
</view>
<!-- sss -->
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 5px;
margin-right: 15px;">
<text style="font-size: 14px;color: #FF5006;">￥{{item.jprice}}元</text>
<text
style="font-size: 14px;color: #FF5006;">￥{{item.packprice}}元</text>
<view style="display: flex;flex-direction: row;align-items: center;">
@@ -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; border: 1px #60CA2C 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 #FF5006 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;">
<view
@@ -199,8 +199,8 @@
<text
style="background: #60CA2C; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
border: 1px #60CA2C solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;margin-right: 20px;"
style="background: #FF9900; 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;"
@click="settlement()">去结算</text>
</view>
@@ -313,7 +313,7 @@
<view v-for="(item,index) in newPerGiftList" class="device-list" style="overflow-y: auto;">
<view style="">
<radio :value="item.sid" style="transform:scale(0.8)" color="#60CA2C" />
<radio :value="item.sid" style="transform:scale(0.8)" color="#FF9900" />
</view>
<view
@@ -354,7 +354,7 @@
<view
style=" height: 15vw; flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;"
class="newpor_bom">
<text style="background: #60CA2C;color: #fff;text-align: center;border-radius: 20px;
<text style="background: #FF9900;color: #fff;text-align: center;border-radius: 20px;
padding:8px 25px ;" @click="newporGift">确认结算</text>
</view>
@@ -552,7 +552,8 @@
sid: "0",
name: "",
affiliation: "",
customerSid: ""
customerSid: "",
orgPath: getApp().globalData.orgPath
},
styleObject: {
// 'position': 'fixed',
@@ -762,7 +763,9 @@
this.getgoods()
} else {
let _this = this
_this.$api.getGoodsTypeAndBrand().then((resp) => {
_this.$api.getGoodsTypeAndBrand({
orgPath: getApp().globalData.orgPath
}).then((resp) => {
_this.data = resp
console.log("======", resp);
_this.baseDataSuccess = true
@@ -806,55 +809,54 @@
getgoods() {
let _this = this
var params = {
customerSid: getApp().globalData.sid,
brandId: this.data.brandVos[this.selectIndex2].id
}
_this.$api.isEnterprise(params).then((resp) => {
console.log("isEnterprise>>", resp);
// 正常继续操作 不是企业菜窖类型或已经认证成功
_this.searchInfo.customerSid = getApp().globalData.sid
_this.searchInfo.brandId = _this.data.brandVos[_this.selectIndex2].id
_this.searchInfo.categoryId = _this.data.typeVos[_this.selectIndex].id
// var params = {
// customerSid: getApp().globalData.sid,
// brandId: this.data.brandVos[this.selectIndex2].id
// }
// _this.$api.isEnterprise(params).then((resp) => {
// console.log("isEnterprise>>", resp);
// 正常继续操作 不是企业菜窖类型或已经认证成功
_this.searchInfo.customerSid = getApp().globalData.sid
_this.searchInfo.brandId = _this.data.brandVos[_this.selectIndex2].id
_this.searchInfo.categoryId = _this.data.typeVos[_this.selectIndex].id
_this.$api.getGoodsByType(_this.searchInfo).then((resp) => {
_this.goods = resp
_this.notData = resp.length == 0
_this.notAuthentication = false
_this.getAllPriceOrWeight()
}).catch(e => {
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(1)
})
})
}).catch(e => {
console.log("isEnterprise>>", e);
_this.$api.getGoodsByType(_this.searchInfo).then((resp) => {
_this.goods = resp
_this.notData = resp.length == 0
_this.notAuthentication = false
_this.getAllPriceOrWeight()
_this.goods = []
// 错误需判断code 状态
this.authenticationType = e.code
if (e.code == '201') {
// 未认证
this.notAuthentication = true
} else if (e.code == '202' || e.code == '203') {
// 认证审核中 或 认证不通过
this.notAuthentication = false
this.showModal6 = true
this.authenticationRemarks = e.data.remarks
} else {
uni.showToast({
title: e.msg,
icon: 'none',
duration: 5000,
})
}
}).catch(e => {
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(1)
})
})
// }).catch(e => {
// console.log("isEnterprise>>", e);
// _this.getAllPriceOrWeight()
// _this.goods = []
// // 错误需判断code 状态
// this.authenticationType = e.code
// if (e.code == '201') {
// // 未认证
// this.notAuthentication = true
// } else if (e.code == '202' || e.code == '203') {
// // 认证审核中 或 认证不通过
// this.notAuthentication = false
// this.showModal6 = true
// this.authenticationRemarks = e.data.remarks
// } else {
// uni.showToast({
// title: e.msg,
// icon: 'none',
// duration: 5000,
// })
// }
// })
},
@@ -885,7 +887,7 @@
// } else {
if (Number(item.goodsNumber) > 0) {
item.goodsNumber = Number(item.goodsNumber) - 1
item.subtotal = Number(item.goodsNumber) * Number(item.jprice)
item.subtotal = Number(item.goodsNumber) * Number(item.packprice)
that.upDateShoppCart(item)
}
@@ -896,7 +898,7 @@
jia(item) {
item.goodsNumber = Number(item.goodsNumber) + 1
item.subtotal = Number(item.goodsNumber) * Number(item.jprice)
item.subtotal = Number(item.goodsNumber) * Number(item.packprice)
this.upDateShoppCart(item)
},
@@ -958,8 +960,8 @@
goodsName: item.name,
goodsNumber: item.goodsNumber,
affiliation: this.data.brandVos[this.selectIndex2].id,
price: item.jprice,
weight: item.weight,
price: item.packprice,
weight: item.goodsNumber,
customerSid: getApp().globalData.sid
}
@@ -1198,7 +1200,7 @@
.button2 {
background: #fff;
color: #60CA2C;
color: #FF9900;
border-radius: 0px;
border-bottom-right-radius: 20px;
flex: 1;
@@ -1206,7 +1208,7 @@
}
button {
background: #60CA2C;
background: #FF9900;
color: #fff;
height: 42px;
line-height: 40px;
@@ -1335,7 +1337,7 @@
.swiper /deep/ .wx-swiper-dot-active {
width: 44rpx;
height: 12rpx;
background: #60CA2C;
background: #FF9900;
border-radius: 8rpx;
}
@@ -1374,7 +1376,7 @@
.label2 {
background: #FFF;
color: #FFF;
background-color: #60CA2C;
background-color: #FF9900;
font-size: 12px;
margin-top: 10px;
margin-bottom: 10px;
@@ -1388,7 +1390,7 @@
}
.top_img1 {
border: 1px #60CA2C solid;
border: 1px #FF9900 solid;
}
.top_img2 {
@@ -1396,8 +1398,8 @@
}
.top_text1 {
border: 1px #60CA2C solid;
background: #81C95D;
border: 1px #FF9900 solid;
background: #FF5006;
color: #fff;
font-weight: 800;
font-family: sans-serif;
@@ -1410,9 +1412,9 @@
}
.top_text2 {
border: 1px #60CA2C solid;
border: 1px #FF9900 solid;
background: #fff;
color: #81C95D;
color: #F6894B;
font-weight: 800;
padding: 5px 12px;
font-family: sans-serif;

48
pages/home/myCellar.vue
View File

@@ -1,7 +1,7 @@
<template>
<view
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);">
<view class="top">
<NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight"
@@ -84,8 +84,12 @@
<view
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
<!-- :class="item.state=='0'?'oragin':'gray'" -->
<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>
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.weight}}</text>
<text
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;margin-left: 10px;
font-size: 10px;color: #EE752F;">{{item.quantityOfPackage}}{{item.unitName}}/{{item.specificationUnit}}</text>
<text
style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
@@ -147,7 +151,7 @@
<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="background: #61CB29; border-radius: 8px; padding: 3px 8px; color: #fff;"
style="background: #FF9900; border-radius: 8px; padding: 3px 8px; color: #fff;"
@click="gotoShopp()">补充商品</text>
</view>
</view>
@@ -165,11 +169,11 @@
style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;padding: 0px 20px;">
<text
style="background: #61CB29;color: #fff;height: 40px;line-height: 40px;font-size: 13px;padding: 0px 15px;border: 1px #61CB29 solid;
style="background: #FF9900;color: #fff;height: 40px;line-height: 40px;font-size: 13px;padding: 0px 15px;border: 1px #FF5006 solid;
border-top-left-radius: 25px;border-bottom-left-radius: 25px;border-top-right-radius: 0px;border-bottom-right-radius: 0px;"
@click="transfer()">转赠亲友</text>
<view style="border: 1px #61CB29 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
<view style="border: 1px #FF5006 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;"
@click="gotoCart()">
<!-- image src="../../static/shoppCart_icon.png" mode="aspectFill"
@@ -178,8 +182,8 @@
<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">{{page.count}}</text>
<text style="font-size: 12px;color: #666;margin-left: 10px; ">份</text>
</view>
<text style="background: #61CB29; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
border: 1px #61CB29 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;"
<text style="background: #FF9900; 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;"
@click="reservation()">预约提货</text>
@@ -224,7 +228,7 @@
<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>
font-size: 10px;color: #EE752F;">{{item.weight}}</text>
<text
style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
@@ -271,7 +275,7 @@
style="width: 50vw;height: 50vw;"></image>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;">
<text
style="background: #61CB29; border-radius: 8px; padding: 3px 8px; color: #fff;">请添加~</text>
style="background: #FF9900; border-radius: 8px; padding: 3px 8px; color: #fff;">请添加~</text>
</view>
</view>
@@ -628,7 +632,8 @@
request() {
let _this = this
var params = {
customerSid: getApp().globalData.sid
customerSid: getApp().globalData.sid,
orgPath: getApp().globalData.orgPath
}
_this.$api.vegeCellarTypeList(params).then((resp) => {
@@ -648,7 +653,8 @@
var params = {
customerSid: getApp().globalData.sid,
affiliation: this.data[this.selectIndex].id
affiliation: this.data[this.selectIndex].id,
orgPath: getApp().globalData.orgPath
}
@@ -952,7 +958,7 @@
.button2 {
background: #fff;
color: #61CB29;
color: #FF9900;
border-radius: 0px;
border-bottom-right-radius: 20px;
flex: 1;
@@ -960,13 +966,13 @@
}
button {
background: #61CB29;
background: #FF9900;
color: #fff;
height: 42px;
line-height: 40px;
font-size: 13px;
padding: 0px 15px;
border: 1px #61CB29 solid;
border: 1px #FF5006 solid;
border-top-left-radius: 25px;
border-bottom-left-radius: 25px;
border-top-right-radius: 0px;
@@ -1023,7 +1029,7 @@
.label2 {
background: #FFF;
color: #FFF;
background-color: #61CB29;
background-color: #FF9900;
font-size: 12px;
margin-top: 10px;
margin-bottom: 10px;
@@ -1036,7 +1042,7 @@
}
.top_img1 {
border: 1px #61CB29 solid;
border: 1px #FF9900 solid;
}
.top_img2 {
@@ -1044,8 +1050,8 @@
}
.top_text1 {
border: 1px #61CB29 solid;
background: #61CB29;
border: 1px #FF9900 solid;
background: #FF5006;
color: #fff;
font-weight: 800;
font-family: sans-serif;
@@ -1058,9 +1064,9 @@
}
.top_text2 {
border: 1px #61CB29 solid;
border: 1px #FF9900 solid;
background: #fff;
color: #61CB29;
color: #F6894B;
font-weight: 800;
padding: 5px 16px;
font-family: sans-serif;

2
pages/login/login.vue
View File

@@ -55,6 +55,7 @@
uni.request({
// 组装请求地址
url: getApp().globalData.wxSilentLoginURL + "?wxCode=" + res.code,
// +"&appid=wx4724e3a3c27f36b5",
method: "GET",
header: {
'content-type': "application/x-www-form-urlencoded"
@@ -83,6 +84,7 @@
getApp().globalData.isPurchase = res.data.data
.isPurchase
getApp().globalData.mobile = res.data.data.mobile
// getApp().globalData.orgPath = res.data.data.orgPath
uni.setStorageSync("satoken", res.data.data.token)
console.log("人员sid", res.data.data.sid);
console.log("token", res.data.data.token);

2
pages/me/RealInfo.vue
View File

@@ -41,7 +41,7 @@
</view>
</pick-regions>
<view style="background: -webkit-linear-gradient(left,#61CB29,#60CA2C); position: absolute; bottom: 30px;
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px;
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;"
@click="realInfoAttestation">

23
pages/me/addInvoice.vue
View File

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

14
pages/me/makeInvoice.vue
View File

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

10
pages/records/orderDetail.vue
View File

@@ -28,7 +28,7 @@
<text style="flex: 1;font-weight: 600;font-family: sans-serif;font-size: 14px;"
@click="itemClick(item.goodsSid)">{{item.goodsName}}</text>
<text
style="font-weight: 600;font-family: sans-serif;font-size: 14px;">￥{{item.priceUnit}}</text>
style="font-weight: 600;font-family: sans-serif;font-size: 14px;">￥{{item.pricePart}}</text>
</view>
<!-- <text style="margin-top: 10px;font-size: 12px;color: #999;">{{item.remarks}}</text> -->
@@ -36,11 +36,11 @@
<view style="margin-top: 8px;display: flex;flex-direction: column;">
<view style="display: flex;flex-direction: row;align-items: center;">
<!-- <text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.priceUnit}}元/{{item.unitName}}</text> -->
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
font-size: 10px;color: #EE752F;">{{item.weight}}</text>
<text
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>
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;margin-left: 10px;
font-size: 10px;color: #EE752F; ">{{item.quantityOfPackage}}{{item.unitName}}/{{item.specificationUnit}}</text>
</view>
<text

4
pages/records/orderRecords.vue
View File

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

2
pages/records/reservationRecords.vue
View File

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

2
pages/records/reservationRecords2.vue
View File

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

2
pages/records/reservationRecords3.vue
View File

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

2
pages/records/reservationRecords4.vue
View File

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

2
pages/records/transferRecords.vue
View File

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

2
pages/records/transferRecords2.vue
View File

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