Merge branch 'wechat'

template/src/scripts/hlsPopup.js

@@ -34,14 +34,6 @@ export default {
       if (vm.isLoading) {
         Vue.$vux.loading.hide()
         vm.isLoading = false
-        // 弹出操作失败
-        /* Vue.$vux.toast.show({
-          text: '操作失败',
-          type: 'warn',
-          time: vm.SHOW_TIMES,
-          isShowMask: vm.IS_SHOW_MASK,
-          position: 'middle',
-        }) */
       }
     }, 40000)
   },
@@ -60,19 +52,13 @@ export default {
   showLongTop: function (content) {
     let vm = this
     let text = content || '操作失败'
-    if (!process.env.isMobilePlatform) {
-      Vue.$vux.toast.show({
-        text: text,
-        type: 'text',
-        time: vm.SHOW_TIMES,
-        isShowMask: vm.IS_SHOW_MASK,
-        position: 'top',
-      })
-    } else {
-      window.plugins.toast.showLongTop(content, function (success) {
-      }, function (error) { // eslint-disable-line
-      })
-    }
+    Vue.$vux.toast.show({
+      text: text,
+      type: 'text',
+      time: vm.SHOW_TIMES,
+      isShowMask: vm.IS_SHOW_MASK,
+      position: 'top',
+    })
   },
 
   /**
@@ -82,19 +68,13 @@ export default {
   showLongCenter: function (content) {
     let vm = this
     let text = content || '操作失败'
-    if (!process.env.isMobilePlatform) {
-      Vue.$vux.toast.show({
-        text: text,
-        type: 'text',
-        time: vm.SHOW_TIMES,
-        isShowMask: vm.IS_SHOW_MASK,
-        position: 'middle',
-      })
-    } else {
-      window.plugins.toast.showLongCenter(content, function (success) {
-      }, function (error) { // eslint-disable-line
-      })
-    }
+    Vue.$vux.toast.show({
+      text: text,
+      type: 'text',
+      time: vm.SHOW_TIMES,
+      isShowMask: vm.IS_SHOW_MASK,
+      position: 'middle',
+    })
   },
   /**
    * 长时间中部提示toast
@@ -103,19 +83,14 @@ export default {
   showLongBottom: function (content) {
     let vm = this
     let text = content || '操作失败'
-    if (!process.env.isMobilePlatform) {
-      Vue.$vux.toast.show({
-        text: text,
-        time: vm.SHOW_TIMES,
-        type: 'text',
-        isShowMask: vm.IS_SHOW_MASK,
-        position: 'bottom',
-      })
-    } else {
-      window.plugins.toast.showLongBottom(content, function (success) {
-      }, function (error) { // eslint-disable-line
-      })
-    }
+
+    Vue.$vux.toast.show({
+      text: text,
+      time: vm.SHOW_TIMES,
+      type: 'text',
+      isShowMask: vm.IS_SHOW_MASK,
+      position: 'bottom',
+    })
   },
   /**
    * 成功提示框
@@ -152,35 +127,19 @@ export default {
    * @param confirmObject.onConfirm 确定函数
    */
   showConfirm: function (confirmObject) {
-    if (!process.env.isMobilePlatform) {
-      let def = {
-        title: confirmObject.title || '提示',
-        content: confirmObject.content || '',
-        confirmText: '确定',
-        cancelText: '取消',
-        onConfirm: () => {
-          confirmObject.onConfirm(1)
-        },
-        onCancel: () => {
-          confirmObject.onConfirm(0)
-        },
-      }
-      Vue.$vux.confirm.show(def)
-    } else {
-      let message = confirmObject.content || ''
-      let onConfirm = function (index) {
-        confirmObject.onConfirm(index)
-      }
-      let title = confirmObject.title
-      navigator.notification.confirm(
-        message, // message
-        function (index) {
-          onConfirm(index - 1)
-        },
-        title, // title
-        ['取消', '确定'] // buttonLabels
-      )
+    let def = {
+      title: confirmObject.title || '提示',
+      content: confirmObject.content || '',
+      confirmText: '确定',
+      cancelText: '取消',
+      onConfirm: () => {
+        confirmObject.onConfirm(1)
+      },
+      onCancel: () => {
+        confirmObject.onConfirm(0)
+      },
     }
+    Vue.$vux.confirm.show(def)
   },
   /*
    * 弹出确认的窗口
@@ -190,30 +149,16 @@ export default {
    *
    */
   showPopup: function (confirmObject) {
-    if (!process.env.isMobilePlatform) {
-      let def = {
-        title: confirmObject.title || '提示',
-        content: confirmObject.content || '',
-        confirmText: '确定',
-        showCancelButton: false,
-        onConfirm: () => {
-          confirmObject.onConfirm()
-        },
-      }
-      Vue.$vux.confirm.show(def)
-    } else {
-      var alertDismissed = function (index) {
+    let def = {
+      title: confirmObject.title || '提示',
+      content: confirmObject.content || '',
+      confirmText: '确定',
+      showCancelButton: false,
+      onConfirm: () => {
         confirmObject.onConfirm()
-      }
-      let title = confirmObject.title || '提示'
-      var message = confirmObject.content || ''
-      navigator.notification.alert(
-        message, // message
-        alertDismissed, // callback
-        title || '提示', // title
-        '确定' // buttonName
-      )
+      },
     }
+    Vue.$vux.confirm.show(def)
   },
   /**
    * @param actionObject.titleText 弹出框的标题可空
@@ -298,6 +243,8 @@ export default {
       ShowPicturePlugin.show({
         imgUrl: imgObject.imgUrl,
         width: imgObject.width,
+        imgList: imgObject.imgList,
+        startPosition: imgObject.startPosition,
       })
     }
   },