From 4e584d51e64eabdc11bc6bfb5d4b8c724589510b Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Mon, 2 Nov 2020 17:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B8=E9=94=80=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/WriteOff.vue                      | 7 +++----
 config/index.js                              | 4 ++--
 pages/orderAdmin/OrderCancellation/index.vue | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/WriteOff.vue b/components/WriteOff.vue
index 4fb7c73..d0fb34b 100644
--- a/components/WriteOff.vue
+++ b/components/WriteOff.vue
@@ -1,9 +1,8 @@
 <template>
   <view v-show="iShidden === false">
     <view class="WriteOff">
-      <view class="pictrue"><image :src="orderInfo.image" /></view>
       <view class="num acea-row row-center-wrapper">
-        {{ orderInfo.order_id }}
+        {{ orderInfo.orderId }}
       </view>
       <view class="tip">确定要核销此订单吗？</view>
       <view class="sure" @click="confirm">确定核销</view>
@@ -15,7 +14,7 @@
 <style scoped lang="less">
 .WriteOff {
   width: 5.6*100rpx;
-  height: 8*100rpx;
+  height: 5*100rpx;
   background-color: #fff;
   border-radius: 0.2*100rpx;
   position: fixed;
@@ -23,8 +22,8 @@
   left: 50%;
   margin-top: -4*100rpx;
   margin-left: -2.8*100rpx;
-  z-index: 99;
   padding-top: 0.55*100rpx;
+  z-index: 99999;
 }
 .WriteOff .pictrue {
   width: 3.4*100rpx;
diff --git a/config/index.js b/config/index.js
index d2956c4..1a4dbba 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,7 +1,7 @@
 
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
-//export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
+export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
- export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
+ // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue
index 5055048..9a538d5 100644
--- a/pages/orderAdmin/OrderCancellation/index.vue
+++ b/pages/orderAdmin/OrderCancellation/index.vue
@@ -131,7 +131,7 @@ export default {
   margin: -0.93 * 100rpx auto 0 auto;
   padding-top: 0.8 * 100rpx;
   padding-bottom: 30rpx;
-  z-index: 99;
+  z-index:20;
   position: relative;
   border-radius: 0.06 * 100rpx 0.06 * 100rpx 0 0;
 }