Merge branch 'develop' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

* 'develop' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin:
  no message
  no message

src/views/secondHandMall/activistOrder/details.vue

@@ -62,7 +62,7 @@
                   <div class='info_title'>卖家信息</div>
                   <div class='info_bottom'>
                     <div class='info_bottom_lt'>
-                      <el-image style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
+                      <el-image v-if="orderDetail.sellUrl" style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
                     </div>
                     <div class='info_bottom_rt'>
                       <div>昵称：{{orderDetail.sellName}}</div>
@@ -77,7 +77,7 @@
                   <div class='info_title'>买家信息</div>
                   <div class='info_bottom'>
                     <div class='info_bottom_lt'>
-                      <el-image style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
+                      <el-image v-if="orderDetail.wechatUserUrl" style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
                       </el-image>
                     </div>
                     <div class='info_bottom_rt'>
@@ -134,7 +134,7 @@
       </div>
     </zj-page-fill>
     <div v-if="~['WAIT'].indexOf(orderDetail.status)" style="box-sizing: border-box; padding: 10px; text-align: right;">
-      <el-button size="small" @click="faqituikuan">确定</el-button>
+      <el-button type="primary" size="small" @click="faqituikuan">确定</el-button>
     </div>
   </zj-page-container>
 </template>

src/views/secondHandMall/orderManagement/details.vue

@@ -50,7 +50,7 @@
                           <el-input v-model="formTH.refundNum"></el-input>
                         </el-form-item>
                         <el-form-item v-if="~['REFUND','GOODS_REFUND'].indexOf(formTH.refundType)" label="退款金额" prop="refundPrice" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
-                          <el-input v-model="formTH.refundPrice"></el-input>
+                          <el-input type="number" v-model="formTH.refundPrice"></el-input>
                         </el-form-item>
                         <el-form-item label="备注">
                           <el-input type="textarea" v-model="formTH.refundRemark"></el-input>