Browse Source

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 years ago
parent
commit
7675da3fe9
10 changed files with 313 additions and 181 deletions
  1. 1 1
      App.vue
  2. 24 0
      api/station.js
  3. 2 2
      libs/getDate.js
  4. 2 2
      pages.json
  5. 53 37
      pages/index/index.vue
  6. 3 1
      pages/order/order.vue
  7. 140 87
      pages/order/orderDetail.vue
  8. 85 48
      pages/store/store.vue
  9. 2 2
      pages/toOrder/index.vue
  10. 1 1
      pages/userCenter/ldDetailed.vue

+ 1 - 1
App.vue

@@ -1,6 +1,6 @@
 <script>
 	// const uat_URL = 'https://carwash.test.zyucgj.com/gc-shop/' // 预发布
-	const uat_URL = 'http://192.168.16.105:8302/gc-shop/' // 本地
+	const uat_URL = 'http://192.168.16.155:8302/gc-shop/' // 本地
 	const pro_URL = 'https://carwash.zyucgj.com/gc-shop/'  // 生产
 	const buildType = 0 // 打包环境对应类型,1 生产 0 预发布
 	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url

+ 24 - 0
api/station.js

@@ -0,0 +1,24 @@
+import axios from '@/libs/axios.js';
+
+// 获取首页网点列表
+export const stationList = params => {
+  return axios.request({
+    url: `station/query`,
+    method: 'post',
+	data: params
+  })
+}
+// 网点详情
+export const stationDetail = params => {
+  return axios.request({
+    url: `station/findById/${params.id}`,
+    method: 'get'
+  })
+}
+// 查询网点的设备列表
+export const stationDevice = params => {
+  return axios.request({
+    url: `device/findById/${params.stationNo}`,
+    method: 'get'
+  })
+}

+ 2 - 2
libs/getDate.js

@@ -72,13 +72,13 @@ export default {
     obj.endtime = moment(moment().month(moment().month() - 2).endOf('month').valueOf()).format('YYYY-MM-DD')
     return obj
   },
-  // 获取3个月到今天的开始结束时间
+  // 获取3个月到今天的开始结束时间
   getThreeMonthDays () {
     const obj = {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 3).valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 2).startOf('month').valueOf()).format('YYYY-MM-DD')
     obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
     return obj
   }

+ 2 - 2
pages.json

@@ -82,13 +82,13 @@
 		{
 			"path": "pages/userCenter/liucheng",
 			"style": {
-				"navigationBarTitleText": "投递流程"
+				"navigationBarTitleText": "使用指南"
 			}
 		},
 		{
 			"path": "pages/userCenter/zhinan",
 			"style": {
-				"navigationBarTitleText": "分类指南"
+				"navigationBarTitleText": "回收分类"
 			}
 		},
 		{

+ 53 - 37
pages/index/index.vue

@@ -4,13 +4,13 @@
 		<!-- 导航按钮 -->
 		<view class="nav">
 			<u-grid :col="4" :border="false" @click="toPage">
-				<u-grid-item :index="0">
+				<u-grid-item :index="1">
 					<u-image width="90rpx" height="90rpx" src="/static/zhinan.png"></u-image>
-					<view class="grid-text">分类指南</view>
+					<view class="grid-text">回收分类</view>
 				</u-grid-item>
 				<u-grid-item :index="1">
 					<u-image width="90rpx" height="90rpx" src="/static/liucheng.png"></u-image>
-					<view class="grid-text">投递流程</view>
+					<view class="grid-text">使用指南</view>
 				</u-grid-item>
 				<u-grid-item :index="2">
 					<u-image width="90rpx" height="90rpx" src="/static/shouyi.png"></u-image>
@@ -26,22 +26,28 @@
 		<view class="storeList">
 			 <u-section title="附近的网点" :right="false" line-color="#01c9b2"></u-section>
 			 <view class="stores-box">
-				 <view class="stores-item" v-for="item in 3" @click="viewStore(item)">
-					 <view class="s-name">
+				<view class="stores-item" v-for="item in stationDataList" @click="viewStore(item)">
+					<view class="s-name">
+						<view>{{ item.name }}</view>
+					</view>
+					<view class="s-address">
+						<view>
+							<text>{{ item.provinceName }}{{ item.cityName }}{{ item.districtName }}{{ item.address }}</text>
+						</view>
 						<view>
-							网点名称啊撒地方就拉萨附近士大夫
+							<u-icon name="map-fill" color="#01c9b2" size="30"></u-icon>
+							{{ item.distanct.distance ? (item.distanct.distance/1000).toFixed(1) : 0 }}KM
 						</view>
-					 </view>
-					 <view class="s-address">
-						<view><text>陕西西安高新二路十字103号</text></view>
-						<view><u-icon name="map-fill" color="#01c9b2" size="30"></u-icon> 1.3KM</view>
-					 </view>
-					 <view class="s-time">
-						 <view>
-							 营业时间:<text>9:00 - 11:00 , 12:00 - 17:00</text>
-						 </view>
-					 </view>
-				 </view>
+					</view>
+					<view class="s-time">
+						<view>
+							营业时间:
+							<text v-for="(tItem, tInd) in item.deliveryTimeRuleItemList" :key="tInd">
+								{{ tItem.openTime }} - {{ tItem.closeTime }}{{ tInd == item.deliveryTimeRuleItemList.length - 1 ? '' : ',' }}
+							</text>
+						</view>
+					</view>
+				</view>
 			 </view>
 		</view>
 	</view>
@@ -58,28 +64,12 @@
 	import {
 		getLookUpDatas
 	} from '@/api/data.js'
+	import { stationList } from '@/api/station.js'
 	export default {
 		data() {
 			return {
-				imageTopList:[
-					
-				],
-				goodsList:[
-					{
-						id: 21312312321,
-						name: '啊撒旦解放拉萨酱豆腐爱丽丝反对萨拉地方就',
-						src: '/static/goods.png',
-						price: 300,
-						status: 0
-					},
-					{
-						id: 6465465465,
-						name: '啊撒旦解放拉萨酱豆腐爱丽丝反对萨拉地方就',
-						src: '/static/goods.png',
-						price: 50,
-						status: 1
-					},
-				]
+				imageTopList: [],
+				stationDataList: [] //  附近网点列表
 			}
 		},
 		onLoad() {
@@ -87,6 +77,8 @@
 			this.getCodeList('RUBBISH_TYPE','vuex_rubbishType')
 			// 获取顶部轮播图
 			this.getbannerList()
+			//  获取经纬度
+			this.getLocation()
 			// 查询购物车列表
 			this.getCartList()
 			// 加入购物车
@@ -113,6 +105,30 @@
 					}
 				})
 			},
+			//  获取经纬度
+			getLocation() {
+				const _this = this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						_this.getStationList(res.longitude, res.latitude)
+					},
+					fail: function(error) {
+						console.log(error)
+						uni.showToast({ icon: 'none', title: '定位失败' })
+					}
+				});
+			},
+			//  获取网点列表
+			getStationList(lng, lat) {
+				stationList({ lng: lng, lat: lat }).then(res => {
+					if (res.status == 200) {
+						this.stationDataList = res.data
+					} else {
+						this.stationDataList = []
+					}
+				});
+			},
 			// 获取banner
 			getbannerList(){
 				bannerList({type:'banner',location:'MALL_TOP'}).then(res=>{
@@ -212,7 +228,7 @@
 			// 查看网点
 			viewStore(item){
 				uni.navigateTo({
-					url: "/pages/store/store"
+					url: '/pages/store/store?id=' + item.id + '&stationNo=' + item.stationNo
 				})
 			}
 		}

+ 3 - 1
pages/order/order.vue

@@ -154,10 +154,12 @@
 				showLeavePsw: false, // 打开确定放弃弹窗
 			}
 		},
+		onShow() {
+			this.pageInit()
+		},
 		onLoad() {
 			// 监听设置密码是否成功
 			uni.$once('setPswSuccess', this.setPsw)
-			this.pageInit()
 		},
 		onUnload() {
 			uni.$off('refreshBL', this.refresh)

+ 140 - 87
pages/order/orderDetail.vue

@@ -28,21 +28,21 @@
 				<view class="img-cont">
 					<image :src="item.goodsImages"></image>
 				</view>
-				<view >
+				<view>
 					<view class="ellipsis-two">{{item.goodsName}}</view>
 					<view class="bundle-num">
-						<view ><text class="price-num">{{item.payGold}}</text> <text class="price-text">乐豆</text></view>
-						<view >X {{item.buyQty}}</view>
+						<view><text class="price-num">{{item.payGold}}</text> <text class="price-text">乐豆</text></view>
+						<view>X {{item.buyQty}}</view>
 					</view>
 				</view>
 			</view>
 			<u-gap height="10" bg-color="#f8f8f8"></u-gap>
 			<!-- 订单信息 -->
 			<u-cell-group>
-				<u-cell-item title="订单编号" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false" >
+				<u-cell-item title="订单编号" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
 					{{orderInfo.orderSn}}
 				</u-cell-item>
-				<u-cell-item title="下单时间" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false" >
+				<u-cell-item title="下单时间" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
 					{{orderInfo.orderTime}}
 				</u-cell-item>
 				<u-cell-item v-if="orderInfo.payTime" title="支付时间" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
@@ -55,109 +55,145 @@
 				<u-cell-item title="运费" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
 					免运费
 				</u-cell-item>
-				<u-cell-item :title="(orderInfo.orderState=='待支付'||orderInfo.orderState=='已取消') ? '待支付':'实际支付'" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
+				<u-cell-item :title="(orderInfo.orderState=='待支付'||orderInfo.orderState=='已取消') ? '待支付':'实际支付'" :value-style="{color: '#000',fontSize: '28upx'}"
+				 :arrow="false">
 					<text class="price-num">{{orderInfo.originalGold}}</text> <text class="price-text">乐豆</text>
 				</u-cell-item>
 			</u-cell-group>
 		</view>
-		<view v-if="orderInfo.orderState=='待支付'" class="footer">
-			<u-button @click="cancleOrder" type="error" >去支付</u-button>
+		<view v-if="orderInfo.orderState=='WAIT_PAY'" class="footer">
+			<u-button @click="cancleOrder" type="error">去支付</u-button>
 		</view>
+		<!-- 提示用户设置支付密码 -->
+		<u-modal v-model="showSetPswModal" 
+		content="请先设置支付密码,才能使用乐豆" 
+		show-cancel-button 
+		confirm-text="去设置" 
+		cancel-text="暂时放弃"
+		@confirm="toSetPwd"
+		@cancel="showSetPswModal=false"
+		></u-modal>
+		<!-- 确认取消弹窗 -->
+		<u-modal v-model="showLeavePsw" 
+		title="确认放弃支付吗?"
+		content="您的订单在30分钟内未支付将被取消" 
+		show-cancel-button 
+		confirm-text="确认放弃" 
+		cancel-text="继续支付"
+		@confirm="canclePay"
+		@cancel="payAgain"
+		></u-modal>
+		<!-- 确认支付弹窗 -->
+		 <u-popup mode="center" closeable @close="showLeavePsw=true" v-model="showInputPsw" width="500rpx" >
+			<view class="slot-content">
+				<view>确认支付</view>
+				<view class="text-cont">
+					<text class="num-big">{{totalPrice}}</text>乐豆
+				</view>
+				<view class="footer">
+					<u-input v-model="password" maxlength="30" input-align="center" type="password" placeholder="请输入支付密码" />
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
 <script>
-	import {orderDetail, cancleOrder} from '@/api/order.js'
-	import {getLookUpDatas} from '@/api/data.js'
-	export default{
+	import {
+		orderDetail,
+		cancleOrder
+	} from '@/api/order.js'
+	import {
+		getLookUpDatas
+	} from '@/api/data.js'
+	export default {
 		data() {
 			return {
-				orderInfo: {
-					address: '陕西省西安市未央区常青二路大明宫小区',
-					userName: '王明',
-					phone: '18792701023',
-					orderTime: "2020-10-28 11:15:59",
-					orderState: "待支付",
-					orderNo: 121245465748,
-					payedAmount: 0,
-					id: 11,
-					amount: 450,
-					totalNum: 3,
-					itemList: [
-						{
-							name: "八九箭冠",
-							id: 76435,
-							number: 1,
-							price: 150,
-							icon: ''
-						},
-						{
-							name: "数据库的合法身份觉得很附近发生纠纷解决",
-							id: 76436,
-							number: 2,
-							price: 150,
-							icon: ''
-						}
-					]
-				},
-				src: '',
+				orderInfo: {},
+				totalPrice: 0, // 支付合计
+				showSetPswModal: false,  // 设置支付密码弹窗
+				showInputPsw: false, // 打开输入密码弹窗
+				showLeavePsw: false, // 打开确定放弃弹窗
 				orderStatusList: []
 			}
 		},
 		onLoad(options) {
+			// 监听设置密码是否成功
+			uni.$once('setPswSuccess', this.setPsw)
 			if (options.id) {
 				console.log(options.id)
 				this.getOrderDetail(options.id)
 				this.orderStatusList = this.$store.state.vuex_payStatus
 			}
 		},
-		methods:{
-			getOptionName (list,val) {
-			  if(val){
-				  let p = list.find((item) => {
-				  				  return item.code == val
-				  })
-				  return p ? p.dispName : '-'
-			  }
-			  return '-'
+		methods: {
+			getOptionName(list, val) {
+				if (val) {
+					let p = list.find((item) => {
+						return item.code == val
+					})
+					return p ? p.dispName : '-'
+				}
+				return '-'
 			},
 			// 获取订单详情
-			getOrderDetail (id) {
+			getOrderDetail(id) {
 				let payTypeList = this.$store.state.vuex_payType
-				orderDetail({id:id}).then(res =>{
+				orderDetail({
+					id: id
+				}).then(res => {
 					if (res.status == 200) {
 						this.orderInfo = res.data
-						this.orderInfo.payType = this.orderInfo.payType ? this.getOptionName(payTypeList,this.orderInfo.payType) : ''
 					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
 				})
 			},
-			// 取消订单
-			cancleOrder (){
-				cancleOrder({id:this.orderInfo.id}).then(res=>{
-					if (res.status==200) {
-						this.toashMsg(res.message)
-						setTimeout(()=>{
-							uni.navigateBack()
-						},500)
-					}
+			// 跳转到设置支付密码页
+			toSetPwd () {
+				uni.navigateTo({
+					url:"/pages/userCenter/userInfo/paymentPwd"
 				})
 			},
-			// 图片预览
-			showImage (url) {
-				uni.previewImage({
-					urls: [url],
-					longPressActions: {
-						itemList: ['发送给朋友', '保存图片', '收藏'],
-						success: function(data) {
-							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-						},
-						fail: function(err) {
-							console.log(err.errMsg);
-						}
+			// 设置密码成功, 打开输入密码弹窗
+			setPsw (e) {
+				if (e.success) {
+					this.showInputPsw = true
+				}
+			},
+			//确认放弃
+			canclePay() {
+				this.showLeavePsw = false
+				this.showInputPsw = false
+			},
+			// 继续支付
+			payAgain () {
+				this.showLeavePsw = false
+				this.showInputPsw = true
+			},
+			// 支付
+			toPay(item) {
+				// this.totalPrice = item.payGold
+				// this.showSetPswModal = true
+				// return
+				signPay({id:item.id}).then(res=>{
+					this.btnLoading = false
+					if(res.status == 200) {
+						// 跳转到支付完成界面
+						uni.navigateTo({
+							url:"/pages/toOrder/payFinish?id=" + this.orderId
+						})
+					} else{
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
-				});
-			}
+				})
+			},
 		},
 	}
 </script>
@@ -167,61 +203,73 @@
 		height: 100%;
 		background-color: #fff;
 	}
-	.order-pages{
+
+	.order-pages {
 		width: 100%;
 		height: 100%;
 		padding: 0 24upx;
 		display: flex;
 		flex-direction: column;
-		.order-info{
+
+		.order-info {
 			width: 100%;
 			flex: 1;
 			overflow-y: scroll;
+
 			// 状态
-			.order-status{
+			.order-status {
 				padding: 30upx 0;
 				text-align: center;
-				.status-title{
+
+				.status-title {
 					font-size: 36upx;
 					color: #000;
 				}
-				.status-care{
+
+				.status-care {
 					font-size: 24upx;
 					margin-top: 10upx;
 					color: #a9aaac;
+
 					>text {
 						color: red;
 					}
 				}
 			}
+
 			// 地址
 			.order-address {
 				font-size: 32upx;
 				padding: 20upx 0;
+
 				>view {
 					line-height: 60upx;
 				}
+
 				.address-title {
 					color: #000;
 				}
 			}
+
 			// 订单中商品列表
 			.bundle-list {
 				display: flex;
 				padding: 20upx 10upx;
 				font-size: 28upx;
 				border-bottom: 1px solid #F8F8F8;
+
 				.img-cont {
 					width: 158rpx;
 					height: 140upx;
 					border-radius: 15upx;
 					overflow: hidden;
+
 					>image {
 						width: 100%;
 						height: 100%;
 					}
 				}
-				
+
 				>view {
 					&:last-child {
 						flex: 1;
@@ -231,26 +279,31 @@
 						justify-content: space-between;
 					}
 				}
+
 				.bundle-num {
 					display: flex;
 					justify-content: space-between;
 				}
 			}
-			.price-text{
+
+			.price-text {
 				font-size: 20upx;
 				margin-left: 10upx;
 			}
-			.price-num{
+
+			.price-num {
 				font-size: 32upx;
 				color: red;
 			}
-			.u-cell{
-				padding:10rpx 32rpx;
+
+			.u-cell {
+				padding: 10rpx 32rpx;
 			}
 		}
-		.footer{
+
+		.footer {
 			padding: 20rpx;
 		}
-		
+
 	}
 </style>

+ 85 - 48
pages/store/store.vue

@@ -11,82 +11,119 @@
 		style="width: 100%; height:30%;">
 		</map>
 		<!-- 网点信息及设备 -->
-		<view class="details">
+		<view class="details" v-if="stationData">
 			<view class="details-address">
-				<view>华金基座A座</view>
-				<view>西安市未央路北二环真光路A座12号</view>
-				<view>营业时间:9:00 - 12:00</view>
+				<view>{{ stationData.name }}</view>
+				<view>{{ stationData.provinceName }}{{ stationData.cityName }}{{ stationData.districtName }}{{ stationData.address }}</view>
+				<view>
+					营业时间:
+					<text v-for="(tItem, tInd) in stationData.deliveryTimeRuleItemList" :key="tInd">
+						{{ tItem.openTime }} - {{ tItem.closeTime }}{{ tInd == stationData.deliveryTimeRuleItemList.length - 1 ? '' : ',' }}
+					</text>
+				</view>
 			</view>
 			<!-- 设备列表 -->
 			<view class="details-dev">
-				<view class="details-dev-box" v-for="item in 3">
-					<view class="details-dev-title">设备编号:<text>SDFLSJLSAFJLJSLFJLKF</text></view>
+				<view class="details-dev-box" v-for="item in deviceData">
+					<view class="details-dev-title">设备编号:<text>{{ item.srcDeviceCode }}</text></view>
 					<view class="details-dev-cons">
-						<view class="dev-item">
-							<view>
-								<u-image height="80" width="80" src="/static/yw.png"></u-image>
-							</view>
-							<view>
-								<view>废旧衣物</view>
-								<text>100g/1乐豆</text>
-							</view>
-						</view>
-						<view class="dev-item">
-							<view>
-								<u-image height="80" width="80" src="/static/zhizhang.png"></u-image>
-							</view>
-							<view>
-								<view>废旧纸张 <u-tag text="已满" size="mini" mode="dark" type="info" /></view>
-								<text>100g/1乐豆</text>
-							</view>
-						</view>
-						<view class="dev-item">
+						<view class="dev-item" v-for="boxItem in item.deviceTypeBoxList">
 							<view>
-								<u-image height="80" width="80" src="/static/jinshou.png"></u-image>
+								<u-image height="80" width="80" :src="`/static/${boxItem.rubbishType}.png`"></u-image>
 							</view>
 							<view>
-								<view>废旧金属</view>
-								<text>100g/1乐豆</text>
-							</view>
-						</view>
-						<view class="dev-item">
-							<view>
-								<u-image height="80" width="80" src="/static/dhai.png"></u-image>
-							</view>
-							<view>
-								<view>有害垃圾</view>
-								<text>100g/1乐豆</text>
+								<view>
+									{{ boxItem.rubbishTypeDictValue }}
+									<u-tag v-if="boxItem.flag==1" text="已满" size="mini" mode="dark" type="info" />
+								</view>
+								<text>{{ getRule(boxItem.rubbishType).rubbishWeight }}g/{{ getRule(boxItem.rubbishType).goleNum }}乐豆</text>
 							</view>
 						</view>
 					</view>
 				</view>
+				<u-empty v-if="deviceData.length==0" text="暂无设备" mode="list" margin-top="120"></u-empty>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import { stationDetail, stationDevice } from '@/api/station.js'
 	export default {
 		data() {
 			return {
+				stationId: '',  //  网点id
+				stationNo: '',  //  网点编号
 				lat: '',
 				lng: '',
 				mapCtx: null, // 地图对象
 				markers: [], // 标注点
+				stationData: null,  //  网点信息
+				deviceData: [],  //  设备信息
 			};
 		},
-		onLoad() {
-			this.lng = '101.760521'
-			this.lat = '36.636193'
-			this.markers = [
-				{
-					latitude: this.lat,
-					longitude: this.lng,
-					width: 30,
-					height: 30,
-					iconPath: "/static/store.png"
+		onLoad(options) {
+			this.stationId = options.id
+			this.stationNo = options.stationNo
+			//  获取经纬度
+			this.getLocation()
+			this.getStation()  //  网点信息
+			this.getDevice()  //  设备信息
+		},
+		methods: {
+			//  获取经纬度
+			getLocation() {
+				const _this = this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						_this.lng = res.longitude
+						_this.lat = res.latitude
+					},
+					fail: function(error) {
+						console.log(error)
+						uni.showToast({ icon: 'none', title: '定位失败' })
+					}
+				})
+			},
+			//  网点信息
+			getStation(){
+				stationDetail({ id: this.stationId }).then(res => {
+					if(res.status == 200){
+						this.stationData = res.data
+					}else{
+						this.stationData = null
+					}
+				})
+			},
+			//  设备信息
+			getDevice(){
+				stationDevice({ stationNo: this.stationNo }).then(res => {
+					if(res.status == 200){
+						this.deviceData = res.data
+						this.markers = []
+						for(let i=0; i<res.data.length; i++){
+							this.markers.push({
+								latitude: res.data[i].lat,
+								longitude: res.data[i].lng,
+								width: 30,
+								height: 30,
+								iconPath: "/static/store.png"
+							})
+						}
+					}else{
+						this.deviceData = []
+					}
+				})
+			},
+			//  根据垃圾类型获取兑换规则
+			getRule(type){
+				let row = null
+				if(this.stationData.goldExRuleItemList){
+					row = this.stationData.goldExRuleItemList.find(item => item.rubbishType == type)
 				}
-			]
+				return { rubbishWeight: row.rubbishWeight || 0, goleNum: row.goleNum || 0 }
+			}
 		}
 	}
 </script>

+ 2 - 2
pages/toOrder/index.vue

@@ -183,8 +183,8 @@
 			},
 			// 支付  保存订单
 			toSave(){
-				this.showSetPswModal = true
-				return
+				// this.showSetPswModal = true
+				// return
 				let orderGoodsList = []
 				this.goodsList.map((item,index)=>{
 					orderGoodsList[index] = {

+ 1 - 1
pages/userCenter/ldDetailed.vue

@@ -16,7 +16,7 @@
 							<u-image mode="scaleToFill" v-else shape="circle" width="90rpx" height="90rpx" src="/static/bued.png"></u-image>
 						</view>
 						<view class="cell-item-c">
-							<text class="cell-item-des">{{subItem.remarks||'--'}}</text>
+							<text class="cell-item-des">{{subItem.operateTypeDictValue||'--'}}</text>
 							<text class="cell-item-date">{{subItem.createDate}}</text>
 						</view>
 						<view :class="['cell-item-score', subItem.changeType == 'ADD' ? 'black' : 'red']">