diff --git a/androidPrivacy.json b/androidPrivacy.json new file mode 100644 index 0000000..7f5c2f3 --- /dev/null +++ b/androidPrivacy.json @@ -0,0 +1,37 @@ +{ + "version" : "1", + "prompt" : "template", + "title" : "服务协议和隐私政策", + "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "buttonAccept" : "同意并接受", + "buttonRefuse" : "暂不同意", + "hrefLoader" : "system|default", + "second" : { + "title" : "确认提示", + "message" : "进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", + "buttonAccept" : "同意并继续", + "buttonRefuse" : "退出应用" + }, + "disagreeMode" : { + "support" : false, + "loadNativePlugins" : false, + "visitorEntry" : true, + "showAlways" : true + }, + "styles" : { + "backgroundColor" : "#ffffff", + "borderRadius" : "5px", + "title" : { + "color" : "#ff00ff" + }, + "buttonAccept" : { + "color" : "#ffff00" + }, + "buttonRefuse" : { + "color" : "#00ffff" + }, + "buttonVisitor" : { + "color" : "#00ffff" + } + } +} diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 3cd3027..77ed214 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -6,7 +6,7 @@ "packages": { "node_modules/uview-ui": { "version": "1.8.4", - "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-1.8.4.tgz", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz", "integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA==" } } diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..a06b5f0 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,28 @@ +{ + "name": "nursestationapp", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "nursestationapp", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "uview-ui": "^1.8.4" + } + }, + "node_modules/uview-ui": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz", + "integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA==" + } + }, + "dependencies": { + "uview-ui": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz", + "integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..0d5d9db --- /dev/null +++ b/package.json @@ -0,0 +1,19 @@ +{ + "dependencies": { + "uview-ui": "^1.8.4" + }, + "name": "nursestationapp", + "version": "1.0.0", + "main": "main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "http://192.168.16.64:3000/jihan/NurseStationApp.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "description": "" +} diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue index 5f1c640..d977f24 100644 --- a/pages/CommodityOrder/CommodityOrder.vue +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -9,6 +9,7 @@ 店铺名称 待付款 + 订单已关闭 退款中 已取消 待收货 @@ -41,7 +42,8 @@ 查看物流 - + 去支付 确认收货 @@ -160,6 +162,12 @@ res => { this.orderlist = res.rows this.total = res.total + this.orderlist.forEach(e => { + e.timestamp = null + var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) + var times = new Date().getTime() / 1000 + e.timestamp = time - times + }) }) }, //确认收货 @@ -179,7 +187,7 @@ title: this.title, }); }, - onShow() { + onLoad(options) { //开局调用 let that = this try { const value = uni.getStorageSync('patientId'); @@ -188,8 +196,6 @@ that.goodsOrderinfo(); } } catch (e) {} - }, - onLoad(options) { //开局调用 this.baseurl = baseurl; if (options.orderStatus) { this.orderStatus = options.orderStatus @@ -209,6 +215,10 @@ .goodsName).then( res => { res.rows.forEach(e => { + e.timestamp = null + var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) + var times = new Date().getTime() / 1000 + e.timestamp = time - times this.orderlist.push(e) }) this.total = res.total @@ -217,12 +227,7 @@ }, onPullDownRefresh() { //下拉刷新 this.pageNum = 1; - ssgoodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum, this.goodsName) - .then(res => { - this.orderlist = res.rows - this.total = res.total - console.log(this.orderlist) - }) + this.goodsOrderinfo(); setTimeout(function() { uni.stopPullDownRefresh(); }, 1000); diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue index c27ee48..922fbbb 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -4,7 +4,8 @@ {{item.createTime}} - {{item.orderStatus=='WAIT_PAY'?'待付款':''}} + {{item.orderStatus=='WAIT_PAY'&&item.timestamp>0?'待付款':''}} + {{item.orderStatus=='WAIT_PAY'&&item.timestamp<=0?'订单已关闭':''}} {{item.orderStatus=='PAY'?'已付款':''}} {{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}} {{item.orderStatus=='NOT_FINISH'?'待完成':''}} @@ -28,7 +29,7 @@ + v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp>0"> 去支付 @@ -63,7 +64,7 @@ list: [], } }, - onShow() { + onLoad() { this.baseurl = baseurl let that = this try { @@ -74,7 +75,6 @@ } } catch (e) {} }, - onLoad() {}, methods: { //支付 buy(item) { @@ -84,6 +84,12 @@ appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => { this.list = res.rows; this.total = res.total + this.list.forEach(e => { + e.timestamp = null + var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24) + var times = new Date().getTime() / 1000 + e.timestamp = time - times + }) }) }, gofinished(item) { @@ -97,6 +103,10 @@ this.pageNum++ appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => { res.rows.forEach(e => { + e.timestamp = null + var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24) + var times = new Date().getTime() / 1000 + e.timestamp = time - times this.list.push(e) }) }) diff --git a/pages/ServiceDetails/ServiceDetails.scss b/pages/ServiceDetails/ServiceDetails.scss index d0b3794..6c9a815 100644 --- a/pages/ServiceDetails/ServiceDetails.scss +++ b/pages/ServiceDetails/ServiceDetails.scss @@ -4,6 +4,15 @@ font-size: 36rpx; padding-top: 10rpx; font-size: 34rpx; + .time{ + height: 80rpx; + width: 95%; + text-align: center; + line-height: 80rpx; + background-color: #fff; + margin: 0 auto 10rpx; + border-radius: 20rpx; + } .mask{ position: absolute; bottom:0; diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue index fd86332..b09ad24 100644 --- a/pages/ServiceDetails/ServiceDetails.vue +++ b/pages/ServiceDetails/ServiceDetails.vue @@ -1,5 +1,13 @@