11.7

api/test/index.js

@@ -24,7 +24,10 @@ export const getActivityDataReq = (params, config = {}) => http.get('/api/getAct
 export const updateUserInfoReq = (params, config = {}) => http.post('/api/users/updateUserInfo', params, config)
 
 
-
+// 更新用户信息
+export const getUserPhone = (params, config = {}) => http.post('/api/invite/getUserPhone', params, config)
+// 更新用户信息
+export const addAward = (params, config = {}) => http.post('/api/invite/addAward', params, config)
 
 // 首页相关
 // 获取首页配置

pages/mall/detail/index.vue

@@ -163,12 +163,19 @@
 					// 动态生成用于判断选中激活项的对象
 					let saveCheckedObj = {}
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
-						saveCheckedObj[item] = null
+						// saveCheckedObj[item] = null
+						saveCheckedObj[item] = this.skuParams.attrs[item][0]
+
 					})
 					this.saveCheckedObj = saveCheckedObj
 					// 动态生成用于判断sku参数是否全部选中的中间数组
 					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
 
+					//回显默认值
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						this.handleC(item, index, this.skuParams.attrs[item][0])
+					})
+
 					this.content = res.data
 					this.bannerList = res.data.images
 					this.totalCount = res.data.collect_total_count
@@ -240,7 +247,7 @@
 					let saveCheckedObj = {}
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
 						// saveCheckedObj[item] = null
-						// saveCheckedObj[item] = this.skuParams.attrs[item][0]
+						saveCheckedObj[item] = this.skuParams.attrs[item][0]
 					})
 
 
@@ -248,18 +255,11 @@
 					this.saveCheckedObj = saveCheckedObj
 					// 动态生成用于判断sku参数是否全部选中的中间数组
 					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
-					// this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(1)
-					this.totalPrice = this.skuParams.sku[0].price
-
-					// this.handleC(Object.keys(this.skuParams.attrs)[0], 0, this.skuParams.attrs[Object.keys(this
-					// 	.skuParams.attrs)[0]][
-					// 	0
-					// ])
-
-					// this.handleC(Object.keys(this.skuParams.attrs)[0], 0, this.skuParams.attrs[Object.keys(this
-					// 	.skuParams.attrs)[1]][
-					// 	0
-					// ])
+
+					//回显默认值
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						this.handleC(item, index, this.skuParams.attrs[item][0])
+					})
 
 					this.content = res.data
 					this.bannerList = res.data.images

pages/my.vue

@@ -227,9 +227,9 @@
 					}
 
 
-					this.role = 'superAdmin'
-					this.checkRole()
-					return
+					// this.role = 'cydg'
+					// this.checkRole()
+					// return
 					if (res.data.status) {
 						switch (res.data.type) {
 							case 0:
@@ -644,7 +644,7 @@
 							url: '/pages/my/useLead/index'
 						},
 						{
-							icon: this.picUrl + '/static/my/jiang.png',
+							icon: this.picUrl + '/static/my/qt.png',
 							name: '兑奖记录',
 							url: '/pages/my/duijiang/index?from=1'
 						},
@@ -745,7 +745,7 @@
 
 						{
 							icon: this.picUrl + '/static/my/qt.png',
-							name: '添加售后',
+							name: '新增兑奖记录',
 							url: '/pages/my/inviteSellAfter/index'
 						},
 						{

pages/my/actGoodsDetail/index.vue

@@ -200,12 +200,17 @@
 					// 动态生成用于判断选中激活项的对象
 					let saveCheckedObj = {}
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
-						saveCheckedObj[item] = null
+						// saveCheckedObj[item] = null
+						saveCheckedObj[item] = this.skuParams.attrs[item][0]
+
 					})
 					this.saveCheckedObj = saveCheckedObj
 					// 动态生成用于判断sku参数是否全部选中的中间数组
 					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
-
+					//回显默认值
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						this.handleC(item, index, this.skuParams.attrs[item][0])
+					})
 
 					this.content = res.data
 					this.bannerList = res.data.images
@@ -252,12 +257,16 @@
 				// 动态生成用于判断选中激活项的对象
 				let saveCheckedObj = {}
 				Object.keys(this.skuParams.attrs).forEach((item, index) => {
-					saveCheckedObj[item] = null
+					// saveCheckedObj[item] = null
+					saveCheckedObj[item] = this.skuParams.attrs[item][0]
 				})
 				this.saveCheckedObj = saveCheckedObj
 				// 动态生成用于判断sku参数是否全部选中的中间数组
 				this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
-
+				//回显默认值
+				Object.keys(this.skuParams.attrs).forEach((item, index) => {
+					this.handleC(item, index, this.skuParams.attrs[item][0])
+				})
 
 				this.bannerList = getApp().mallItem.images
 				this.totalCount = this.content.collect_total_count

pages/my/collectDetail/index.vue

@@ -156,12 +156,16 @@
 					// 动态生成用于判断选中激活项的对象
 					let saveCheckedObj = {}
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
-						saveCheckedObj[item] = null
+						// saveCheckedObj[item] = null
+						saveCheckedObj[item] = this.skuParams.attrs[item][0]
 					})
 					this.saveCheckedObj = saveCheckedObj
 					// 动态生成用于判断sku参数是否全部选中的中间数组
 					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
-
+					//回显默认值
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						this.handleC(item, index, this.skuParams.attrs[item][0])
+					})
 
 
 					this.content = res.data
@@ -205,12 +209,16 @@
 					// 动态生成用于判断选中激活项的对象
 					let saveCheckedObj = {}
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
-						saveCheckedObj[item] = null
+						// saveCheckedObj[item] = null
+						saveCheckedObj[item] = this.skuParams.attrs[item][0]
 					})
 					this.saveCheckedObj = saveCheckedObj
 					// 动态生成用于判断sku参数是否全部选中的中间数组
 					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
-
+					//回显默认值
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						this.handleC(item, index, this.skuParams.attrs[item][0])
+					})
 
 					this.content = res.data
 					this.bannerList = this.content.images

pages/my/inviteSellAfter/index.scss

@@ -1,5 +1,5 @@
 .content{
-	background: #F1F1F1;
+	background: #Fff;
 	min-height: 100vh;
 	padding: 0 32rpx;
 	padding-top: 54rpx;

pages/my/inviteSellAfter/index.vue

@@ -1,47 +1,149 @@
 <template>
 	<view class="page">
-		<navBar title="添加售后" :back="true" color="black" background="white" />
+		<navBar title="新增兑奖记录" :back="true" color="black" background="white" />
 
 		<view class="content">
 			<view class="item">
 				<view class="label">
 					*姓名
 				</view>
-				<u--input clearable placeholder="请输入姓名" border="surround" v-model="y_xm" @change="change"></u--input>
+				<u--input clearable placeholder="请输入姓名" border="surround" v-model="name" @change="change"></u--input>
 			</view>
 			<view class="item">
 				<view class="label">
 					*电话
 				</view>
-				<u--input clearable placeholder="请输入电话" border="surround" v-model="y_dh" @change="change"></u--input>
+				<u--input clearable placeholder="请输入电话" border="surround" v-model="phone" @change="change"></u--input>
 			</view>
-			<view class="item" style="margin-bottom: 24rpx;">
+
+
+			<view class="item">
 				<view class="label">
-					项目名称
+					*来源
 				</view>
-				<u--input clearable placeholder="请输入项目名称" border="surround" v-model="l_xmmc"
-					@change="change"></u--input>
+				<uni-data-select placeholder="请选择来源" v-model="source" :localdata="range"></uni-data-select>
 			</view>
-			<button open-type="share" class="orderBtn" :plain="true">
-				确定
+
+			<view class="item" style="margin-bottom: 24rpx;height: auto;">
+				<view class="label">
+					兑奖信息
+				</view>
+				<u--textarea v-model="award_content" placeholder="请输入兑奖信息"></u--textarea>
+			</view>
+			<button class="orderBtn" :plain="true" @click="postRecord">
+				新增
 			</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		getUserPhone,
+		addAward
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
+				phone: '',
+				name: '',
 
+				type: 3,
+				source: -1,
+				status: '产业电工',
+				award_content: '',
+				user_id: null,
+
+				range: [{
+						value: 0,
+						text: "兑奖"
+					},
+					{
+						value: 1,
+						text: "到店"
+					},
+					{
+						value: 2,
+						text: "朋友"
+					},
+					{
+						value: 3,
+						text: "其他"
+					},
+				],
 			}
 		},
-		onLoad(options) {},
+		async onLoad(options) {
+
+		},
 		methods: {
+			async postRecord() {
+				let parms = {}
+				let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
+
+				if (!this.name) {
+					return this.$toast('请输入姓名')
+				}
+				if (!this.phone) {
+					return this.$toast('请输入电话')
+				}
+				if (!phoneReg.test(this.phone)) {
+					return this.$toast('手机号格式不正确')
+				}
+				if (this.source == -1) {
+					return this.$toast('请选择来源')
+				}
+				uni.showLoading({
+					title: '提交中'
+				})
+				let res = await getUserPhone({
+					phone: this.phone,
+				})
+				if (res.code == 0) {
+					console.log('getUserPhone返回值', res.data.id);
+					parms = {
+						type: this.type,
+						name: this.name,
+						phone: this.phone,
+						// status: this.d_ly == 0 ? '兑奖' : this.d_ly == 1 ? '到店' : this.d_ly == 2 ? '朋友' : '其他',
+						source: this.source + 1,
+						status: '产业电工',
+						award_content: this.award_content,
+
+						user_id: res.data.id
+					}
+					console.log('addAward--parmas', parms);
+
+					let res1 = await addAward(parms)
+					if (res1.code == 0) {
+						uni.hideLoading()
 
+						console.log('addAward返回值', res1);
+
+						this.$toast('新增成功')
+
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 1500)
+					} else {
+						uni.hideLoading()
+						uni.showToast({
+							title: res1.message,
+							icon: 'none'
+						})
+					}
+
+				} else {
+					uni.hideLoading()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			}
 		}
 	}
 </script>

unpackage/dist/dev/mp-weixin/components/navBar/index.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 937))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 930))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/components/popup/index.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 747))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 816))
     },
   }
 } catch (e) {