lilei vor 4 Jahren
Ursprung
Commit
3e5bee9c62

+ 2 - 2
unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login/login","pages/login/apply-trial","pages/login/forget-pass","pages/login/userAuthYs","pages/index/index","pages/shopTour/shopTour","pages/work/work","pages/userCenter/userCenter","pages/userCenter/personInfo","pages/userCenter/aboutUs","pages/userCenter/changePwd"],"window":{"navigationBarTitleText":"智能巡店","navigationBarBackgroundColor":"#0b6ce0","navigationBarTextStyle":"white","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#7A7E83","selectedColor":"#0b6ce0","borderStyle":"#eee","backgroundColor":"#ffffff","fontSize":"14px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/home.png","selectedIconPath":"static/tabbar/home-active.png","text":"首页"},{"pagePath":"pages/work/work","iconPath":"static/tabbar/work.png","selectedIconPath":"static/tabbar/work-active.png","text":"工作台"},{"pagePath":"pages/userCenter/userCenter","iconPath":"static/tabbar/user.png","selectedIconPath":"static/tabbar/user-active.png","text":"我的"}]},"nvueCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"storeCheck-app","compilerVersion":"2.8.9","entryPagePath":"pages/login/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/login/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom","navigationBarTitleText":"登录"}},{"path":"/pages/login/apply-trial","meta":{},"window":{"navigationStyle":"default","navigationBarTitleText":"申请试用"}},{"path":"/pages/login/forget-pass","meta":{},"window":{"navigationStyle":"default","navigationBarTitleText":"忘记密码"}},{"path":"/pages/login/userAuthYs","meta":{},"window":{"navigationStyle":"default","navigationBarTitleText":"用户协议及隐私保护政策"}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"智能巡店"}},{"path":"/pages/shopTour/shopTour","meta":{},"window":{"navigationBarTitleText":"远程巡店","bounce":"none","titleNView":{"buttons":[{"text":"+考评项","fontSize":16,"color":"#69C0FF","width":"100px"}]}}},{"path":"/pages/work/work","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"工作台"}},{"path":"/pages/userCenter/userCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心"}},{"path":"/pages/userCenter/personInfo","meta":{},"window":{"navigationBarTitleText":"员工信息"}},{"path":"/pages/userCenter/aboutUs","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/userCenter/changePwd","meta":{},"window":{"navigationBarTitleText":"修改密码"}}];
+var __uniConfig = {"pages":["pages/login/login","pages/login/apply-trial","pages/login/forget-pass","pages/login/userAuthYs","pages/index/index","pages/shopTour/shopTour","pages/work/work","pages/siteInspection/siteInspection","pages/signIn/signIn","pages/shopTourOver/shopTourOver","pages/shopTourCompleted/shopTourCompleted","pages/myShopTour/myShopTour","pages/userCenter/userCenter","pages/userCenter/personInfo","pages/userCenter/aboutUs","pages/userCenter/changePwd"],"window":{"navigationBarTitleText":"智能巡店","navigationBarBackgroundColor":"#0b6ce0","navigationBarTextStyle":"white","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#7A7E83","selectedColor":"#0b6ce0","borderStyle":"#eee","backgroundColor":"#ffffff","fontSize":"14px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/home.png","selectedIconPath":"static/tabbar/home-active.png","text":"首页"},{"pagePath":"pages/work/work","iconPath":"static/tabbar/work.png","selectedIconPath":"static/tabbar/work-active.png","text":"工作台"},{"pagePath":"pages/userCenter/userCenter","iconPath":"static/tabbar/user.png","selectedIconPath":"static/tabbar/user-active.png","text":"我的"}]},"nvueCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"storeCheck-app","compilerVersion":"2.8.9","entryPagePath":"pages/login/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/login/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom","navigationBarTitleText":"登录"}},{"path":"/pages/login/apply-trial","meta":{},"window":{"navigationStyle":"default","navigationBarTitleText":"申请试用"}},{"path":"/pages/login/forget-pass","meta":{},"window":{"navigationStyle":"default","navigationBarTitleText":"忘记密码"}},{"path":"/pages/login/userAuthYs","meta":{},"window":{"navigationStyle":"default","navigationBarTitleText":"用户协议及隐私保护政策"}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"智能巡店"}},{"path":"/pages/shopTour/shopTour","meta":{},"window":{"navigationBarTitleText":"远程巡店","bounce":"none","titleNView":{"buttons":[{"text":"+考评项","fontSize":16,"color":"#69C0FF","width":"100px"}]}}},{"path":"/pages/work/work","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"工作台"}},{"path":"/pages/siteInspection/siteInspection","meta":{},"window":{"navigationBarTitleText":"现场巡店"}},{"path":"/pages/signIn/signIn","meta":{},"window":{"navigationBarTitleText":"拍照签到"}},{"path":"/pages/shopTourOver/shopTourOver","meta":{},"window":{"navigationBarTitleText":"现场巡店"}},{"path":"/pages/shopTourCompleted/shopTourCompleted","meta":{},"window":{"navigationBarTitleText":"现场巡店"}},{"path":"/pages/myShopTour/myShopTour","meta":{},"window":{"navigationStyle":"custom","navigationBarTextStyle":"white","navigationBarTitleText":"预览"}},{"path":"/pages/userCenter/userCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心"}},{"path":"/pages/userCenter/personInfo","meta":{},"window":{"navigationBarTitleText":"员工信息"}},{"path":"/pages/userCenter/aboutUs","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/userCenter/changePwd","meta":{},"window":{"navigationBarTitleText":"修改密码"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Datei-Diff unterdrückt, da er zu groß ist
+ 134 - 21
unpackage/dist/dev/app-plus/app-view.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
unpackage/dist/dev/app-plus/hybrid/html/imgEdit/ped.min.js


+ 10 - 6
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -344,24 +344,28 @@
 		    const cmd = ['left', 'right', 'up', 'down']
 		    this.sendMsg('kzyt','控制云台' + cmd[index - 1])
 		  },
-		  // 打开拍照
+		  // 打开拍照片弹框
 		  openCamera(){
 			 this.showPz = true
 			 this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: true}))
 		  },
-		  // 关闭拍弹框
+		  // 关闭拍弹框
 		  onClosePz(){
 			  this.showPz = false
 			  this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: false}))
 		  },
-		  // 预览图片
+		  // 预览编辑图片
 		  previewImgs(url){
 			   let _this = this
 			   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: true}))
-			   this.PED = new window.PED.imageInfo(url,function(data){
+			   this.PED = new window.PED.imageInfo(
+			   url,
+			   function(data){
 				   // 保存图片编辑
-				   // _this.saveEditImg(data)
 				   _this.sendMsg('saveEditImg',data)
+			   },
+			   function(){
+				   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
 			   })
 		  },
 		  // 关闭图片编辑
@@ -373,7 +377,7 @@
 		  updateItemImg(path){
 			  console.log(path)
 		  },
-		  // 考评项相关代码
+		  // -----考评项相关代码---------------
 		  // 评分,0 不适用,1 不合格,2 合格
 		  pingfen(type){
 			  

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.