!77 2022-1-22 He

Merge pull request !77 from Admin/sit-He-v3

rc-busness/pages/myorder/userrecord.vue

@@ -106,11 +106,13 @@
           </div> -->
       </div>
     </div>
+      <MyFooter></MyFooter>
   </div>
 </template>
 
 <script>
 import Myheader from "~/components/header.vue";
+import MyFooter from '~/components/rc-footer.vue'
 import tabs from "@/components/tabs.vue";
 import { isexistCart, generateOrderWX, deleteCart } from "../../ajax/getData";
 export default {
@@ -177,6 +179,7 @@ export default {
   components: {
     Myheader,
     tabs,
+    MyFooter,
   },
   methods: {
     //请求猫
@@ -213,7 +216,7 @@ export default {
     async deletsmessage(productCode) {
       let user = JSON.parse(localStorage.getItem("userInfo"));
       this.userid = user.data.id;
-      let data = await deleteCart(this.userid, productCode);
+      let data = await deleteCart( productCode);
       if (data) {
         this.$message({
           type: "warning",
@@ -422,6 +425,7 @@ export default {
 .rc-footera {
   background: #f6f6f6;
   border: 1px solid #d7d7d7;
+  margin-bottom:40px;
   .rc-foote {
     margin: 0 auto;
     box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
@@ -547,10 +551,14 @@ export default {
       justify-content: space-between;
       border-bottom: 1px solid #d7d7d7;
       padding: 15px 0;
+      .del{
+        em{ font-style: normal;}
+      }
       .product-price {
         color: #e1001a;
         font-weight: bold;
         font-size: 20px;
+        width: 60px;
       }
       
         .del{

rc-busness/pages/personal/settlement.less

@@ -366,7 +366,7 @@ ul li ol li em strong i {
                 text-align: center;
                 color: white;
                 font-size: 16px;
-
+                cursor: pointer;
                 height: 48px;
 
                 border-radius: 30px;

rc-busness/pages/personal/settlement.vue

@@ -40,7 +40,7 @@
         </div>
       </div>
     </div>
-    <div class="rc_contline"></div>
+    <div class="rc_contline">1</div>
     <div class="rc-main" v-for="(item, index) in goldmedal" :key="index">
       <div class="rc-usermain">
         <div class="rc-image">
@@ -59,7 +59,7 @@
         </div>
       </div>
     </div>
-    <div class="rc-contline"></div>
+    <div class="rc_contline"></div>
     <div class="rc-main">
       <div class="rc-merchandise">
         <ul>
@@ -83,7 +83,7 @@
       </div>
     </div>
 
-    <div class="rc-contline"></div>
+    <div class="rc_contline"></div>
     <div class="rc-main">
       <div class="rc-foot">
         <div class="rc-foo">
@@ -97,7 +97,7 @@
         </div>
       </div>
     </div>
-    <el-dialog :visible.sync="dialogAdd" class="diallog_width" width="'100%">
+    <el-dialog :visible.sync="dialogAdd" class="diallog_width" width="'100%" :title="dialogAddTitle">
       <div class="tc dl_cont" v-if="dialogAdd">
         <myAddress
           @isClose="dialogCtrl"
@@ -155,6 +155,7 @@ export default {
   data() {
     return {
       goldmedal: [],
+      dialogAddTitle:"",
       addressstype: null,
       orderstatus: "",
       userisdelivery: "待收货",
@@ -212,6 +213,7 @@ export default {
       this.useraddress = data;
     },
     editAddress(item) {
+      this.dialogAddTitle='修改收货地址'
       this.editAddressData = {
         memberId: item.memberId,
         name: item.recipient,
@@ -229,6 +231,7 @@ export default {
       this.dialogAdd = true;
     },
     addAddress() {
+      this.dialogAddTitle='新增收货地址'
       this.editAddressData = {};
       this.dialogAdd = true;
     },
@@ -349,6 +352,11 @@ export default {
             userPayData: JSON.stringify(userPayData),
           },
         });
+      }else{
+        this.$message({
+          type: "warning",
+          message: res.msg,
+        });
       }
     },
     async canceldanhao(orderNumber) {
@@ -360,7 +368,6 @@ export default {
   },
   mounted() {
     this.goldmedal = JSON.parse(this.$route.query.list);
-    console.log(this.$route);
     this.getAddressList();
     // this.addressstype = this.$route.query.stype;
     // this.orderNumber = this.$route.query.orderNumber;

rc-busness/pages/productdetails/producted.vue

@@ -43,7 +43,11 @@
             <div class="rc-carousel__gallery-thumbnails-wrapper">
               <div class="rc-carousel rc-carousel__gallery-thumbnails">
                 <!-- Thunb images-->
-                <div class="rc-carousel__gallery-thumbnail tns-item tns-slide-active"
+                <div
+                  class="
+                    rc-carousel__gallery-thumbnail
+                    tns-item tns-slide-active
+                  "
                   v-for="(item, index) in productAttachmentList"
                   :key="index"
                 >
@@ -99,9 +103,9 @@
               <div class="productdetails">
                 <div class="rc-productdetail">
                   <i class="ts-row-title">商品价格：</i>
-                  <span class="ts-realprice">￥{{ item.rsp }}</span>
+                  <span class="ts-realprice">￥{{ item.ecPrice }}</span>
                   <span class="ts-remove ts-ecprice"
-                    >￥{{ item.ecPrice }}
+                    >￥{{ item.rsp }}
                   </span>
                 </div>
                 <div class="rc-productdetai">
@@ -189,8 +193,9 @@
           </div>
         </div>
       </div>
-      <div class="rc-footimage rc-main">
-        <!-- <img :src="item.showImgFile" alt="" /> -->
+      <div class="rc-footimage rc-main"  v-for="(item, index) in newlist"
+          :key="index">
+        <img :src="item.showImgFile" alt="" />
       </div>
       <div class="rc-fixright">
         <ul>
@@ -210,7 +215,7 @@
       </div>
       <Myfooter v-on:litentop="showmesg"></Myfooter>
     </div>
-    <el-dialog :visible.sync="dialogInfo1"  @close="userclose">
+    <el-dialog :visible.sync="dialogInfo1" @close="userclose" class="pop_coupon">
       <div class="rs-dis">
         <div
           class="rc-discount"
@@ -593,8 +598,26 @@ export default {
           });
         }
         if (orderm == 1) {
+          let list = [
+            {
+              id: item.id,
+              productCode: item.productCode,
+              productPrice: item.ecPrice,
+              productName: item.productName,
+              productImg: item.picFile,
+              specifications: item.specifications,
+              buyCount: item.pcs,
+              memberId: "884258",
+              mobile: "13480231061",
+              checked: true,
+            },
+          ];
+
           this.$router.push({
-            path: "/myorder/userrecord",
+            path: "/personal/settlement",
+            query: {
+              list: JSON.stringify(list),
+            },
           });
         }
       }