323424

src/views/system/asset/withdraw/index.vue

@@ -25,11 +25,7 @@
               <el-select v-model="form.bank_id" placeholder="选择到账银行卡" style="width:260px;">
                 <el-option v-for="item in banklist" :key="item.Id"
                            :label="item.bank_name ? item.bank_name : item.bank_account_name"
-<<<<<<< HEAD
                            :value="item.id"></el-option>
-=======
-                           :value="item.id ? item.id : item.Id"></el-option>
->>>>>>> dev_hxz
               </el-select>
             </el-form-item>
             <el-form-item label="提现金额" prop="amount">
@@ -288,13 +284,17 @@
     } //methods结束
   };
 </script>
-<style scoped lang="scss" type="text/stylus">
+<style scoped >
   .ruleFormshop {
     width: 500px;
     margin: 20px 0 0 120px;
   }
 
-  /deep/.spe-code-con-item .el-input-group__append {
+  /deep/ .spe-code-con-item .el-input-group__append {
     cursor: pointer;
   }
+  /deep/ .el-card__body{
+    height :calc(100% - 50px);
+    overflow-y: scroll;
+  }
 </style>

src/views/system/retreat/retreat/index.vue

@@ -142,31 +142,31 @@
                     <div class="cell">商品图</div>
                   </td>
                   <td>
-                    <div class="cell"><img :src="form.order.Img" alt="" width="120" height="98"></div>
+                    <!-- <div class="cell"><img :src="form.order.Img" alt="" width="120" height="98"></div> -->
                   </td>
                   <td>
                     <div class="cell">商品ID</div>
                   </td>
                   <td>
-                    <div class="cell">{{form.order.GoodsId}}</div>
+                    <div class="cell">{{form.order.goods_id}}</div>
                   </td>
                   <td>
                     <div class="cell">商品名</div>
                   </td>
                   <td>
-                    <div class="cell">{{form.order.GoodsName}}</div>
+                    <!-- <div class="cell">{{form.order.GoodsName}}</div> -->
                   </td>
                   <td>
                     <div class="cell">商品规格</div>
                   </td>
                   <td>
-                    <div class="cell">{{form.order.SpecDes}}</div>
+                    <div class="cell">{{form.order.sku_id}}</div>
                   </td>
                   <td>
                     <div class="cell">商品数量</div>
                   </td>
                   <td>
-                    <div class="cell">{{form.order.Quantity}}</div>
+                    <!-- <div class="cell">{{form.order.Quantity}}</div> -->
                   </td>
                 </tr>
                 <tr>