coderlhl 2 年之前
父節點
當前提交
22ae1da1a7
共有 8 個文件被更改,包括 111 次插入98 次删除
  1. 4 1
      src/views/Address.vue
  2. 5 3
      src/views/Dl.vue
  3. 7 5
      src/views/Home.vue
  4. 6 3
      src/views/Order.vue
  5. 6 3
      src/views/Settle.vue
  6. 10 8
      src/views/User.vue
  7. 73 73
      src/views/address/dlAddressList.vue
  8. 0 2
      src/views/user/jssq.vue

+ 4 - 1
src/views/Address.vue

@@ -1,7 +1,10 @@
 <template>
-	<div class="order-list-wrap">
+  <div style="width: 100vw;">
+    <div class="order-list-wrap">
 		<router-view></router-view>
 	</div>
+  </div>
+	
 </template>
 
 <script>

+ 5 - 3
src/views/Dl.vue

@@ -1,7 +1,9 @@
 <template>
-	<div class="order-list-wrap">
-		<router-view></router-view>
-	</div>
+  <div style="width: 100vw;">
+    <div class="order-list-wrap">
+    	<router-view></router-view>
+    </div>
+  </div>
 </template>
 
 <script>

+ 7 - 5
src/views/Home.vue

@@ -1,9 +1,11 @@
 <template>
-	<div class="home">
-		<div class="content">
-			<router-view></router-view>
-		</div>
-	</div>
+  <div style="width: 100vw;">
+    <div class="home">
+    	<div class="content">
+    		<router-view></router-view>
+    	</div>
+    </div>
+  </div>
 </template>
 
 <script>

+ 6 - 3
src/views/Order.vue

@@ -1,7 +1,10 @@
 <template>
-	<div class="order-list-wrap">
-		<router-view></router-view>
-	</div>
+  <div style="width: 100vw;">
+    <div class="order-list-wrap">
+    	<router-view></router-view>
+    </div>
+  </div>
+	
 </template>
 
 <script>

+ 6 - 3
src/views/Settle.vue

@@ -1,7 +1,10 @@
 <template>
-	<div class="order-list-wrap">
-		<router-view></router-view>
-	</div>
+  <div style="width: 100vw;">
+    <div class="order-list-wrap">
+    	<router-view></router-view>
+    </div>
+  </div>
+	
 </template>
 
 <script>

+ 10 - 8
src/views/User.vue

@@ -1,13 +1,15 @@
 <template>
-  <div class="content flex">
-    <div class="left-nav">
-      <div class="nav-item hand" v-for="(item,index) in navList" @click="navto(item.path)"
-        :class="{'action-item':currentUrl.indexOf(item.path) !=-1}">
-        {{item.tit}}
+  <div style="width: 100vw;">
+    <div class="content flex">
+      <div class="left-nav">
+        <div class="nav-item hand" v-for="(item,index) in navList" @click="navto(item.path)"
+          :class="{'action-item':currentUrl.indexOf(item.path) !=-1}">
+          {{item.tit}}
+        </div>
+      </div>
+      <div class="right-body">
+        <router-view></router-view>
       </div>
-    </div>
-    <div class="right-body">
-      <router-view></router-view>
     </div>
   </div>
 </template>

+ 73 - 73
src/views/address/dlAddressList.vue

@@ -1,77 +1,77 @@
 <template>
-	<div class="order-wrapper">
-		<!-- <breadcrumb :item-name="['订单管理', '订单列表']"></breadcrumb> -->
-		<el-card>
-			<!-- 搜索区域 -->
-			<el-row>
-				<el-col>
-					<div class="flex" style="justify-content: flex-end;padding-bottom: 20px;">
-						<!-- <el-button type="primary" @click="openBuy">购买Token</el-button> -->
-						<el-button type="primary" icon="el-icon-refresh-right" @click="getList('reload')">刷新</el-button>
-					</div>
-
-				</el-col>
-
-
-				<!-- <el-col :span="8">
-					<el-input placeholder="请输入内容" v-model="queryInfo.query" class="input-with-select">
-						<el-button slot="append" icon="el-icon-search" @click="getList()"></el-button>
-					</el-input>
-				</el-col> -->
-			</el-row>
-			<!-- 订单表格区域 -->
-			<el-table :data="list" border style="width: 100%" max-height="620">
-				<el-table-column prop="id" label="id" width="80">
-				</el-table-column>
-				<el-table-column prop="consignee_name" label="姓名" width="150">
-				</el-table-column>
-				<el-table-column prop="consignee_address" label="地址" width="350">
-				</el-table-column>
-				<el-table-column prop="consignee_phone" label="手机号" width="200">
-				</el-table-column>
-				<el-table-column prop="zip" label="邮编" width="200">
-				</el-table-column>
-				<!-- <el-table-column prop="token" label="Token" width="350">
-				</el-table-column> -->
-				<!-- <el-table-column prop="status" label="是否已使用">
-					<template slot-scope="scope">
-						<el-tag type="success" v-if="scope.row.status == 0">待使用</el-tag>
-						<el-tag type="info" v-if="scope.row.status == 1">已使用</el-tag>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="createtime" label="创建时间" width="300">
-					<template slot-scope="scope">
-						{{showTime(scope.row.createtime)}}
-					</template>
-				</el-table-column>
-				<el-table-column prop="sys_address" label="是否系统默认" width="170">
-					<template slot-scope="scope">
-						<span :style="{'color': (scope.row.sys_address == 1 || scope.row.sys_phone == 1 )? '': '#67c23a'}">{{(scope.row.sys_address == 1 || scope.row.sys_phone == 1 )? '是': '否'}}</span>
-					</template>
-				</el-table-column>
-			</el-table>
-			<!-- 分页区域 -->
-			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-				:current-page="queryInfo.page" :page-sizes="[10, 20, 50, 100]" :page-size="queryInfo.pagesize"
-				layout="total, sizes, prev, pager, next, jumper" :total="total">
-			</el-pagination>
-		</el-card>
-		<!-- 修改地址对话框 -->
-		<el-dialog title="购买Token" :visible.sync="dialogTableVisible">
-			<el-form :model="form">
-				<el-form-item label="购买数量" :label-width="formLabelWidth">
-					<el-input v-model="form.num" type="number"></el-input>
-				</el-form-item>
-				<el-form-item label="交易密码" :label-width="formLabelWidth">
-					<el-input v-model="form.transaction" type="password"></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click="dialogTableVisible = false">取 消</el-button>
-				<el-button type="primary" @click="goBuy">确 定</el-button>
-			</div>
-		</el-dialog>
-	</div>
+    <div class="order-wrapper">
+    	<!-- <breadcrumb :item-name="['订单管理', '订单列表']"></breadcrumb> -->
+    	<el-card>
+    		<!-- 搜索区域 -->
+    		<el-row>
+    			<el-col>
+    				<div class="flex" style="justify-content: flex-end;padding-bottom: 20px;">
+    					<!-- <el-button type="primary" @click="openBuy">购买Token</el-button> -->
+    					<el-button type="primary" icon="el-icon-refresh-right" @click="getList('reload')">刷新</el-button>
+    				</div>
+    
+    			</el-col>
+    
+    
+    			<!-- <el-col :span="8">
+    				<el-input placeholder="请输入内容" v-model="queryInfo.query" class="input-with-select">
+    					<el-button slot="append" icon="el-icon-search" @click="getList()"></el-button>
+    				</el-input>
+    			</el-col> -->
+    		</el-row>
+    		<!-- 订单表格区域 -->
+    		<el-table :data="list" border style="width: 100%" max-height="620">
+    			<el-table-column prop="id" label="id" width="80">
+    			</el-table-column>
+    			<el-table-column prop="consignee_name" label="姓名" width="150">
+    			</el-table-column>
+    			<el-table-column prop="consignee_address" label="地址" width="350">
+    			</el-table-column>
+    			<el-table-column prop="consignee_phone" label="手机号" width="200">
+    			</el-table-column>
+    			<el-table-column prop="zip" label="邮编" width="200">
+    			</el-table-column>
+    			<!-- <el-table-column prop="token" label="Token" width="350">
+    			</el-table-column> -->
+    			<!-- <el-table-column prop="status" label="是否已使用">
+    				<template slot-scope="scope">
+    					<el-tag type="success" v-if="scope.row.status == 0">待使用</el-tag>
+    					<el-tag type="info" v-if="scope.row.status == 1">已使用</el-tag>
+    				</template>
+    			</el-table-column> -->
+    			<el-table-column prop="createtime" label="创建时间" width="300">
+    				<template slot-scope="scope">
+    					{{showTime(scope.row.createtime)}}
+    				</template>
+    			</el-table-column>
+    			<el-table-column prop="sys_address" label="是否系统默认" width="170">
+    				<template slot-scope="scope">
+    					<span :style="{'color': (scope.row.sys_address == 1 || scope.row.sys_phone == 1 )? '': '#67c23a'}">{{(scope.row.sys_address == 1 || scope.row.sys_phone == 1 )? '是': '否'}}</span>
+    				</template>
+    			</el-table-column>
+    		</el-table>
+    		<!-- 分页区域 -->
+    		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+    			:current-page="queryInfo.page" :page-sizes="[10, 20, 50, 100]" :page-size="queryInfo.pagesize"
+    			layout="total, sizes, prev, pager, next, jumper" :total="total">
+    		</el-pagination>
+    	</el-card>
+    	<!-- 修改地址对话框 -->
+    	<el-dialog title="购买Token" :visible.sync="dialogTableVisible">
+    		<el-form :model="form">
+    			<el-form-item label="购买数量" :label-width="formLabelWidth">
+    				<el-input v-model="form.num" type="number"></el-input>
+    			</el-form-item>
+    			<el-form-item label="交易密码" :label-width="formLabelWidth">
+    				<el-input v-model="form.transaction" type="password"></el-input>
+    			</el-form-item>
+    		</el-form>
+    		<div slot="footer" class="dialog-footer">
+    			<el-button @click="dialogTableVisible = false">取 消</el-button>
+    			<el-button type="primary" @click="goBuy">确 定</el-button>
+    		</div>
+    	</el-dialog>
+    </div>
 </template>
 
 <script>

+ 0 - 2
src/views/user/jssq.vue

@@ -22,10 +22,8 @@
 				</el-table-column>
         <el-table-column prop="status" label="审核状态" width="100">
         <template slot-scope="scope">
-          <el-tip>
            <el-tag type="success" v-if="scope.row.status == 1">已通过</el-tag>
            <el-tag type="danger" v-if="scope.row.status == 0">审核中</el-tag>
-          </el-tip>
         </template>
         </el-table-column>
 				<el-table-column prop="compensation_10_count" label="赔付金额为10块的单数" >