merge

api/request.js

@@ -91,9 +91,6 @@ const req = (obj, noToken) => {
  */
 
 const upload = (obj) => {
-
-    console.log(obj)
-
 	// header
 	header.Authorization = wx.getStorageSync("token") || ""
 	// 处理上传信息

pages/beautify/coach.js

@@ -132,13 +132,6 @@ Page({
     onReady(res) {
         this.videoContext = wx.createVideoContext('myVideo')
     },
-    bindseekcomplete(e) {
-        console.log(e)
-    },
-    videoPause(e){
-        console.log('暂停了')
-    },
-
     // 视频更新事件
     videoTimeupdated(e) {
         let selectVideoItem = this.data.selectVideoItem
@@ -163,12 +156,11 @@ Page({
         this.setData({
             selectVideoItem: selectVideoItem
         })
-        console.log('视频更新事件', selectVideoItem.currentSteps)
     },
 
     // 视频播放结束事件
     videoEnded() {
-        console.log('视频播放结束事件')
+        // console.log('视频播放结束事件')
         // 完成弹窗  重置基础数据
 
         this.setData({
@@ -188,7 +180,7 @@ Page({
 
     // 点击暂停视频
     videoPauseTab() {
-        console.log('暂停')
+        // console.log('暂停')
         let selectVideoItem = this.data.selectVideoItem
         selectVideoItem.playedState = false
         this.setData({
@@ -199,7 +191,7 @@ Page({
 
     // 点击播放视频
     videoPlayTab() {
-        console.log('播放')
+        // console.log('播放')
         let selectVideoItem = this.data.selectVideoItem
         selectVideoItem.playedState = true
         selectVideoItem.muted = false
@@ -211,13 +203,13 @@ Page({
 
     // 轮播图切换
     swiperChange(e) {
-        console.log(e.detail)
+        // console.log(e.detail)
     },
 
     // 选择视频教程-点击
     selectVideo(e) {
         let item = e.currentTarget.dataset.item
-        console.log(this.data.selectVideoItem.video_id, item.video_id)
+        // console.log(this.data.selectVideoItem.video_id, item.video_id)
         if (this.data.selectVideoItem.video_id == item.video_id) return
 
         item.playedState = false
@@ -235,7 +227,7 @@ Page({
 
     // 播放视频
     doPlay(position) {
-        console.log(position)
+        // console.log(position)
         this.videoContext.seek(position)
         let selectVideoItem = this.data.selectVideoItem
         selectVideoItem.playedState = true
@@ -248,9 +240,9 @@ Page({
 
     // 静音非经营处理
     mutedTab(e) {
-        console.log(e)
+        // console.log(e)
         let type = e.target.dataset.type
-        console.log(type)
+        // console.log(type)
         let selectVideoItem = this.data.selectVideoItem
         if (type == 'open') {
             selectVideoItem.muted = false
@@ -322,7 +314,7 @@ Page({
         wx.getSetting({
             success: (res) => {
                 let authSetting = res.authSetting
-                console.log(res)
+                // console.log(res)
                 if (!authSetting['scope.camera'] || authSetting['scope.camera'] == undefined) {
                     wx.showModal({
                         title: '温馨提示',
@@ -334,8 +326,8 @@ Page({
                         success: (res) => {
                             if (res.confirm) { //允许打开授权页面
                                 //调起客户端小程序设置界面，返回用户设置的操作结果
-                                console.log(JSON.stringify(authSetting['scope.camera']), authSetting['scope.camera'] == undefined)
+                                // console.log(JSON.stringify(authSetting['scope.camera']), authSetting['scope.camera'] == undefined)
-                                console.log(authSetting['scope.camera'])
+                                // console.log(authSetting['scope.camera'])
                                 if (authSetting['scope.camera'] == undefined) {
                                     wx.authorize({
                                         scope: 'scope.camera',
@@ -353,7 +345,7 @@ Page({
                                 } else {
                                     wx.openSetting({
                                         success: (res) => {
-                                            console.log('res', res)
+                                            // console.log('res', res)
                                             res.authSetting = {
                                                 "scope.camera": true
                                             }
@@ -387,7 +379,7 @@ Page({
     },
     getVideos() {
         wx.$api.user.videos().then(res => {
-            console.log(res)
+            // console.log(res)
             this.setData({
                 videos: res.data.data,
             })

pages/found/index.js

@@ -98,7 +98,7 @@ Page({
     // 预览图片
     preImg(e){
         let current = e.currentTarget.dataset.idx
-        console.log(current)
+        // console.log(current)
         let urls = e.currentTarget.dataset.urls
         wx.previewImage({
           urls,

pages/found2/index.js

@@ -31,8 +31,7 @@ Page({
     },
     swiperChange(e){
         let { current }  = e.detail
-        
+        // console.log(current)
-        console.log(current)
         let swipers = this.data.swipers
         let item = swipers[current]
         let type = item.type 
@@ -40,7 +39,7 @@ Page({
 
             if(current == 0 || this.data.playId == '' || this.data.playId != item.id){
                 let id = 'myVideo'+item.id
-                console.log(id)
+                // console.log(id)
                 let videoContext = wx.createVideoContext(`${id}`)
                 videoContext.play()
                 this.setData({
@@ -122,7 +121,7 @@ Page({
     // 预览图片
     preImg(e){
         let current = e.currentTarget.dataset.idx
-        console.log(current)
+        // console.log(current)
         let urls = e.currentTarget.dataset.urls
         wx.previewImage({
           urls,

pages/found2/index2.js

@@ -75,7 +75,7 @@ Page({
         let { clientY } = e.changedTouches[0]
         endY = clientY
         let clientXY = startY - clientY
-        console.log(clientXY)
+        // console.log(clientXY)
         if(clientXY>60){
             this.onIsDirection('next')
         }else if(clientXY < -60){
@@ -86,7 +86,7 @@ Page({
     onIsDirection(type){
         let {currentIndex,lists} = this.data
         if(type == 'next'){
-            console.log('获取下一个')
+            // console.log('获取下一个')
             if(currentIndex!=lists.length-1){
                 currentIndex ++
                 this.setData({
@@ -160,7 +160,7 @@ Page({
     // 预览图片
     preImg(e){
         let current = e.currentTarget.dataset.idx
-        console.log(current)
+        // console.log(current)
         let urls = e.currentTarget.dataset.urls
         wx.previewImage({
           urls,

pages/index/index.js

@@ -13,7 +13,7 @@ Page({
     },
 
     onLoad(options) {
-        console.log(options)
+        // console.log(options)
         if(options.invite != undefined) {
             getApp().globalData.inviteText = options.invite
         }

pages/order/index.js

@@ -97,7 +97,7 @@ Page({
      * 订单签收
     */
     signClick(e) {
-        console.log(e.currentTarget.dataset)
+        // console.log(e.currentTarget.dataset)
         let payment = e.currentTarget.dataset.payment,
             orderNo = e.currentTarget.dataset.order_no
         wx.showModal({

pages/order/refundForm/refundForm.js

@@ -19,7 +19,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        console.log(options)
+        // console.log(options)
         this.setData({
             orderNo: options.order_no
         })

pages/order/refundInfo/refundInfo.js

@@ -27,7 +27,7 @@ Page({
     */
     goodsInfo() {
         wx.$api.order.refundSee(this.data.refundNo).then(res => {
-            console.log(res)
+            // console.log(res)
             this.setData({
                 goodsData   : res.data,
                 canState    : res.data.can,

pages/recruit/dailyList/dailyList.js

@@ -30,7 +30,7 @@ Page({
      */
     listInfo(page) {
         wx.$api.recruit.dailyList({page : page || 1}).then(res => {
-            console.log(res.data.data)
+            // console.log(res.data.data)
             let listArr = this.data.listsArr,
                 newData = []
             if(page == 1 || page == undefined) listArr = []

pages/recruit/referto 三联动/referto三联动.js

@@ -46,7 +46,7 @@ Page({
 
     // 省市区三联动
     bindRegionChange (e) {
-        console.log(e)
+        // console.log(e)
         let { value, postcode } = e.detail
         this.setData({
             regions   : value,
@@ -61,7 +61,7 @@ Page({
         wx.$api.recruit.Enroll(id, {
             experience_area_id: getApp().globalData.experienceAreaId
         }).then(res => {
-            console.log(res)
+            // console.log(res)
             // let areas = [
             //     {
             //         city: "请选择城市",

pages/report/detail/detail.js

@@ -75,7 +75,7 @@ Page({
                 rightcheekArea : (res.data.skin_analyze.result.result.oily_intensity.right_cheek.area * 100).toFixed(1),
                 suggest:res.data.suggest
             })
-            console.log(res)
+            // console.log(res)
         }).catch(err => { })
     },
 

pages/water/logistic/logistic.js

@@ -12,7 +12,7 @@ Page({
     },
 
     onLoad(options) {
-        console.log(options)
+        // console.log(options)
         // const {
         //     newData = {}
         // } = options;