From 457590ce6511939f8cf69afcd1950aa7e7ea3285 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Sat, 2 Dec 2023 15:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 10 ++-
androidPrivacy.json | 35 ++++++++++
components/index/detaila.vue | 21 +++---
components/index/detailb.vue | 10 ++-
components/index/detailc.vue | 11 ++--
components/index/index.vue | 28 ++++----
components/index/index1.vue | 15 +++--
components/index/indexg.vue | 22 +++++--
components/you-scroll.vue | 4 +-
manifest.json | 49 ++++++++++++--
pages.json | 8 +--
pages/index/detail.vue | 2 +-
pages/index/index.vue | 104 +++++++++++++++++++++---------
pages/index/subnvue.nvue | 2 +-
pages/oaLogin/oaLogin.vue | 28 ++++----
static/css/base.css | 20 +-----
unpackage/res/icons/1024x1024.png | Bin 0 -> 380607 bytes
unpackage/res/icons/120x120.png | Bin 0 -> 17677 bytes
unpackage/res/icons/144x144.png | Bin 0 -> 23036 bytes
unpackage/res/icons/152x152.png | Bin 0 -> 24860 bytes
unpackage/res/icons/167x167.png | Bin 0 -> 28845 bytes
unpackage/res/icons/180x180.png | Bin 0 -> 32171 bytes
unpackage/res/icons/192x192.png | Bin 0 -> 35357 bytes
unpackage/res/icons/20x20.png | Bin 0 -> 1197 bytes
unpackage/res/icons/29x29.png | Bin 0 -> 2089 bytes
unpackage/res/icons/40x40.png | Bin 0 -> 3305 bytes
unpackage/res/icons/58x58.png | Bin 0 -> 5812 bytes
unpackage/res/icons/60x60.png | Bin 0 -> 6132 bytes
unpackage/res/icons/72x72.png | Bin 0 -> 8053 bytes
unpackage/res/icons/76x76.png | Bin 0 -> 8821 bytes
unpackage/res/icons/80x80.png | Bin 0 -> 9542 bytes
unpackage/res/icons/87x87.png | Bin 0 -> 10874 bytes
unpackage/res/icons/96x96.png | Bin 0 -> 12570 bytes
utils/oahttp.js | 8 +--
34 files changed, 257 insertions(+), 120 deletions(-)
create mode 100644 androidPrivacy.json
create mode 100644 unpackage/res/icons/1024x1024.png
create mode 100644 unpackage/res/icons/120x120.png
create mode 100644 unpackage/res/icons/144x144.png
create mode 100644 unpackage/res/icons/152x152.png
create mode 100644 unpackage/res/icons/167x167.png
create mode 100644 unpackage/res/icons/180x180.png
create mode 100644 unpackage/res/icons/192x192.png
create mode 100644 unpackage/res/icons/20x20.png
create mode 100644 unpackage/res/icons/29x29.png
create mode 100644 unpackage/res/icons/40x40.png
create mode 100644 unpackage/res/icons/58x58.png
create mode 100644 unpackage/res/icons/60x60.png
create mode 100644 unpackage/res/icons/72x72.png
create mode 100644 unpackage/res/icons/76x76.png
create mode 100644 unpackage/res/icons/80x80.png
create mode 100644 unpackage/res/icons/87x87.png
create mode 100644 unpackage/res/icons/96x96.png
diff --git a/App.vue b/App.vue
index f17a89b..850f8d6 100644
--- a/App.vue
+++ b/App.vue
@@ -3,6 +3,8 @@
const jpushModule = uni.requireNativePlugin("JG-JPush");
// #endif
+ import Cache from '@/utils/cache';
+
export default {
onLaunch: function() {
console.log('App Launch')
@@ -11,8 +13,15 @@
plus.screen.lockOrientation('landscape-primary');
// #endif
+ },
+ onLoad() {
+
+
},
onShow: function() {
+
+
+
console.log('App Show')
const audioContext = uni.createInnerAudioContext()
// 设置音频文件地址
@@ -46,6 +55,5 @@
}
@import "static/css/base.css";
-
@import url('static/iconfont/iconfont.css')
\ No newline at end of file
diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..759f5c2
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,35 @@
+{
+ "version" : "1",
+ "prompt" : "template",
+ "title" : "服务协议和隐私政策",
+ "message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+ "buttonAccept" : "同意并接受",
+ "buttonRefuse" : "暂不同意",
+ "hrefLoader" : "system|default",
+ "backToExit" : "false",
+ "second" : {
+ "title" : "确认提示",
+ "message" : " 进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。",
+ "buttonAccept" : "同意并继续",
+ "buttonRefuse" : "退出应用"
+ },
+ "disagreeMode" : {
+ "support" : false,
+ "loadNativePlugins" : false,
+ "visitorEntry" : true,
+ "showAlways" : false
+ },
+ "styles" : {
+ "backgroundColor" : "#fff",
+ "borderRadius" : "5px",
+ "title" : {
+ "color" : "#000"
+ },
+ "buttonAccept" : {
+ "color" : "#000"
+ },
+ "buttonRefuse" : {
+ "color" : "#000"
+ }
+ }
+}
diff --git a/components/index/detaila.vue b/components/index/detaila.vue
index ba05276..e752e1c 100644
--- a/components/index/detaila.vue
+++ b/components/index/detaila.vue
@@ -1,5 +1,5 @@
-
+
@@ -190,7 +190,7 @@
mounted() {
-
+
this.getlist(this.type)
this.getLocation()
@@ -380,13 +380,13 @@
order_sn: oredr
}
-
+
takeGoods(data).then(res => {
// Toast(res.msg)
if (res.code == 1) {
-
+
const subNVue = uni.getSubNVueById('concat'); // 通过 id 获取 nvue 子窗体
subNVue.show('none', 1000); // 打开 nvue 子窗体
setTimeout(() => {
@@ -453,6 +453,7 @@
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
+ margin-top: 10rpx;
.content-img {
width: 22rpx;
@@ -523,7 +524,7 @@
display: flex;
justify-content: space-between;
position: relative;
-
+ padding-top: 10rpx;
}
@@ -541,7 +542,7 @@
background: #ffffff;
box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
border-radius: 15rpx 15rpx 15rpx 15rpx;
- margin-top: 25px;
+
margin-bottom: 10rpx;
position: relative;
@@ -629,13 +630,7 @@
}
- .container-content-right {
- margin-top: 20px;
-
-
-
-
- }
+ .container-content-right {}
.map_btn {
width: 50px;
diff --git a/components/index/detailb.vue b/components/index/detailb.vue
index 94ca98e..a710d6b 100644
--- a/components/index/detailb.vue
+++ b/components/index/detailb.vue
@@ -1,5 +1,5 @@
-
+
@@ -310,7 +310,7 @@
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
-
+margin-top: 10rpx;
.content-img {
width: 22rpx;
height: 22rpx;
@@ -762,7 +762,11 @@
background: #FF7C32;
border-radius: 23px 23px 23px 23px;
display: flex;
- margin: 0 auto;
+ position: absolute;
+ left: 50%;
+ margin-left: -60rpx;
+ bottom:80rpx;
+ position: fixed;
}
.btn1 image {
diff --git a/components/index/detailc.vue b/components/index/detailc.vue
index 1dff8b2..9e6076d 100644
--- a/components/index/detailc.vue
+++ b/components/index/detailc.vue
@@ -1,5 +1,5 @@
-
+
@@ -203,7 +203,7 @@
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
-
+margin-top: 10rpx;
.content-img {
width: 22rpx;
height: 22rpx;
@@ -259,7 +259,8 @@
background-color: #fff;
border-radius: 12rpx 12rpx;
- width: 554rpx;
+ width: 565rpx;
+
.content-one {
height: 39rpx;
@@ -270,7 +271,7 @@
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #FFFFFF;
- padding-left: 38rpx;
+ padding-left: 15rpx;
}
.content-one1 {
@@ -283,7 +284,7 @@
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #FFFFFF;
- padding-left: 38rpx;
+ padding-left: 15rpx;
}
.content-two {
diff --git a/components/index/index.vue b/components/index/index.vue
index c2696b6..079c973 100644
--- a/components/index/index.vue
+++ b/components/index/index.vue
@@ -1,21 +1,18 @@
-
+
搜索
-
-
-
+ @scrolltolower.stop="loadMoreData">
商户名称：{{item.shop_name}}
@@ -138,11 +135,11 @@
},
mounted() {
-
-
this.initlist()
},
-
+ onShow() {
+ this.initlist()
+ },
methods: {
onPullDown(done) { // 下拉刷新
@@ -151,6 +148,7 @@
done(); // 完成刷新
}, 1000 * 1)
},
+
refresh() {
this.initlist()
},
@@ -168,12 +166,14 @@
}
},
initlist() {
+
this.list = []
this.page_no = 1
this.getlist()
},
//列表
- getlist(val) {
+ getlist() {
+
let data = {
page_no: this.page_no,
page_size: this.page_size,
@@ -184,12 +184,18 @@
lists(
data
).then(res => {
+
if (res.code == 1) {
- uni.hideLoading();
+ uni.hideLoading()
this.list = [...this.list, ...res.data]
this.page_no = this.page_no + 1
+ this.$forceUpdate()
+
}
+ }).catch((err) => {
+ console.log(err)
+ uni.hideLoading()
})
},
kk(item) {
@@ -496,7 +502,7 @@
width: 23rpx;
height: 23rpx;
margin-left: 60rpx;
- margin-top: 2rpx;
+ margin-top: 1rpx;
margin-right: 10rpx;
}
\ No newline at end of file
diff --git a/components/index/index1.vue b/components/index/index1.vue
index 09d1fc5..4de8294 100644
--- a/components/index/index1.vue
+++ b/components/index/index1.vue
@@ -1,8 +1,8 @@
+
-
+ @scrolltolower.stop="loadMoreData">
收货人名称：{{item.receiver_name}}
联系电话：{{item.receiver_phone}}
- 商家地址：{{item.receiver_address}}
+ 联系地址：{{item.receiver_address}}
订单编号：{{item.order_sn}}
@@ -140,6 +140,9 @@
this.initlist()
},
+onShow() {
+ this.initlist()
+ },
methods: {
@@ -186,9 +189,13 @@
data
).then(res => {
if (res.code == 1) {
+ uni.hideLoading()
this.list = [...this.list, ...res.data]
this.page_no = this.page_no + 1
}
+ }).catch((err) => {
+ console.log(err)
+ uni.hideLoading()
})
},
loadMoreData() {
@@ -523,7 +530,7 @@
width: 23rpx;
height: 23rpx;
margin-left: 60rpx;
- margin-top: 2rpx;
+ margin-top: 1rpx;
margin-right: 10rpx;
}
\ No newline at end of file
diff --git a/components/index/indexg.vue b/components/index/indexg.vue
index 3ea765b..513efb1 100644
--- a/components/index/indexg.vue
+++ b/components/index/indexg.vue
@@ -1,5 +1,6 @@
+
@@ -12,7 +13,7 @@
+ @scrolltolower.stop="loadMoreData">
@@ -22,7 +23,7 @@
联系电话：{{item.receiver_phone}}
- 商家地址：{{item.shop_address}}
+ 联系地址：{{item.receiver_address}}
订单编号：{{item.order_sn}}
取货时间：{{item.qh_time}}
@@ -87,7 +88,7 @@
-
+
@@ -122,14 +123,17 @@
this.initlist()
},
+ onShow() {
+ this.initlist()
+ },
methods: {
onPullDown(done) { // 下拉刷新
setTimeout(() => {
- this.initlist()
+ this.initlist()
done(); // 完成刷新
- },1000*1)
+ }, 1000 * 1)
},
refresh() {
this.initlist()
@@ -160,9 +164,13 @@
data
).then(res => {
if (res.code == 1) {
+ uni.hideLoading()
this.list = [...this.list, ...res.data]
this.page_no = this.page_no + 1
}
+ }).catch((err) => {
+ console.log(err)
+ uni.hideLoading()
})
},
@@ -171,7 +179,7 @@
// uni.navigateTo({
// url: '/pages/sda/detail?id=' + item.id
// })
- this.$emit('onfunction', item.id,3)
+ this.$emit('onfunction', item.id, 3)
},
loadMoreData() {
@@ -458,7 +466,7 @@
width: 23rpx;
height: 23rpx;
margin-left: 60rpx;
- margin-top: 2rpx;
+ margin-top:1rpx;
margin-right: 10rpx;
}
\ No newline at end of file
diff --git a/components/you-scroll.vue b/components/you-scroll.vue
index 4239b0b..519ab3c 100644
--- a/components/you-scroll.vue
+++ b/components/you-scroll.vue
@@ -10,8 +10,8 @@
-
+
diff --git a/manifest.json b/manifest.json
index dd2078c..6b5b2ee 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "wuliu",
+ "name" : "物流溯源平台",
"appid" : "__UNI__5A081C6",
"description" : "",
"versionName" : "1.0.0",
@@ -12,8 +12,8 @@
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
+ "alwaysShowBeforeRender" : false,
+ "waiting" : false,
"autoclose" : true,
"delay" : 0
},
@@ -49,7 +49,8 @@
"",
"",
""
- ]
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
/* ios打包配置 */
"ios" : {
@@ -77,6 +78,46 @@
}
},
"push" : {}
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ },
+ "ios" : {
+ "appstore" : "unpackage/res/icons/1024x1024.png",
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ },
+ "iphone" : {
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ }
+ }
+ },
+ "splashscreen" : {
+ "androidStyle" : "default",
+ "useOriginalMsgbox" : true,
+ "android" : {
+ "xhdpi" : "",
+ "xxhdpi" : "E:/公司/微信图片_20231201135226.png"
+ }
}
},
"nativePlugins" : {
diff --git a/pages.json b/pages.json
index 6b10a97..0b0cd84 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,6 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-
- {
+ {
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
@@ -35,10 +34,11 @@
},
"navigationBarBackgroundColor": "#3274F9",
"navigationBarTextStyle": "white"
-
+
}
-
+
},
+
{
"path": "pages/index/detail",
"style": {
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 9766c2b..d33673d 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -451,7 +451,7 @@
padding-top: 22rpx;
padding-left: 15rpx;
padding-right: 15rpx;
- width: 600rpx;
+
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5d5d750..1921cde 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -58,6 +58,7 @@
import {
HTTP_REQUEST_URL
} from '@/config/app.js'
+ import Cache from '@/utils/cache';
import index from '@/components/index/index.vue'
import index1 from '@/components/index/index1.vue'
import pindex from '@/components/index/indexg.vue'
@@ -124,8 +125,30 @@
onLoad() {
+ if (!Cache.get("TOKEN")) {
+ uni.showModal({
+ title: '提示',
+ content: '用户信息不存在,是否确定登录？',
+ cancelText: "取消", // 取消按钮的文字
+ confirmText: "确认", // 确认按钮的文字
+ showCancel: true, // 是否显示取消按钮，默认为 true
+ confirmColor: '#f55850',
+ cancelColor: '#39B54A',
+ success: (res) => {
+ if (res.confirm) {
+ uni.reLaunch({
+ url: '/pages/oaLogin/oaLogin'
+ })
+ console.log('comfirm') //点击确定之后执行的代码
+ } else {
+ console.log('cancel') //点击取消之后执行的代码
+ }
+ }
+ })
+ }
+
},
// onPullDownRefresh() {
@@ -141,32 +164,37 @@
// }
// },
onShow() {
- if (this.num == 0 && this.isshow) {
- this.$refs.list.refresh()
- uni.stopPullDownRefresh()
- } else if (this.num == 1 && this.isshow1) {
- this.$refs.list1.refresh()
- uni.stopPullDownRefresh()
- } else if (this.num == 2 && this.isshow2) {
- this.$refs.list2.refresh()
- uni.stopPullDownRefresh()
- }
+
+ this.$nextTick(() => {
+ setTimeout(() => {
+
+ if (this.num == 0 && this.isshow) {
+
+ this.$refs.list.refresh()
+
+
+ } else if (this.num == 1 && this.isshow1) {
+
+ this.$refs.list1.refresh()
+
+
+
+ } else if (this.num == 2 && this.isshow2) {
+
+ this.$refs.list2.refresh()
+
+ }
+ }, 0)
+ })
},
mounted() {
- if (this.num == 0 && this.isshow) {
- this.$refs.list.refresh()
- uni.stopPullDownRefresh()
- } else if (this.num == 1 && this.isshow1) {
- this.$refs.list1.refresh()
- uni.stopPullDownRefresh()
- } else if (this.num == 2 && this.isshow2) {
- this.$refs.list2.refresh()
- uni.stopPullDownRefresh()
- }
+
+
},
methods: {
login() {
+ uni.clearStorageSync()
uni.reLaunch({
url: '/pages/oaLogin/oaLogin'
})
@@ -200,14 +228,24 @@
this.$refs.list1.refresh()
this.isshow2 = true
this.isshow = true
+ uni.showLoading({
+ title: '加载中'
+ })
}
if (index == 2) {
this.isshow1 = true
this.isshow = true
this.$refs.list2.refresh()
+
+ uni.showLoading({
+ title: '加载中'
+ })
}
if (index == 0) {
+ uni.showLoading({
+ title: '加载中'
+ })
this.$refs.list.refresh()
this.isshow1 = true
@@ -215,8 +253,8 @@
}
},
- onfunction(e,id) {
- console.log(e,id)
+ onfunction(e, id) {
+
if (id == 1) {
this.isshow = false
this.type = e
@@ -250,7 +288,6 @@