Przeglądaj źródła

Merge branch 'deploy_hy1.0' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy_hy1.0

lilei 4 lat temu
rodzic
commit
b3c2bb4bfb

+ 0 - 4
src/views/market/GoodsLogisticsDetail.vue

@@ -31,10 +31,6 @@
       <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="收货人地址">
         <span>{{ formData.receiveAddress }}</span>
       </a-form-item>
-      <!-- <a-form-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-        <a-button type="primary" html-type="submit" id="logistics-submit" style="margin-right: 15px">保存</a-button>
-        <a-button @click="isShow=false" style="margin-left: 15px" id="logistics-close">取消</a-button>
-      </a-form-item> -->
     </a-form>
   </a-modal>
 </template>

+ 2 - 2
src/views/market/winingRecord.vue

@@ -62,10 +62,10 @@
           type="eye"
           id="winRecord-handleView"
           title="详情"
-          v-if="record.prizeType=='GOODS'"
+          v-else-if="record.prizeType=='GOODS'&&record.state=='FINISH'"
           class="actionBtn icon-green"
           @click="handleView(record)" />
-
+        <span v-else>'--'</span>
       </template>
     </s-table>
     <!-- 发货 -->