tengpanxu 5 hónapja
szülő
commit
c58587b36b

+ 5 - 0
src/assets/css/common.css

@@ -263,6 +263,11 @@
 	word-wrap: break-word;
 	word-break: normal;
 }
+.w170{
+	width: 170px !important;
+	word-wrap: break-word;
+	word-break: normal;
+}
 .w280{
 	width: 280px !important;
 	word-wrap: break-word;

+ 1 - 1
src/i18n.js

@@ -17,7 +17,7 @@ const messages = {
     ...cnLocal,
     ...elCnLocale
   },
-  ar: {
+  arab: {
     ...ArLocale,
     ...elArLocale
   }

+ 2 - 2
src/views/Forestage/Me/mod/my-order.vue

@@ -8,14 +8,14 @@
 		<div v-else class="box-7 box-sizing-border-box">
 			 <div class="justify-content-space-between box-8 align-items-center">
 			 	<div class="fs-12 fw-400 w150">{{$t('home6.index2.text2')}}</div>
-				<div class="fs-12 fw-400 w150 ">{{$t('home6.index2.text3')}}</div>
+				<div class="fs-12 fw-400 w170 ">{{$t('home6.index2.text3')}}</div>
 				<div class="fs-12 fw-400 w150 ">{{$t('home6.index2.text4')}}</div>
 				<div class="fs-12 fw-400 w150 ">{{$t('home6.index2.text5')}}</div>
 				<div class="fs-12 fw-400 w150 text-align-right">{{$t('home6.index2.text7')}}</div>
 			 </div>
 			 <div class="justify-content-space-between box-8 align-items-center" v-for="(item,i) in list" :key="i">
 			 	<div class="fs-12 fw-400 w150">{{lang == 'cn'?item.goods_name:item.goods_name_en}}</div>
-			 	<div class="fs-12 fw-400 w150 ">{{item.order_sn}}</div>
+			 	<div class="fs-12 fw-400 w170 ">{{item.order_sn}}</div>
 				<div class="fs-12 fw-400 w150 ">{{item.price}}</div>
 				<div class="fs-12 fw-400 w150 ">{{item.yield_money}}</div>
 				<div class="fs-12 fw-400 w150 text-align-right">{{ item.status == 1 ? $t('home6.index2.text9') : item.status == 2 ? $t('home6.index2.text8') : '' }}</div>

+ 16 - 9
src/views/Forestage/Tourism/index.vue

@@ -28,16 +28,16 @@
 							</div>
 						</div>
 						<div v-if="userInfo.vip_id == item.id" class="operate" @click="handleGoodsItem(item)">{{ $t('other.text5') }}</div>
-						<div v-if="userInfo.vip_id != item.id" class="operate disabled">{{ $t('other.text5') }}</div>
+						<div v-if="userInfo.vip_id != item.id" class="operate disabled" @click="handleGoodsItem(item)">{{ $t('other.text5') }}</div>
 					</div>
 				</div>
 			</div>
 
-			<div class="justify-right mt-30 p-b-33">
+			<!-- <div class="justify-right mt-30 p-b-33">
 				<el-pagination class="pagination-data" background layout="prev, pager, next" :page-size="20" :total="total"
 					:current-page="page" @current-change="currentChange">
 				</el-pagination>
-			</div>
+			</div> -->
 
 		</div>
 
@@ -89,9 +89,9 @@
 			</div>
 
 			<!-- 时间、开始抢票 -->
-			<div class="time-or-buy">
+			<div class="time-or-buy" @click="pay">
 				<div class="time">{{userInfo.order_num}} / {{item.order_num}}</div>
-				<div class="buy" @click="pay">{{ $t('other.text9') }}</div>
+				<div class="buy">{{ $t('other.text9') }}</div>
 			</div>
 		</div>
 
@@ -209,19 +209,25 @@ export default {
 		},
 
 		handleGoodsItem(item) {
-      if(this.userInfo.is_opne!==1){
+      /* if(this.userInfo.is_opne!==1){
         tools.error(this.$t('other.text10'))
         this.getInfo();
         return false
       }
       if(this.userInfo.vip_id!==item.id){
         return false
-      }
+      } */
       this.item=item
 			this.current = 'goods'
 		},
 
-		pay(item) {
+		pay() {
+			if (this.userInfo.is_opne!==1 || this.userInfo.vip_id!==this.item.id) {
+				tools.error(this.$t('other.text10'))
+        this.getInfo()
+        return
+			}
+
 			let token = localStorage.getItem('userToken')
 			if (token) {
 				if (this.isAJAX) {
@@ -229,7 +235,7 @@ export default {
 				}
 				// this.isAJAX = true;
 				ordercreat({
-					goods_id: item.id
+					goods_id: this.item.id
 				}).then((res) => {
 					if (res.code == 1) {
 						this.isAJAX = false;
@@ -358,6 +364,7 @@ span {
 
 .goods-list-container {
 	width: 100%;
+	padding-bottom: 30px;
 
 	.item {
 		height: 247px;