diff --git a/api/api.js b/api/api.js
index 93c7bb1..d4c1829 100644
--- a/api/api.js
+++ b/api/api.js
@@ -106,6 +106,9 @@ function getActivityStatus(){
return request('/caseplatformCase/activity','get',{},false)
}
+function getMobileModel(data){
+ return request('/upload/mobileModel','post',data,false)
+}
// function getCaseNum(){//获取项目病例总数
@@ -150,5 +153,6 @@ module.exports={
getBankInfo,
getfangxinSite,
ocrIdCard,
- ocrImg
+ ocrImg,
+ getMobileModel
}
diff --git a/app.js b/app.js
index f818cee..c368987 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,35 @@
import { hostConfig} from "./utils/config"
import router from './utils/router.js'
App({
+ getNetSataus(){
+ wx.onNetworkStatusChange(function (res) {
+ if(!res.isConnected){
+ wx.showModal({
+ title: '提示',
+ showCancel:false,
+ content: '当前网络不佳，请稍后重试',
+ complete: (res) => {
+
+ }
+ })
+ }
+ if(res.networkType=="3g" || res.networkType=="2g" || res.networkType=="none"){
+ wx.showModal({
+ title: '提示',
+ showCancel:false,
+ content: '当前网络不佳，请稍后重试',
+ complete: (res) => {
+
+ }
+ })
+ }
+ })
+ },
+onHide (options) {
+ // Do something when hide.
+},
onShow:function(){
+
wx.getSystemInfo({
success: (res) => {
// windows | mac为pc端
diff --git a/case/pages/bankCard/bankCard.js b/case/pages/bankCard/bankCard.js
index c63c667..ca8f335 100644
--- a/case/pages/bankCard/bankCard.js
+++ b/case/pages/bankCard/bankCard.js
@@ -245,9 +245,9 @@ Page({
return false
};
let {signImg,bankCardNo,bankName,cityId,countyId,idCardNo,idCardName,provId}=this.data;
- if (!/^([\u4e00-\u9fa5\·]{2,10})$/.test(idCardName)) {
+ if (!/^([\u4e00-\u9fa5\·]{2,30})$/.test(idCardName)) {
wx.showToast({
- title: `姓名要求在2-10个汉字`,
+ title: `姓名要求在2-30个汉字`,
icon: 'none',
});
return false;
diff --git a/case/pages/createCase/createCase.js b/case/pages/createCase/createCase.js
index a816d6b..fc3dccd 100644
--- a/case/pages/createCase/createCase.js
+++ b/case/pages/createCase/createCase.js
@@ -1,5 +1,5 @@
// case/pages/createCase/createCase.js
-import {addCase,caseDetail,editCase,getOssSign,ocrImg} from "../../../api/api"
+import {addCase,caseDetail,editCase,getOssSign,ocrImg,getMobileModel} from "../../../api/api"
const dayjs = require("../../../utils/dayjs");
import {throttle} from "../../../utils/util"
import { FileUtil } from '../../../utils/fileutil'
@@ -56,7 +56,7 @@ Page({
fileList_bio:[],
fileList_coa:[],
fileList_inf:[],
- dpmas_list:[{fileList:[],treatTime:''}],
+ dpmas_list:[{fileList:[],treatTime:'',temp_list:[]}],
disable_ziliao:false,
disable_record:false,
disable_check:false,
@@ -912,11 +912,14 @@ Page({
let imgList=item.dpmasImg.split(',');
let objFile="dpmas_list["+index+"].fileList";
+ let tempFile="dpmas_list["+index+"].temp_list"
let objTime="dpmas_list["+index+"].treatTime"
- this.setData({
- [objFile]:imgList.map(item1=>{
+ let newArr=imgList.map(item1=>{
return {url:item1,type:'image',isImage: true}
- }),
+ });
+ this.setData({
+ [objFile]:newArr,
+ [tempFile]:newArr,
[objTime]:item.treatTime?dayjs(item.treatTime).format('YYYY-MM-DD'):''
})
}
@@ -1245,7 +1248,7 @@ Page({
if(dpmas.length<=1){
this.setData({
'case.dpmas':dpmas.concat([obj]),
- 'dpmas_list':dpmas_list.concat([{fileList:[],treatTime:''}])
+ 'dpmas_list':dpmas_list.concat([{fileList:[],treatTime:'',temp_list:[]}])
})
}
@@ -1459,8 +1462,7 @@ Page({
icon:'none'
})
return false;
- }
-
+ }
};
if(caseType.length==1 && caseType[0]==1){
if(dpmas.length<=1){
@@ -2216,15 +2218,20 @@ Page({
fileList_inf.push({ url: url,type:'image',isImage: true });
THIS.setData({ fileList_inf});
}else if(name.indexOf("record")!=-1){
+ let {dpmas_list}=THIS.data;
let recordIndex=Number(name.split("record")[1]);
console.log("recordIndex:"+recordIndex);
let objArr="dpmas_list[" +recordIndex +"]"
- let obj="dpmas_list[" +recordIndex +"].fileList"
- if(!(THIS.data.dpmas_list[recordIndex])){
- console.log(333)
- THIS.setData({
- [objArr]:{fileList:[],treatTime:''}
- })
+ let obj="dpmas_list[" +recordIndex +"].fileList";
+ let tempObj="dpmas_list[" +recordIndex +"].temp_list"
+ try {
+ if(!(dpmas_list[recordIndex])){
+ THIS.setData({
+ [objArr]:{fileList:[],treatTime:'',temp_list:[]}
+ })
+ }
+ } catch (error) {
+
}
THIS.setData({
[obj]:THIS.data.dpmas_list[recordIndex].fileList.concat([{ url: url,type:'image',isImage: true}])
@@ -2271,13 +2278,14 @@ Page({
showPaint:true
})
console.log(file)
+ // let fileArr=[file]
// wx.showLoading({
// title: '图片上传中',
// mask: true
// })
// var promiseFun = [];
- // for (let i = 0; i < file.length; i++) {
- // var cur_file = file[i].url;
+ // for (let i = 0; i < fileArr.length; i++) {
+ // var cur_file = fileArr[i].url;
// promiseFun.push(
// this.uploadImg(cur_file,name)
// )
@@ -2299,6 +2307,17 @@ Page({
// wx.hideLoading();
// });
},
+ getModal(){
+ const deviceInfo = wx.getDeviceInfo();
+ const accountInfo = wx.getAccountInfoSync();
+console.log(accountInfo); // 输出当前小程序的版本号
+ console.log(deviceInfo);
+ getMobileModel({
+ mod:'型号：'+deviceInfo.brand +' 设备型号：'+deviceInfo.model+' 操作系统：'+deviceInfo.system +' 线上小程序版本号:' +accountInfo.miniProgram.version
+ }).then(res=>{
+
+ })
+ },
/**
* 生命周期函数--监听页面加载
*/
@@ -2335,7 +2354,7 @@ Page({
})
}
}
-
+
// console.log(this.data.case)
},
@@ -2350,7 +2369,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
-
+ this.getModal();
},
/**
diff --git a/case/pages/createCase/createCase.wxml b/case/pages/createCase/createCase.wxml
index 29a9fe0..22c2a52 100644
--- a/case/pages/createCase/createCase.wxml
+++ b/case/pages/createCase/createCase.wxml
@@ -497,10 +497,14 @@
上传照片请进行隐私信息脱敏
-
-
+
+
diff --git a/case/pages/mobileLogin/mobileLogin.wxml b/case/pages/mobileLogin/mobileLogin.wxml
index 63a3511..e93dc13 100644
--- a/case/pages/mobileLogin/mobileLogin.wxml
+++ b/case/pages/mobileLogin/mobileLogin.wxml
@@ -27,9 +27,10 @@
密码登录
- 注册
+
+ 本平台仅供已注册肝胆相照平台的用户使用
- 手机号快捷登录 -
diff --git a/case/pages/pwdLogin/pwdLogin.wxml b/case/pages/pwdLogin/pwdLogin.wxml
index fecc0cb..8ce364f 100644
--- a/case/pages/pwdLogin/pwdLogin.wxml
+++ b/case/pages/pwdLogin/pwdLogin.wxml
@@ -28,9 +28,10 @@
手机验证码登录
- 注册
+
+ 本平台仅供已注册肝胆相照平台的用户使用
- 手机号快捷登录 -
diff --git a/case/pages/register/register.wxml b/case/pages/register/register.wxml
index 4b51c20..a0f5dae 100644
--- a/case/pages/register/register.wxml
+++ b/case/pages/register/register.wxml
@@ -30,6 +30,9 @@
+ 1、仅限受邀的白名单用户进行注册，人工审核通过后方可登录。
+
+2、非邀请用户注册后，不会通过人工审核，无法登录本平台。
若您有任何疑问或需要我们协助，请与您的小助手联系或直接微信联系igandan1000
diff --git a/components/paintCanvas/paintCanvas.js b/components/paintCanvas/paintCanvas.js
index 6695441..3181b4a 100644
--- a/components/paintCanvas/paintCanvas.js
+++ b/components/paintCanvas/paintCanvas.js
@@ -131,6 +131,7 @@ Component({
this.setData({
width: false, // 是否开启宽度调整栏
color: false,
+ isSmall:false,
clear: false, // 是否开启清空栏
eraser: false, // 是否开启橡皮擦
saving: false,
@@ -146,7 +147,7 @@ Component({
title: '图片上传中',
mask: true
})
- utils.tapBtn(e, this, 2,this.data.paintFrom);
+ utils.tapBtn(e, this, 2,this.data.paintFrom,this.data.isSmall);
this.hideBarsHandler()
},
showBarsHandler(e) {
@@ -192,6 +193,11 @@ Component({
wx.getImageInfo({
src: res.tempFilePaths[0],
success: function (res) {
+ if(res.size/1024<1024){
+ this.setData({
+ isSmall:true
+ })
+ }
// 获取图片信息，主要为宽高，选择合适的自适应方式（将最大边完整显示）
let [height, width] = [that.data.canvasWidth / res.width * res.height, that.data.canvasWidth];
if (height > that.data.windowHeight - 50) {
diff --git a/pages/index/index.js b/pages/index/index.js
index 6290803..bba3848 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -12,6 +12,7 @@ Page({
editId:'',
showDraft:true,
reason:'',
+ isLogin:false,
status_title:'病例状态',
casetype_title:'治疗类型',
draftTime:'',
@@ -470,8 +471,14 @@ getBank(){
}
let token = wx.getStorageSync(tokenStr);
if(token){
+ this.setData({
+ isLogin:true
+ })
return true
}else {
+ this.setData({
+ isLogin:false
+ })
return false
}
},
@@ -481,9 +488,8 @@ getBank(){
fields: [,"active"],
actions: ["updateActive"],
});
- if(this.isHasToken()){
- this.getAuthStatus();
- }
+ this.isHasToken()
+ this.getAuthStatus();
},
onUnload() {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 619fee7..e6ede2b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -59,6 +59,7 @@
暂无病例，点击创建病例
+
diff --git a/pages/personCenter/personCenter.js b/pages/personCenter/personCenter.js
index aaba662..1365c64 100644
--- a/pages/personCenter/personCenter.js
+++ b/pages/personCenter/personCenter.js
@@ -112,6 +112,21 @@ Page({
url: '/case/pages/bankCard/bankCard',
})
}),
+ isHasToken(){
+ let tokenStr=''
+ const { envVersion } = wx.getAccountInfoSync().miniProgram;
+ if(envVersion=="develop" || envVersion=="trial"){
+ tokenStr="DEV_CASE_TOKEN"
+ }else{
+ tokenStr="PROD_CASE_TOKEN"
+ }
+ let token = wx.getStorageSync(tokenStr);
+ if(token){
+ return true
+ }else {
+ return false
+ }
+ },
goDescription: throttle(function () {
app.method.navigateTo({
url: '/case/pages/agreement/agreement?type=description',
@@ -191,7 +206,8 @@ Page({
waitSubmitNum: 0
})
}
- this.handleGetInfo();
+
+ this.handleGetInfo();
this.updateActive('center')
},
diff --git a/utils/request.js b/utils/request.js
index 069c674..5e04d76 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -63,7 +63,7 @@ let token = wx.getStorageSync(tokenStr);
}else if (Number(res.data.code) == 30007 ) {
wx.hideLoading()
let redirectUrl=formatUrl();
-
+ wx.setStorageSync(tokenStr,'');
wx.reLaunch({
url: '/case/pages/mobileLogin/mobileLogin?redirectUrl='+redirectUrl
});
diff --git a/utils/utils.js b/utils/utils.js
index c3ce018..1743dd6 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -42,9 +42,9 @@ function formatTime(date) {
}
// 点击按钮触发的事件
- function tapBtn(e, _this, pageType,from) {
+ function tapBtn(e, _this, pageType,from,isSmall=false) {
let btnType = e.target.dataset.type;
-
+
let c = {};
switch (btnType) {
@@ -94,14 +94,14 @@ function formatTime(date) {
return;
// 保存
case 'save':
- saveImg(_this, pageType,from);
+ saveImg(_this, pageType,from,isSmall);
return;
default:
return;
}
}
- function saveImg(_this, pageType,from) {
+ function saveImg(_this, pageType,from,isSmall) {
let c = {};
if (pageType === 1) {
c.canvasHeight = 50;
@@ -177,7 +177,7 @@ function formatTime(date) {
// }
}
- function _canvaseSaveToImg(_this,from) {
+ function _canvaseSaveToImg(_this,from,isSmall) {
let that=_this;
console.log(from)
console.log(_this);
@@ -187,6 +187,7 @@ function formatTime(date) {
wx.canvasToTempFilePath({
canvasId: 'myCanvas',
fileType:'png',
+ quality:isSmall?0.8:1,
success: function (res) {
// wx.previewImage({
// urls:[res.tempFilePath],
@@ -197,32 +198,32 @@ function formatTime(date) {
name:from
})
// 转图片成功，继续调用存储相册接口
- // wx.saveImageToPhotosAlbum({
- // filePath: res.tempFilePath,
- // // 存储成功
- // success: function (r) {
- // wx.hideLoading();
- // wx.showToast({
- // title: '保存成功',
- // })
- // _this.setData({
- // saving: false,
- // showPaint:false
- // })
- // },
- // // 失败弹窗
- // fail: function (res) {
- // wx.hideLoading();
- // wx.showToast({
- // title: '保存失败',
- // icon: 'loading',
- // })
- // _this.setData({
- // saving: false,
- // showPaint:false
- // })
- // }
- // })
+ // wx.saveImageToPhotosAlbum({
+ // filePath: res.tempFilePath,
+ // // 存储成功
+ // success: function (r) {
+ // wx.hideLoading();
+ // wx.showToast({
+ // title: '保存成功',
+ // })
+ // _this.setData({
+ // saving: false,
+ // showPaint:false
+ // })
+ // },
+ // // 失败弹窗
+ // fail: function (res) {
+ // wx.hideLoading();
+ // wx.showToast({
+ // title: '保存失败',
+ // icon: 'loading',
+ // })
+ // _this.setData({
+ // saving: false,
+ // showPaint:false
+ // })
+ // }
+ // })
},
fail: function (res) {
// canvas转图片失败