ソースを参照

互助社上架、修改金额

qzy 1 年間 前
コミット
c89de60103

+ 9 - 7
login.html

@@ -8,6 +8,7 @@
 		<meta name="viewport"
 			content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
 		<link rel="stylesheet" media="screen" href="sa-frame/login/style.css">
+		<link rel="stylesheet" href="static/kj/element-ui/theme-chalk/index.css">
 		<link rel="stylesheet" href="static/sa.css">
 		<style type="text/css">
 			/* 背景图片 */
@@ -168,13 +169,14 @@
 			</div>
 			<div class="sk-rotating-plane"></div>
 			<div style="position: absolute;bottom: 10px;left: 45%;">
-				<img src="static/icon/beian.png" style="width: 18px;height: 18px;"/>
-				
+				<img src="static/icon/beian.png" style="width: 18px;height: 18px;" />
+
 				<a href="https://beian.mps.gov.cn/#/query/webSearch" target="_blank">
-				 	滇ICP备2024030692号</a>
-				<a style="margin-left: 10px;" href="https://beian.miit.gov.cn/?spm=5176.29125882.J_9220772140.60.f1522868kNvbiS" target="_blank">
-				 	滇ICP备2024030692号-1</a>
-				</div>
+					滇ICP备2024030692号</a>
+				<a style="margin-left: 10px;"
+					href="https://beian.miit.gov.cn/?spm=5176.29125882.J_9220772140.60.f1522868kNvbiS" target="_blank">
+					滇ICP备2024030692号-1</a>
+			</div>
 		</div>
 
 		<!-- scripts -->
@@ -271,4 +273,4 @@
 			});
 		</script>
 	</body>
-</html>
+</html>

+ 15 - 14
sa-frame/menu-list-sp.js

@@ -61,7 +61,13 @@ window.menuList.unshift({
 		parent: true,
 		icon: 'el-icon-unlock',
 		info: '对系统角色权限的分配等设计,敏感度较高,请谨慎授权',
-		childList: [{
+		childList: [
+			{
+				id: 'admin-list',
+				name: '用户列表',
+				url: 'sa-view-sp/sp-admin/admin-list.html',
+				info: '所有管理员账号'
+			},{
 				id: 'role-list',
 				name: '角色列表',
 				url: 'sa-view-sp/sp-role/role-list.html',
@@ -79,18 +85,8 @@ window.menuList.unshift({
 				url: 'sa-view-sp/sp-role/menu-list.html',
 				info: '所有菜单项预览'
 			},
-			{
-				id: 'admin-list',
-				name: '管理员列表',
-				url: 'sa-view-sp/sp-admin/admin-list.html',
-				info: '所有管理员账号'
-			},
-			{
-				id: 'admin-add',
-				name: '管理员添加',
-				url: 'sa-view-sp/sp-admin/admin-add.html',
-				info: '添加一个管理员'
-			},
+		
+		
 			// {id: 'apilog-list', name: '请求日志监控', url: 'sa-view-sp/sp-apilog/api-log-list.html', info: '记录本系统所有的api请求'},
 		]
 	}, {
@@ -462,7 +458,7 @@ window.menuList.unshift({
 			{
 				id: 'app-user',
 				icon: 'el-icon-user-solid',
-				name: 'app账号管理',
+				name: '账号管理',
 				url: 'sa-view/app-user/app-user-list.html',
 				childList: [
 					{
@@ -574,6 +570,11 @@ window.menuList.unshift({
 								isShow: false
 							},
 							{
+								id: 'tb-order-edit-price',
+								name: '修改上架金额',
+								isShow: false
+							},
+							{
 								id: 'ht-trade-settlement-del',
 								name: '删除订单',
 								isShow: false

+ 6 - 9
sa-view-sp/sp-admin/admin-list.html

@@ -32,6 +32,8 @@
 						</el-select>
 					</sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<el-button size="mini" type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
+					<el-button type="primary" icon="el-icon-plus" @click="add()" >新增</el-button>
 					<br>
 					<sa-item name="综合排序" class="s-radio-text" width="80px">
 						<el-radio-group v-model="p.sort_type">
@@ -46,16 +48,10 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td type="selection"></sa-td>
-					<sa-td type="user-avatar" name="昵称" prop="name,avatar" min-width="120px"></sa-td>
+					<sa-td type="text" name="登录名" prop="name" min-width="120px"></sa-td>
 					<sa-td type="text" name="手机" prop="phone"></sa-td>
-					<sa-td name="创建人" >
-						<template slot-scope="s">
-							<span v-if="s.row.createByAid == -1">无</span>
-							<el-link v-else @click="sa.$page.openAdminInfo(s.row.createByAid, s.row.name)">{{s.row.createByAid}}</el-link>
-						</template>
-					</sa-td type="text">
 					<sa-td type="text" name="所属角色" prop="roleName"></sa-td>
-					<sa-td type="datetime" name="所属角色" prop="createTime" width="150px"></sa-td>
+					<sa-td type="datetime" name="创建时间" prop="createTime" width="150px"></sa-td>
 					<sa-td type="datetime" name="最后登录" prop="loginTime" width="150px"></sa-td>
 					<sa-td type="text" name="登录次数" prop="loginCount" not="0" width="100px"></sa-td>
 					<sa-td type="switch" name="账号状态" prop="status" :jv="{1: '正常', 2: '禁用[#ff4949]'}" @change="s => updateStatus(s.row)" width="120px"></sa-td>
@@ -127,7 +123,8 @@
 					},
 					// 新增
 					add: function() {
-						parent.sa_admin.showMenuById('admin-add');
+						//sa.showIframe('账号详情', 'admin-info.html?id=' + 1, '700px', '80%');
+						sa.showIframe('账号详情', 'admin-add.html?id=' + 1, '700px', '80%');
 					},
 					// 查看详情
 					getInfo: function(data) {

+ 2 - 2
sa-view/ht-trade-settlement/ht-trade-settlement-list.html

@@ -29,7 +29,7 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
-					<sa-td name="预申报编号" prop="platSeqNo" width="160px"></sa-td>
+					<!-- <sa-td name="预申报编号" prop="platSeqNo" width="160px"></sa-td> -->
 					<sa-td name="申报单编号" prop="declareId" width="160px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
 					<sa-td name="互市区" prop="fieldName" width="160"></sa-td>
@@ -89,7 +89,7 @@
 						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
 					},
 					getOrder(data){
-						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?platSeqNo='+data.platSeqNo, '1080px', '94%');
+						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?platSeqNo='+data.platSeqNo, '90%', '94%');
 					},
 					// 修改
 					update: function(data) {

+ 69 - 2
sa-view/ht-trade-settlement/ht-trade-settlement-order.html

@@ -13,6 +13,10 @@
 		<script src="../../static/kj/jquery.min.js"></script>
 		<script src="../../static/kj/layer/layer.js"></script>
 		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .el-form .c-label{width: 7em !important;}
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
+		</style>
 	</head>
 	<body>
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
@@ -34,8 +38,23 @@
 					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
 					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
 					<sa-td name="总重量" prop="totalWeight" ></sa-td>
-					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
+					<sa-td name="总金额" prop="totalPrice" ></sa-td>
+					<sa-td name="上架金额(元)" prop="upPrice" >
+						<template slot-scope="s">
+							<div >{{s.row.upPrice}}
+							<el-link v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')" style="font-size: 12px;"  type="primary" @click="editPrice(s.row)">
+								修改
+							</el-link>
+							</div>
+						</template>
+					</sa-td>
+					<sa-td name="边民操作" prop="upPrice" >
+						<template slot-scope="s">
+							<div v-if="s.row.upStatus==2">已上架</div>
+							<div v-else>未上架</div>
+						</template>
+					</sa-td>
 					<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
 					<sa-td type="enum" name="委托确认" prop="cooperEntrustStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
 					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
@@ -48,6 +67,17 @@
 				<!-- ------------- 分页 ------------- -->
 				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 			</div>
+			<el-dialog :title="model.title" :visible.sync="model.visible" width="500px">
+				<div>
+					当前价格(元):{{model.form.upPrice}}
+				</div>
+				<sa-item type="num" name="金额" v-model="model.form.selPrice" placeholder="确认金额" br></sa-item>
+				<span slot="footer" class="dialog-footer">
+					<el-button @click="model.visible = false">取 消</el-button>
+					<el-button type="primary" @click="save">保存</el-button>
+					<el-button type="primary" @click="sel">转售二级</el-button>
+				</span>
+			</el-dialog>
 		</div>
 		<script>
 			var app = new Vue({
@@ -57,7 +87,15 @@
 				},
 				el: '.vue-box',
 				data: {
-					
+					model: {
+						title: '修改价格',
+						visible: false,
+						form: {
+							id:'',
+							upPrice:'',
+							selPrice:0
+						}
+					},
 					p: { // 查询参数  
 						tradeNo: '',		    // 订单号 
 						buyUserName: '',		// 买家 
@@ -71,6 +109,35 @@
 					dataList: [], // 数据集合 
 				},
 				methods: {
+					editPrice(item){
+						this.model={
+							title:'修改订单【'+item.tradeNo+'】价格',
+							visible:true,
+							form:item
+						}
+					},
+					save(){
+						let price=this.model.form.selPrice;
+						if(!price){
+							sa.error('请输入金额')
+							return;
+						}
+						sa.ajax('/level-one-server/TbOrder/editUpPrice', {id:this.model.form.id,price:price}, function(res) {
+							this.f5();
+							this.model.visible=false;
+						}.bind(this));
+					},
+					sel(){
+						let price=this.model.form.selPrice;
+						if(!price){
+							sa.error('请输入金额')
+							return;
+						}
+						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,price:price}, function(res) {
+							this.f5();
+							this.model.visible=false;
+						}.bind(this));
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {

+ 32 - 32
sa-view/tb-people/tb-people-list.html

@@ -40,23 +40,16 @@
 						@click="bindShopBatch()">批量绑定店铺</el-button>
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
-				<el-table class="data-table" ref="data-table" :data="dataList" >
+				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td type="index" name="序号"></sa-td>
-					<sa-td name="姓名" prop="name" ></sa-td>
+					<sa-td name="姓名" prop="name"></sa-td>
 					<sa-td name="性别" prop="sex" type="enum" :jv="{'1': '男', '2': '女'}"></sa-td>
 					<sa-td name="手机号码" prop="phone" type="phone"></sa-td>
 					<sa-td name="身份证" prop="idCard" type="idCard"></sa-td>
-					<sa-td name="互助组名称" prop="groupName" ></sa-td>
-					<sa-td name="互市区" prop="tradeAreaName" ></sa-td>
-					<sa-td name="场所编码" prop="fieldCode" ></sa-td>
-				<el-table class="data-table" ref="data-table" :data="dataList">
-					<sa-td type="selection" name="序号"></sa-td>
-					<sa-td name="姓名" prop="name"></sa-td>
-					<!-- <sa-td name="边民号" prop="code" ></sa-td> -->
-					<sa-td name="手机号码" prop="phone"></sa-td>
-					<sa-td name="身份证" prop="idCard"></sa-td>
 					<sa-td name="互助组名称" prop="groupName"></sa-td>
-					<sa-td name="所属商铺" prop="shopName">
+					<sa-td name="互市区" prop="tradeAreaName"></sa-td>
+					<sa-td name="场所编码" prop="fieldCode"></sa-td>
+					<sa-td name="所属商铺" prop="shopName" width="200">
 						<template slot-scope="s">
 							<div>{{s.row.shopName}}
 								<el-link v-if="sa.isAuth('tb-people-bind-shop')&&s.row.shopName" type="primary"
@@ -66,21 +59,23 @@
 								@click="selectShop(s.row)">选择</el-link>
 						</template>
 					</sa-td>
-					<sa-td name="角色" prop="role" type="enum" :jv="{'1': '普通边民', '2': '兼组长'}"></sa-td>
-					<el-table-column label="操作"  width="240px">
+					<sa-td name="创建时间" prop="createTime"></sa-td>
+					<el-table-column label="操作" width="240px" fixed="right">
 						<template slot-scope="s">
-							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
-							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="updateBankInfo(s.row.id)">银行卡修改</el-button>
+							<el-button class="c-btn" type="success" icon="el-icon-view"
+								@click="get(s.row)">查看</el-button>
+							<el-button class="c-btn" type="primary" icon="el-icon-edit"
+								@click="updateBankInfo(s.row.id)">银行卡修改</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 				<!-- ------------- 分页 ------------- -->
-			<div class="page-box">
-				<el-pagination background  layout="total, prev, pager, next, sizes, jumper"
-					:current-page.sync="p.pageNo" :page-size.sync="p.pageSize" :total="dataCount"
-					:page-sizes="[10, 20, 30, 40, 50, 100, 1000]" @current-change="f5()" @size-change="f5()">
-				</el-pagination>
-			</div>
+				<div class="page-box">
+					<el-pagination background layout="total, prev, pager, next, sizes, jumper"
+						:current-page.sync="p.pageNo" :page-size.sync="p.pageSize" :total="dataCount"
+						:page-sizes="[10, 20, 30, 40, 50, 100, 1000]" @current-change="f5()" @size-change="f5()">
+					</el-pagination>
+				</div>
 			</div>
 			<el-dialog :title="model.title" :visible.sync="model.visible" width="500px">
 				<div class="c-item">
@@ -201,17 +196,17 @@
 					// 刷新
 					f5: function() {
 						sa.ajax('/level-one-server/TbPeople/getList', sa.removeNull(this.p), function(res) {
-							console.log("res",res)
+							console.log("res", res)
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数
-							sa.f5TableHeight();		// 刷新表格高度
+							sa.f5TableHeight(); // 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
 					get: function(data) {
 						sa.showIframe('数据详情', 'tb-people-info.html?id=' + data.id, '1000px', '90%');
 					},
-					updateBankInfo(id){
+					updateBankInfo(id) {
 						sa.showIframe('修改银行卡信息', 'tb-people-bank.html?id=' + id, '650px', '40%');
 					},
 					// 修改
@@ -228,7 +223,7 @@
 							sa.ajax('/level-one-server/TbPeople/delete?id=' + data.id, function(res) {
 								sa.arrayDelete(this.dataList, data);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
@@ -237,15 +232,17 @@
 						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
-						if(selection.length == 0) {
+						if (selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
 						// 提交删除
 						sa.confirm('是否批量删除选中数据?此操作不可撤销', function() {
-							sa.ajax('/level-one-server/TbPeople/deleteByIds', {ids: ids.join(',')}, function(res) {
+							sa.ajax('/level-one-server/TbPeople/deleteByIds', {
+								ids: ids.join(',')
+							}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
@@ -254,13 +251,16 @@
 						// 声明变量记录是否成功
 						var isOk = false;
 						var oldValue = data.deleteStatus;
-						var ajax = sa.ajax('/level-one-server/TbPeople/updateDeleteStatus', {id: data.id, value: data.deleteStatus}, function(res) {
+						var ajax = sa.ajax('/level-one-server/TbPeople/updateDeleteStatus', {
+							id: data.id,
+							value: data.deleteStatus
+						}, function(res) {
 							isOk = true;
 							sa.msg('修改成功');
 						}.bind(this));
 						// 如果未能修改成功, 则回滚
 						$.when(ajax).done(function() {
-							if(isOk == false) {
+							if (isOk == false) {
 								data.status = oldValue;
 							}
 						})
@@ -274,4 +274,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>

+ 1 - 1
static/sa.js

@@ -22,7 +22,7 @@ var sa = {
 		api_url: 'http://hs-server.tbgjhc.top:8018',
 		web_url: 'http://www.baidu.com'
 	}
-	sa.cfg = cfg_prod; // 最终环境 , 上线前请选择正确的环境
+	sa.cfg = cfg_dev; // 最终环境 , 上线前请选择正确的环境
 })();