04/23

src/view/index/index.vue

@@ -835,7 +835,7 @@ const routesTap=(url,id)=>{
     //justify-content: left;
     //align-items: flex-end;
     display: flex;
-
+    width: 760px;
     // width: 800px;
     // display: flex;
     position: absolute;
@@ -852,13 +852,16 @@ const routesTap=(url,id)=>{
     .index-sort-lists{
       height: 200px;
       cursor: pointer;
+      margin-right: 20px;
+        width: 30%;
+
 	  // flex-grow:0
       .index-sort-name{
         font-size: 14px;
         color: #333;
         margin-top: 20px;
         line-height: 18px;
-        width: 200px;
+        width: 100%;
       }
 	  //margin-bottom: 30px;
       background-color: #fff;

src/view/user/address/index.vue

@@ -146,8 +146,8 @@
           <div  class="add" @click="addressFlag=true;addClick()">新增</div>
         </div>
         <div class="tops">
-          <div class="tops-order-text " style="flex: 0 0 170px;">姓名</div>
-          <div class="tops-order-text" style="flex: 0 0 300px;">手机号</div>
+          <div class="tops-order-text ">姓名</div>
+          <div class="tops-order-text">手机号</div>
           <div class="tops-order-text">收货地址</div>
           <div class="tops-order-text">操作</div>
         </div>
@@ -158,14 +158,15 @@
         <div class="list" v-for="item in addressList.arr">
 
             <div class="evaluate-goods">
-              <div class="order-info flexs overflow1"  style="flex: 0 0 195px;">
+              <div class="order-info flexs overflow1">
                 {{ item.name }}
               </div>
-              <div class="order-money flexs color-s" style="flex: 0 0 310px;">{{ item.mobile }}</div>
-              <div class="order-status flexs order-money overflow1" >{{ item.full_address }}</div>
+              <div class="order-money flexs color-s" >{{ item.mobile }}</div>
+              <div class="order-status flexs" >{{ item.full_address }}</div>
              <div class="address-oper">
                <div @click="update(item)">修改</div>
                <div @click="del(item.id)">删除</div>
+               <div @click="updateAddress(item)">设为默认</div>
              </div>
             </div>
         </div>
@@ -279,6 +280,33 @@ const del=(id)=>{
     }
   })
 }
+const updateAddress=(item)=> {
+  console.log(item);
+  const chars = item.area.split(',');
+  let datas=[]
+  for(var key in chars){
+    
+    datas.push(parseInt(chars[key]))
+  }
+  let data={
+    id:item.id,
+    name:item.name,
+    mobile:item.mobile,
+    address:item.address,
+    is_default:1,
+    city:datas[2]
+  }
+  user_address_controller(data).then((res)=>{
+    if(res.code==1){
+      ElMessage.success('默认地址修改成功')
+      // updateFlag.value=false
+      // addressLists();
+    }else{
+      ElMessage.error(res.msg)
+
+    }
+  })
+}
 const updateTap=()=>{
   loginFormRef.value.validate(valid => {
     if (!valid) {
@@ -434,10 +462,16 @@ isLogin()
         color: #333;
         font-size: 16px;
         line-height: 50px;
-		.tops-order-text{
-			flex: 1;
-			text-align: center;
-		}
+      .tops-order-text{
+        flex: 1;
+        text-align: center;
+      }
+      .tops-order-text:nth-child(1) {
+        flex: 0 0 170px;
+      }
+      .tops-order-text:nth-child(2) {
+        flex: 0 0 200px;
+      }
       }
       .collect-tops{
         .add{
@@ -465,9 +499,13 @@ isLogin()
         }
       }
       .address-oper{
+        // width: 100%;
+			  // text-align: center;
         color: #4171B3;
         font-size: 16px;
         display: flex;
+        margin: 0 auto;
+        // justify-content: center;
         div{
           margin-right: 10px;
           cursor: pointer;
@@ -511,13 +549,15 @@ isLogin()
         // height: 66px;
         background: #FFFFFF;
         border-bottom: 1px solid #D7DBE0;
-        padding: 0 60px 0 0;
+        // padding: 0 60px 0 0;
+        // margin: 20px 20px 0 20px;
         line-height: 66px;
         .evaluate-goods{
           display: flex;
           color: #333;
           font-size: 16px;
-		  justify-content: space-between;
+          margin: 20px 20px 0 20px;
+		  // justify-content: space-between;
           .color-s{
             color: #333330;
             font-size: 16px;
@@ -530,18 +570,26 @@ isLogin()
             line-height: 140px;
           }
           .order-status{
-            text-align: left!important;
-            width:400px!important;
-			font-size: 14px;
-			line-height: normal;
-			margin-top: 23px;
+            text-align: center;
+            // width:400px!important;
+            max-width: 400px;
+            text-overflow: -o-ellipsis-lastline;
+            overflow: hidden;				//溢出内容隐藏
+            text-overflow: ellipsis;		//文本溢出部分用省略号表示
+            display: -webkit-box;			//特别显示模式
+            -webkit-line-clamp: 2;			//行数
+            line-clamp: 2;					
+            -webkit-box-orient: vertical;	
+            font-size: 14px;
+            line-height: normal;
+            margin-top: 23px;
             //margin-right: 100px;
           }
           .order-money{
             //width: 200px;
-            //flex: 0 0 200px;
+            flex: 0 0 200px;
             // width: 300px;
-            // text-align: center;
+            text-align: center;
 
             .order-button{
               width: 100px;
@@ -556,8 +604,8 @@ isLogin()
             }
           }
           .order-info{
-            flex: 1;
-			text-align: center;
+            flex: 0 0 170px;
+			      text-align: center;
             .order-img{
               img{
                 width: 100px;

src/view/user/order/afterSale/index.vue

@@ -186,7 +186,7 @@
             </div>
             <div v-if="checkFlag_s">
               <div class="color-s" style="padding: 10px" v-if="user_address_flag">
-                {{mineAddress}}
+                取件信息：{{mineAddress}}
               </div>
               <div style="display: flex;margin: 30px 0 30px 160px;cursor: pointer">
                 <div @click="addressFlags=true" style="color: #999;font-size: 16px;margin-top: 15px">新增地址</div>
@@ -268,7 +268,7 @@
               <img v-else style="width: 18px;height: 18px;margin-right: 10px" src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/goods/check.png">
 
               <div style="margin-top: 2px">
-                我已阅读并同意换货维修协议
+                我已阅读并同意<span style="color: #409eff">换货维修协议</span>
               </div>
             </div>
 
@@ -489,8 +489,8 @@
             ¥{{ item.amount_total }}
           </div>
           <div v-if="(order.refund.refund_status==100)" style="line-height: 0;padding: 30px 0;text-align: center;margin: 0 auto;color: #999;cursor: pointer">
-            <div @click="cancel(item.id)" style="padding-top:30px">撤销申请</div>
-            <div @click="returnOrder(item,1)"  style="padding-top: 30px">修改申请</div>
+            <div @click="cancel(item.id)" class="cancel_text">撤销申请</div>
+            <div @click="returnOrder(item,1)" class="cancel_text" >修改申请</div>
           </div>
           <div v-if="(order.refund.refund_status==500) && order.refund_config!=null" style="line-height: 0;padding: 40px 0;text-align: center;margin: 0 auto;color: #999;cursor: pointer">
             <div @click="returnOrder(item)"  style="padding-top: 30px">申请售后</div>
@@ -1384,6 +1384,10 @@ order_refund_s({order_info_id	:url.id}).then((res)=>{
   width: 140px;
   font-size: 15px;
 }
+.cancel_text {
+  font-size: 15px;
+  padding: 20px 0 10px;
+}
 .shopping-title{
   display: flex;
   height: 50px;

src/view/user/order/detail/index.vue

@@ -151,7 +151,7 @@
           </div>
             <div v-if="checkFlag_s">
               <div class="color-s" style="padding: 10px" v-if="user_address_flag">
-                {{mineAddress}}
+                取件信息：{{mineAddress}}
               </div>
               <div style="display: flex;margin: 30px 0 30px 160px;cursor: pointer">
                 <div @click="addressFlags=true" style="color: #999;font-size: 16px;margin-top: 15px">新增地址</div>
@@ -236,7 +236,7 @@
               <img v-else style="width: 18px;height: 18px;margin-right: 10px" src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/goods/check.png">
 
               <div style="margin-top: 2px">
-                我已阅读并同意换货维修协议
+                我已阅读并同意<span style="color: #409eff">换货维修协议</span>
               </div>
             </div>
           <div class="order-button" @click="submits">提交</div>

src/view/user/order/submit/index.vue

@@ -417,14 +417,14 @@
 			<div style="font-size: 14px;color: #4171B3">
 				<span @click.stop="update(item)">修改</span>
 				<span @click.stop="dels(item.id)" style="margin-left: 10px;">删除</span>
-        <span @click.stop="updateAddress(item)" style="margin-left: 10px;">设为默认</span>
+        <span @click.stop="updateAddress(item,index)" style="margin-left: 10px;">设为默认</span>
       </div>
           </div>
         </div>
     </div>
     <div class="button-s">
       <div class="style" @click="addressSel=false">取消</div>
-      <div class="style colors" @click="addressBtn(index)">确认</div>
+      <div class="style colors" @click="addressBtn()">确认</div>
     </div>
   </el-dialog>
     <div>
@@ -1172,6 +1172,7 @@ const invoideTexts=(index)=>{
       FormState.cardNo=data.bank_no;
       invoiceFlags.value = true
 			flags.value = false
+      
 		}
 	})
 }
@@ -1367,12 +1368,12 @@ const selectAddress = () => {
 const userAddress = ref('')
 
 const addressBtn = () => {
+  console.log('更换地址',addressIndex.value);
   const list = addressList.arr
   let indexs=addressIndex.value
   user_address_flag.value = true
   addressSel.value = false
   mineAddress.value = list[indexs].name + ' ' + list[indexs].mobile + ' ' + list[indexs].full_address
-
   addressId.value = list[indexs].id
   if(list[indexs].is_default==0){
     checkText.value=false
@@ -1436,9 +1437,11 @@ const addressLists = () => {
         res.data[0].check = true
         for (let i = 0; i < res.data.length; i++) {
           res.data[i].check = false
+          
           //如果用户设置了默认地址回显用户的信息
           if(res.data[i].is_default==true){
             mineAddress.value = res.data[i].name + ' ' + res.data[i].mobile + ' ' + res.data[i].full_address
+            console.log('回显地址信息',mineAddress);
             addressId.value = res.data[i].id
             user_address_flag.value=true
             res.data[i].check = true
@@ -1480,7 +1483,9 @@ const update=(item)=>{
   value1.value=item.is_default==1?true:false
 }
 
-const updateAddress=(item)=>{
+const updateAddress=(item,index)=>{
+  console.log(index);
+  addressIndex.value = index
   const chars = item.area.split(',');
   let datas=[]
   for(var key in chars){