1

src/assets/css/home.css

@@ -401,6 +401,7 @@ a{
   width: 100%;
   box-sizing: border-box;
   background: rgba(0,0,0,0.35);
+  
 }
 .Home .travel_right_content{
   height: 323px;

src/components/DependentTravel/IndependentTravel.vue

@@ -945,14 +945,7 @@ p {
   border-bottom: 0;
   text-align: center;
   float: left;
-  box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186);
-  /* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35);
-   */
-   /* box-shadow: */
-/* 1px 0px 0px 0px #E2B2D1, //左边阴影 */
-/* 0 -2px 3px -1px transparent, //顶部阴影 */
-/* 0 2px 3px -1px transparent, //底部阴影 */
- /* 0px 0px 0px 0px #E2B2D1; //右边阴影 */
+  /* box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186); */
 }
 ._top_box .wrap2{
   background:rgba(71,165,255,1);
@@ -987,7 +980,7 @@ p {
   overflow: hidden;
   left:0;
   border:1px solid rgba(226, 178, 209, 1);
-  box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186);
+  /* box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186); */
   border-radius: 5px;
   border-top: 0;
   border-bottom: 0;

src/components/GroupTour/block/diving.vue

@@ -104,7 +104,7 @@
     <el-row :gutter="20">
       <template v-for="(item, index) in data">
         <el-col :span="6" v-if="index < 8">
-          <div class="item" >
+          <div class="item" @click="goUrl(item)">
             <div class="label">
               {{item.title.substr(0, 2)}}
             </div>
@@ -138,7 +138,11 @@ export default {
     }
   },
   methods: {
-    
+    goUrl(item){
+      let path = 'detailTwo'
+      path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
+      this.$router.push({ path })
+    },
   },
   mounted () {
     console.log("data",this.data)

src/components/GroupTour/block/list.vue

@@ -310,7 +310,7 @@
             <el-tab-pane :label="lineItem.name" :name="`${lineItem.id}_${index}`"></el-tab-pane>
           </template>
         </el-tabs>
-        <div class="more">更多特惠>></div>
+        <div class="more"><router-link style="color:#888888;text-decoration: none;" :to="{ path: '/search',query:{'keywords':'','lineId':dataList.name} }">更多特惠>></router-link></div>
       </el-row>
       <el-row class="right_bottom" :gutter="20">
         <template v-if="dataList.pageData && dataList.pageData.length > 0">
@@ -410,6 +410,11 @@ export default {
     }
   },
   methods: {
+    GoMore(path,dataList){
+      console.log(dataList)
+      return;
+      this.$router.push({ path })      
+    },
     goUrl(id, obj){
       let path = 'detailTwo'
       path=`${path}/${encodeURIComponent(id)}/${obj.tcid}`;

src/components/global/pay.vue

@@ -73,7 +73,7 @@
 		},
 		methods: {
 			deleteOrder(obj){
-				this.$confirm('是否删除?', '提示', {
+				this.$confirm('是否取消订单?', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'

src/components/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue

@@ -241,7 +241,7 @@
                     <el-button @click="Pay(item)" size="mini" type="danger">查看详情</el-button>
                 </p> -->
                 <p v-if="item.status === 1 || item.status === 3" style="margin-bottom:10px;">
-                    <el-button size="mini">取消订单</el-button>
+                    <el-button @click="Exit(item)" size="mini">取消订单</el-button>
                 </p>
                 <p class="font-size12 colo33" v-if="item.status==2">
                     取消
@@ -296,6 +296,24 @@ export default {
   mounted() {
   },
   methods: {
+    Exit(item){
+      this.$confirm("是否取消订单？", '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.apiJavaPost('/api/b2b/food/cancelFoodOrder',{orderId:item.id},res=>{
+                        if(res.data.resultCode==1){
+                            this.Success(res.data.message);
+                            this.$emit('fatherMethod');
+                        }else{
+                            this.Error(res.data.message);
+                        }
+                    },null)
+				}).catch(() => {
+				});
+
+    },
     Pay(item){
       let data={};
       data=item.payInfo;

src/components/newPersonalCenter/block/model/TscenOrder.vue

@@ -15,7 +15,7 @@
       </template>
     </ul>
     <!-- 表格 -->
-    <ScenTable v-loading="orderLoading" :tableData="tableData"  v-on:queryDays="queryDays"/>
+    <ScenTable v-loading="orderLoading" :tableData="tableData"  v-on:queryDays="queryDays" @fatherMethod="fatherMethod"/>
 
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
@@ -86,6 +86,10 @@ export default {
     // this.b2b_get_GetWaitDealOrderPageList();
   },
   methods: {
+     fatherMethod(){
+        this.gerOrderList();
+          
+      },
     queryDays(val){
       this.getOrderMsg.queryDays=val;
       this.gerOrderList();