소스 검색

Merge branch 'develop_yh2.0' of chelingzhu-web/zxyj-mini-html into master

liwenwen 4 년 전
부모
커밋
46273fbf6f

+ 11 - 0
.hbuilderx/launch.json

@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+            "type": "uniCloud",
+            "default": {
+                "launchtype": "remote"
+            }
+        }
+    ]
+}

+ 1 - 1
App.vue

@@ -4,7 +4,7 @@
 	const pro_domain = 'https://lese.sxzxyj.net' // 生产
 	const uat_URL = uat_domain+'/gc-shop/' // 预发布
 	const pro_URL = pro_domain+'/gc-shop/'  // 生产
-	const buildType = 1 // 打包环境对应类型,1 生产 0 预发布
+	const buildType = 0 // 打包环境对应类型,1 生产 0 预发布
 	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url
 	const envText = ['预发布环境','生产环境']
 	const envTips = process.env.NODE_ENV == 'development' ? envText[0] : envText[buildType]

+ 4 - 3
components/address.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 			<view class="simple-address__box">
-				<picker-view indicator-style="height: 70rpx;" class="simple-address-view" :value="pickerValue" @change="pickerChange">
+				<picker-view class="simple-address-view" :value="pickerValue" @change="pickerChange">
 					<picker-view-column>
 						<!-- #ifndef APP-NVUE -->
 						<view class="picker-item" :style="{ fontSize: fontSize }" v-for="(item, index) in provinceDataList" :key="index">{{ item.name }}</view>
@@ -317,7 +317,7 @@
 	transition-duration: 0.3s;
 	opacity: 0;
 	/* #ifndef APP-NVUE */
-	z-index: 99;
+	z-index: 99999;
 	/* #endif */
 }
 
@@ -339,11 +339,12 @@
 	bottom: 0;
 	left: 0;
 	right: 0;
+	width: 100%;
 	transition-property: transform;
 	transition-duration: 0.3s;
 	transform: translateY(460rpx);
 	/* #ifndef APP-NVUE */
-	z-index: 99;
+	z-index: 999999;
 	/* #endif */
 }
 

+ 1 - 2
libs/axios.js

@@ -41,8 +41,7 @@ const request = (opts, hasToken) => {
 						uni.showToast({
 							icon:'none',
 							title: ret.message,
-							mask: true,
-							duration: 5000 
+							mask: true
 						})
 					}
 					resolve(ret)

+ 25 - 0
package-lock.json

@@ -4,11 +4,36 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+    },
+    "crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+      "requires": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
     "moment": {
       "version": "2.29.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",

+ 3 - 1
package.json

@@ -14,8 +14,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "md5": "^2.3.0",
     "moment": "^2.29.1",
     "uview-ui": "^1.7.9",
     "weapp-qrcode": "^1.0.0"
-  }
+  },
+  "devDependencies": {}
 }

+ 2 - 1
pages/checkOut/checkOut.vue

@@ -86,6 +86,7 @@
 <script>
 	import { sellerReceive } from '@/api/user.js'
 	import { existPayPwd } from '@/api/order.js'
+	import md5 from 'md5'
 	export default{
 		data() {
 			return {
@@ -166,7 +167,7 @@
 					return
 				}
 				let data = {
-					"payPassword": this.password,
+					"payPassword": md5(this.password),
 					"changeNum": this.number,
 					"remarks": this.remarks,
 					"officialPartnerNo": this.partnerNo

+ 14 - 12
pages/goods/index.vue

@@ -121,19 +121,21 @@
 			clickBanner(index){
 				let row = this.imageTopList[index]
 				console.log(index,row)
-				if(row.jumpType !== 'NONE' && this.hasLogin){
-					// 跳外网地址
-					if(row.jumpUrl.indexOf('http') == 0){
-						
-					}
-					// 跳小程序页面
-					if(row.jumpUrl.indexOf('/pages') == 0){
-						uni.navigateTo({
-							url: row.jumpUrl
-						})
+				if(row.jumpType !== 'NONE'){
+					if(this.hasLogin){
+						// 跳外网地址
+						if(row.jumpUrl.indexOf('http') == 0){
+							
+						}
+						// 跳小程序页面
+						if(row.jumpUrl.indexOf('/pages') == 0){
+							uni.navigateTo({
+								url: row.jumpUrl
+							})
+						}
+					}else{
+						this.toLoginPage()
 					}
-				}else{
-					this.toLoginPage()
 				}
 			},
 			// 获取banner

+ 17 - 15
pages/index/index.vue

@@ -274,26 +274,28 @@
 			clickBanner(index){
 				let row = this.imageTopList[index]
 				console.log(index,row)
-				if(row.jumpType !== 'NONE' && this.hasLogin){
-					// 如果是大转盘
-					if(row.jumpUrl.indexOf('pagesA/luckDraw') >= 0){
-						if(this.showFixedLottery){
-							uni.navigateTo({
-								url:row.jumpUrl
-							})
+				if(row.jumpType !== 'NONE'){
+					if(this.hasLogin){
+						// 如果是大转盘
+						if(row.jumpUrl.indexOf('pagesA/luckDraw') >= 0){
+							if(this.showFixedLottery){
+								uni.navigateTo({
+									url:row.jumpUrl
+								})
+							}else{
+								uni.showToast({
+									icon: 'none',
+									title: '活动已结束'
+								})
+							}
 						}else{
-							uni.showToast({
-								icon: 'none',
-								title: '活动已结束'
+							uni.navigateTo({
+								url: row.jumpUrl
 							})
 						}
 					}else{
-						uni.navigateTo({
-							url: row.jumpUrl
-						})
+						this.toLoginPage()
 					}
-				}else{
-					this.toLoginPage()
 				}
 			},
 			// 查询购物车

+ 4 - 0
pages/userCenter/deliveryRecord.vue

@@ -95,8 +95,12 @@
 </script>
 
 <style lang="less">
+	page{
+		height: 100%;
+	}
 	.deliveryRecord-container{
 		width: 100%;
+		height: 100%;
 		//  列表
 		.scroll-con{
 			height: 100%;

+ 2 - 1
pages/userCenter/userInfo/changePayPwd.vue

@@ -16,6 +16,7 @@
 
 <script>
 	import { checkPayPwd } from '@/api/order.js'
+	import md5 from 'md5'
 	export default {
 		data() {
 			return {
@@ -30,7 +31,7 @@
 			//  确定
 			submit(){
 				if(this.oldPwd){
-					checkPayPwd({oldPayPassword:this.oldPwd}).then(res=>{
+					checkPayPwd({oldPayPassword:md5(this.oldPwd)}).then(res=>{
 						if(res.status == 200) {
 							//  跳转到设置密码
 							uni.redirectTo({

+ 5 - 3
pages/userCenter/userInfo/paymentPwd.vue

@@ -11,6 +11,7 @@
 
 <script>
 	import {setPayPwd, changePayPwd} from '@/api/order.js'
+	import md5 from 'md5'
 	export default {
 		data() {
 			return {
@@ -103,8 +104,9 @@
 				let params = {
 					mobile: this.mobile,
 					verifiCode: this.verifiCode,
-					payPassword: this.value
+					payPassword: md5(this.value)
 				}
+				console.log(params,'--------mima')
 				setPayPwd(params).then(res=>{
 					if(res.status==200) {
 						uni.showToast({ title: res.message, icon: 'none' })
@@ -120,8 +122,8 @@
 			// 修改密码
 			changePsw () {
 				let params = {
-					oldPayPassword: this.oldPwd,
-					payPassword: this.value
+					oldPayPassword: md5(this.oldPwd),
+					payPassword: md5(this.value)
 				}
 				changePayPwd(params).then(res=>{
 					if(res.status==200) {

+ 11 - 11
pagesA/luckDraw/myJp.vue

@@ -12,7 +12,7 @@
 				<u-button size="mini" @click="goBack">去抽奖</u-button>
 			</view> -->
 		</view>
-		
+		<Address ref="applyAddress" @onConfirm="areaConfirm"></Address>
 		<!-- 查看详情弹框 -->
 		<u-popup v-model="showViews" mode="center" close-icon-color="#ffffff" closeable :border-radius="30" width="500rpx">
 			<view class="lottery-content">
@@ -73,10 +73,10 @@
 					 	</u-form-item>
 					 	<u-form-item label="省市区" required prop="receiveAreasName">
 					 		<u-input v-model="areaInfo.label" placeholder="请选择省市区" @click="openAddress" type="select" />
-					 		<Address ref="applyAddress" @onConfirm="areaConfirm"></Address>
 					 	</u-form-item>
 					 	<u-form-item label="详细地址" :border-bottom="false" required prop="receiveAddress">
-					 		<u-input type="textarea" :height="100" auto-height placeholder="请输入收货详细地址(最多100个字符)" :maxlength="100" v-model="form.receiveAddress" class="receiveAddress"/>
+					 		<!-- <u-input type="textarea" :height="100" auto-height placeholder="请输入收货详细地址(最多100个字符)" :maxlength="100" v-model="form.receiveAddress" class="receiveAddress"/> -->
+							<textarea :auto-height="true" placeholder="请输入收货详细地址(最多100个字符)" :maxlength="100" v-model="form.receiveAddress" class="receiveAddress"/>
 					 	</u-form-item>
 					 </u-form>
 				</view>
@@ -85,7 +85,6 @@
 				</view>
 			</view>
 		</u-popup>
-		
 	</view>
 </template>
 
@@ -264,13 +263,15 @@ export default {
 					if(this.form.id) {
 						params.id = this.form.id
 					}
+					// 更新收货地址
+					this.saveReceive(params)
 					// 保存我的收货地址
-					saveAddress(params).then(res=>{
-						if(res.status == 200) {
-							// 保存领奖收货信息
-							this.saveReceive(params)
-						} 
-					})
+					// saveAddress(params).then(res=>{
+					// 	if(res.status == 200) {
+					// 		// 保存领奖收货信息
+					// 		this.saveReceive(params)
+					// 	} 
+					// })
 				}
 			});
 		},
@@ -347,7 +348,6 @@ export default {
 		}
 		.lottery-content{
 			height: 100%;
-			position: relative;
 			background: url(../../static/lottery_winbg1.png) no-repeat center top;
 			background-size: 100% auto;
 			.lottery-confrim-btn{

+ 4 - 3
pagesA/order/LogList.vue

@@ -17,7 +17,7 @@
 									<view>
 										<text>运单编号:</text>
 										<text>{{item.expressNum}}</text>
-										<u-button @click="copyLogNum(item.expressNum)" style="margin-left: 20upx;" shape="square" size="mini">复制</u-button>
+										<u-button @click="copyLogNum(index)" style="margin-left: 20upx;" shape="square" size="mini">复制</u-button>
 									</view>
 								</view>
 							</view>
@@ -123,9 +123,10 @@
 					} 
 				})
 			},
-			
 			// 复制运单编号 
-			copyLogNum (logNum) {
+			copyLogNum (index) {
+				let logNum = this.list[index].expressNum
+				console.log(logNum)
 				// H5 不支持
 				uni.setClipboardData({
 					data: logNum,

+ 4 - 2
pagesA/order/order.vue

@@ -122,7 +122,7 @@
 		</u-popup>
 	</view>
 </template>
-
+<script src="assets/global/plugins/passwordguard/js/jsencrypt.min.js" type="text/javascript"></script>
 <script>
 	import {
 		getLookUpDatas,
@@ -132,6 +132,7 @@
 		getOrderList, signPay, existPayPwd
 	} from '@/api/order.js'
 	import moment from 'moment'
+	import md5 from 'md5'
 	export default {
 		components: {},
 		data() {
@@ -402,9 +403,10 @@
 					return false
 				}
 				let params = {
-					payPwd: this.password,
+					payPwd: md5(this.password),
 					id: this.orderId
 				}
+				console.log(params,'pppppppppp')
 				signPay(params).then(res=>{
 					this.btnLoading = false
 					if(res.status == 200) {

+ 3 - 2
pagesA/toOrder/index.vue

@@ -101,9 +101,9 @@
 		</u-popup>
 	</view>
 </template>
-
 <script>
 	import { saveOrder, signPay, existPayPwd} from '@/api/order.js'
+	import md5 from 'md5'
 	import {
 		findAddressBycustomerNo
 	} from '@/api/receiveAddress.js'
@@ -288,9 +288,10 @@
 					return false
 				}
 				let params = {
-					payPwd: this.password,
+					payPwd: md5(this.password),
 					id: this.orderId
 				}
+				console.log(params,'pppppppppp')
 				this.payBtn = true
 				signPay(params).then(res=>{
 					this.payBtn = false