Merge branch 'ymorder' into localbranch

src/pages/write_off/ym_confirm/ym_confirm.vue

@@ -81,7 +81,7 @@ export default {
                             orderInfo,
                             gates: _ls
                         });
-                        util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'nT');
+                        util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'rT');
                     }, 1200);
                 }else{
                     util.showNone(res.data.message || '操作失败！');

src/subpackage/order/pages/ym_card/detail/detail.vue

@@ -24,8 +24,8 @@
                 <a-line :value="orderInfo.nickname || '-'">
                     <block slot="name">用户昵称：</block> 
                 </a-line>
-                <view class="yu-line">照片：<text @click="changeFaceImgBtn">更改照片</text></view>
-                <image class="yu-img" mode="aspectFit" :src="orderInfo.user_face"></image>
+                <view class="yu-line">照片：<text @click="changeFaceImgBtn" v-if="orderInfo.status ==1">更改照片</text></view>
+                <image class="yu-img" mode="aspectFit" :src="orderInfo.user_face"  @click="previewImg(orderInfo.user_face)"></image>
             </view>
 
             <view class="yci-box yci-buy-info"  v-if="orderInfo.status == 1 || orderInfo.status == 2 || orderInfo.status == 3">
@@ -52,6 +52,12 @@
 </template>
 
 <script>
+/*
+    InactiveCardStatus CardStatusType = iota // 待激活 0
+    ActiveCardStatus                         // 使用中 1
+    InvalidCardStatus                        // 已失效 2
+    ReturnCardStatus                         // 已退卡 3
+*/ 
 import a_line from '../../../../../components/order_list/a_line/a_line.vue';
 import s_line from '../../../components/s_line/s_line.vue';
 import p_line from '../../../components/p_line/p_line.vue';
@@ -82,6 +88,9 @@ export default {
         this.optionsQuery = options || {};
     },
     methods: {
+        previewImg(url){
+            uni.previewImage({ urls: [ url ] });
+        },
         changeFaceImgBtn(){
             uni.chooseImage({
                 count: 1,