第一次提交

unpackage/dist/dev/mp-weixin/orderList/index/index.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 475))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 528))
     },
     uniIcons: function() {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 395))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 448))
     }
   }
 } catch (e) {
@@ -128,7 +128,7 @@ var render = function() {
       ? _vm.__map(_vm.listData, function(item, index) {
           var $orig = _vm.__get_orig(item)
 
-          var g0 = item.siteName.indexOf("壳牌")
+          var g0 = String(item.siteName).indexOf("壳牌")
           var m0 = _vm.option(item.orderStatus)
           var m1 = _vm.option(item.orderStatus)
           return {

unpackage/dist/dev/mp-weixin/orderList/orderDetails/orderDetails.js

@@ -96,7 +96,7 @@ var components
 try {
   components = {
     uniIcons: function() {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 395))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 448))
     }
   }
 } catch (e) {
@@ -295,6 +295,9 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
 
 
 
@@ -423,10 +426,29 @@ var _tool = _interopRequireDefault(__webpack_require__(/*! @/utils/tool.js */ 22
 //
 //
 //
-var qrcode = function qrcode() {Promise.all(/*! require.ensure | components/tki-qrcode/tki-qrcode */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/tki-qrcode/tki-qrcode")]).then((function () {return resolve(__webpack_require__(/*! @/components/tki-qrcode/tki-qrcode */ 554));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default = { onShareAppMessage: function onShareAppMessage(res) {return { title: '订单详情', path: '/orderList/orderDetails/orderDetails' };}, components: { qrcode: qrcode }, data: function data() {return { details: {}, show: { img: false, footer: false }, iShow: { seting: false }, moreOpen: false, val: '898989898', butten: { colse: '取消', confirm: '确定', coloseBg: '', coloseColor: '', confirmBg: '', confirmColor: '' } };}, onLoad: function onLoad(e) {if (e.jsData) {console.log(JSON.parse(e.jsData));this.getList(JSON.parse(e.jsData).id);}}, methods: { codeFn: function codeFn() {var _this = this;if (this.details.orderWfStatus == 0) {_orderList.default.getOrderQrCodeOms(this.details.orderSerialNumber).then(function (res) {if (res.code == 20000) {console.log(res);_this.val = res.data.codeStr;_this.iShow.seting = true;} else {uni.showToast({ title: res.msg, icon: 'none' });}});} else {this.iShow.seting = false;}}, refund: function refund() {console.log('-----------------');}, paymentStatus: function paymentStatus(e) {switch (e) {case 0:return { text: '待支付', color: '#EBC153', bg: '#FFF6DD' };break;case 1:return { text: '已支付', color: '#17A00E', bg: '#D1FFDA' };break;case -1:return { text: '支付失败', color: '#EC4645', bg: '#FFC8C8' };break;case 2:return { text: '已取消', color: '#999999', bg: '#E9E9E9' };break;case 3:return { text: '已退款', color: '#999999', bg: '' };break;case 4:return { text: '退款中', color: '#EBC153', bg: '' }; // return '退款中'
-          break;case 5:return { text: '退款失败', color: '#EC4645', bg: '' };break;}}, getList: function getList(e) {var _this2 = this;_orderList.default.findOrderDetails({ orderId: e }).then(function (res) {if (res.code !== 20000) return;_this2.details = res.data;
+//
+//
+//
+var qrcode = function qrcode() {Promise.all(/*! require.ensure | components/tki-qrcode/tki-qrcode */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/tki-qrcode/tki-qrcode")]).then((function () {return resolve(__webpack_require__(/*! @/components/tki-qrcode/tki-qrcode */ 607));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default = { onShareAppMessage: function onShareAppMessage(res) {return { title: '订单详情', path: '/orderList/orderDetails/orderDetails' };}, components: { qrcode: qrcode }, data: function data() {return { details: {}, show: { img: false, footer: false }, iShow: { seting: false }, moreOpen: false, val: '898989898', id: null, butten: { colse: '取消', confirm: '确定', coloseBg: '', coloseColor: '', confirmBg: '', confirmColor: '' } };}, onLoad: function onLoad(e) {if (e.jsData) {console.log(JSON.parse(e.jsData));this.id = JSON.parse(e.jsData).id;this.getList(this.id);}}, methods: { codeFn: function codeFn() {var _this = this;if (this.details.orderWfStatus == 0) {_orderList.default.getOrderQrCodeOms(this.details.orderSerialNumber).then(function (res) {if (res.code == 20000) {console.log(res);_this.val = res.data.codeStr;_this.iShow.seting = true;} else {uni.showToast({ title: res.msg, icon: 'none' });}});} else {this.iShow.seting = false;}}, refund: function refund() {if (this.details.orderStatus !== 1) return;var that = this;uni.showModal({ title: '提示', content: '是否确认退款', success: function success(res) {if (res.confirm) {_orderList.default.refund({ id: that.id }).then(function (res) {if (res.code == 20000) {that.getList(that.id);}});console.log('用户点击确定');} else if (res.cancel) {console.log('用户点击取消');}} });}, paymentStatus: function paymentStatus(e) {switch (e) {case 0:return { text: '待支付', color: '#EBC153', bg: '#FFF6DD' };break;case 1:return { text: '已支付', color: '#17A00E', bg: '#D1FFDA' };break;case -1:return { text: '支付失败', color: '#EC4645', bg: '#FFC8C8' };break;case 2:return { text: '已取消', color: '#999999', bg: '#E9E9E9' };break;case 3:return { text: '已退款', color: '#999999', bg: '' };break;case 4:return { text: '退款中', color: '#EBC153', bg: '' };
+
+          // return '退款中'
+          break;
+        case 5:
+          return {
+            text: '退款失败',
+            color: '#EC4645',
+            bg: '' };
+
+          break;}
+
+    },
+    getList: function getList(e) {var _this2 = this;
+      _orderList.default.findOrderDetails({
+        orderId: e }).
+      then(function (res) {
+        if (res.code !== 20000) return;
+        _this2.details = res.data;
         _tool.default.numberSetting(_this2.details, ['realAmount', 'volume', 'realPrice', 'marketPrice', 'sitePrice'], 2);
-        console.log(_this2.details.secondChannelCode, '--------------------------------');
       });
     },
     qrR: function qrR() {
@@ -452,9 +474,10 @@ var qrcode = function qrcode() {Promise.all(/*! require.ensure | components/tki-
         } });
 
     },
-    copy: function copy() {
+    copy: function copy(text) {
       uni.setClipboardData({
-        data: "\u8BA2\u5355ID:".concat(this.details.id, "\n\u8BA2\u5355\u6D41\u6C34\u53F7:").concat(this.details.orderSerialNumber, "\n\u8BA2\u5355\u91D1\u989D:").concat(this.details.realAmount, "\u5143\n\u8BA2\u5355\u5347\u6570:").concat(this.details.volume, "\u5347\n\u8BA2\u5355\u7C7B\u578B:").concat(this.details.payAccountType == 0 ? '个人' : '企业', "\n\u53F8\u673A\u59D3\u540D:").concat(this.details.customerName, "\n\u53F8\u673Aid:").concat(this.details.customerId, " ").concat(this.details.companyName ? '\n订单所属公司:' + this.details.companyName : '', "\n\u624B\u673A\u53F7\u7801:").concat(this.details.customerPhone), //要被复制的内容
+        data: "".concat(text),
+        // data: `订单ID:${this.details.id}\n订单流水号:${this.details.orderSerialNumber}\n订单金额:${this.details.realAmount}元\n订单升数:${this.details.volume}升\n订单类型:${this.details.payAccountType==0?'个人':'企业'}\n司机姓名:${this.details.customerName}\n司机id:${this.details.customerId} ${this.details.companyName?'\n订单所属公司:' + this.details.companyName :''}\n手机号码:${this.details.customerPhone}`, //要被复制的内容
         // ${(this.details.payAccountType==0?'司机姓名':'订单所属公司') + ':' + (this.details.payAccountType==0? this.details.customerName:this.details.companyName)}
         success: function success() {//复制成功的回调函数
           uni.showToast({ //提示