shish 4 tahun lalu
induk
melakukan
8cac8837ed

+ 96 - 12
ghsApp/src/admin/item/xjSelect.vue

@@ -1,4 +1,33 @@
 <template>
+<view>
+  <view>
+    <form @submit="formSubmit">
+      <div class="module-com input-line-wrap">
+		  
+      <div class="module-com input-line-wrap goods-wrap">
+        <div class="module-tit">
+          <span>选择图片</span>
+          <span class="app-color-3">(每次选一张)</span>
+        </div>
+        <div class="module-det">
+          <app-uploader ref="appUploader" @chooseImage="uploadXjImg" :imgList.sync="form.cover" :prefixShow="true" :compress="true" :num="50" />
+        </div>
+      </div>
+
+      <view style="text-align:center;">
+
+		<button class="admin-button-com big blue" style="width:95%;" formType="submit">全部提交</button>
+
+      </view>
+
+		  </div>
+		  </form>
+	</view>
+
+	<view style="text-align:center;border-top:1px dashed #cccccc;padding-top:30rpx;padding-bottom:30rpx;">
+		<button @click="clearXj" class="admin-button-com small default">清空全部小菊</button>
+	</view>
+
 	<view class="billing_box_bg">
 		<view class="scroll-middle_bx">
 			<block>
@@ -14,33 +43,31 @@
 									<view class="kc"></view>
 									<view class="num-open_bx">
 										<view class="open-bx warn" @tap.stop.prevent>
-											<text v-if="xjItem.has == 0" style="color:#777777;">已停用</text>
+											<text v-if="xjItem.status == 2" style="color:#777777;">已停用</text>
 											<text v-else style="color:green;">已启用</text>
-<switch :checked="xjItem.has == 0 ? false : true" @change="changeFn($event,xjItem.id)" style="transform: scale(0.8,0.8)" />
+											<switch :checked="xjItem.status == 2 ? false : true" @change="changeFn($event,xjItem.id)" style="transform: scale(0.8,0.8)" />
 										</view>
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
-
-					<view>
-						<button class="admin-button-com big blue" @click="goBack()" style="margin:40rpx 0 20rpx 220rpx;padding:30rpx 80rpx 30rpx 80rpx;">返回</button>
-					</view>
-
 				</view>
 			</block>
 		</view>
 	</view>
+
+</view>
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import AppUploader from "@/components/app-uploader";
 import { mapGetters } from "vuex";
-import { getFilterXj,ReplaceXj } from "@/api/product/xj"
+import { getFilterXj,ReplaceXj,clearAll,batchAdd } from "@/api/product/xj"
 export default {
 	name: "xj",
 	components: {
-		AppWrapperEmpty,
+		AppWrapperEmpty,AppUploader
 	},
 	mixins: [],
 	data() {
@@ -49,6 +76,7 @@ export default {
 			xjList:[],
 			xjData:[],
 			numList:[],
+			uploadXj:[]
 		};
 	},
 	computed:{
@@ -69,14 +97,37 @@ export default {
 	onShow(){
 	},
 	methods: {
+		clearXj(){
+			let self = this
+			uni.showModal({
+				title: '确认清除?',
+				content: "",
+				showCancel: true,
+				cancelText: "取消",
+				cancelColor: "#000000",
+				confirmText: "确定",
+				confirmColor: "#3CC51F",
+				success: async result => {
+					if (result.confirm) {
+						clearAll().then(res => {
+							self.$msg(res.msg)
+							if(res.code == 1){
+								self.initXj()
+							}
+						})
+					}
+				},
+				fail: () => {},
+				complete: () => {}
+			});
+		},
 		previewImage(url){
-			console.log('url',url)
 			uni.previewImage({
 				urls: [url]
 			})
 		},
 		changeFn(e,id){
-			let act = e.target.value == true ? 'add' : 'del'
+			let act = e.target.value == true ? 'start' : 'stop'
 			let that = this
 			ReplaceXj({act,id}).then(res=>{
 				that.init()
@@ -86,15 +137,48 @@ export default {
 			uni.navigateBack({});
 		},
 		init(){
+			this.initXj()
+		},
+		initXj(){
 			getFilterXj().then(res => {
 				this.xjList = res.data.list
 			});
+		},
+		uploadXjImg(arr) {
+			this.uploadXj = arr
+		},
+		// 表单验证
+		formSubmit(e) {
+			let that = this
+			if (that.$util.isEmpty(this.uploadXj)){
+				that.$msg('请选择图片')
+				return false
+			}
+			let imgData = JSON.stringify(this.uploadXj)
+			batchAdd({xjData:imgData}).then(res=>{
+				that.$msg(res.msg)
+				if(res.code == 1){
+					that.$util.pageTo({url: "/admin/item/xjSelect",type: 3})
+				}
+			})
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+.module-com {
+  margin-bottom: 20px;
+  background-color: #fff;
+  color: $fontColor2;
+  .module-tit {
+    padding: 20px 30px;
+    font-size: 28px;
+  }
+  .module-det {
+    padding: 0 30px;
+  }
+}
 .billing_box_bg {
 	height: 100%;
 	display: flex;
@@ -279,4 +363,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

+ 8 - 0
ghsApp/src/api/product/xj.js

@@ -16,4 +16,12 @@ export const getFilterXj = data => {
 
 export const ReplaceXj = data => {
 	return https.get("/shop-ext/replace-xj", data);
+};
+
+export const clearAll = data => {
+	return https.get("/xj/clear-all", data);
+};
+
+export const batchAdd = data => {
+	return https.post("/xj/batch-add", data);
 };

+ 5 - 5
ghsApp/src/components/app-uploader.vue

@@ -80,11 +80,11 @@ export default {
       type: String,
       default: "1.5M"
     },
-			//备注
-			remark: {
-				type: String,
-				default: ""
-			},
+    //备注
+    remark: {
+      type: String,
+      default: ""
+    },
     // 是否记录用户的选择记录
     isSave: {
       type: Boolean,

+ 6 - 8
ghsApp/src/pagesInvite/inviteGhsShop.vue

@@ -3,13 +3,11 @@
     <view class="img_box">
       <image :src="imgUrl" class="img_url"></image>
     </view>
-    <!-- 确认 -->
-      <div class="confirm-btn">
-        <button class="admin-button-com big blue" @click="downloadImg">保存图片邀请</button>
-      </div>
-      <div class="confirm-btn1">
-        <button class="admin-button-com big blue" @click="goToMallPt()">直接打开邀请</button>
-      </div>
+    <view style="margin:50rpx 0 0 32rpx;font-size:30rpx;">保存图片,并分享给您要邀请的人识别注册。</view>
+    <div class="confirm-btn">
+      <button class="admin-button-com big blue" @click="downloadImg">保存图片</button>
+    </div>
+    <!-- <div class="confirm-btn1"><button class="admin-button-com big blue" @click="goToMallPt()">直接打开</button></div> -->
   </view>
 </template>
 
@@ -92,7 +90,7 @@ export default {
 // 按钮
 .confirm-btn {
   width: calc(100% - 60px);
-  margin: 100px 30px 20px;
+  margin: 50px 30px 20px;
   .admin-button-com {
     width: 100%;
   }

+ 8 - 14
ghsApp/src/pagesInvite/list.vue

@@ -7,24 +7,24 @@
 					<view class="name"> {{ userInfo.name || "" }}</view>
 					<view class="mark"> 普通等级 </view>
 				</view>
-				<button class="user-wrap-right" @tap="inviteHd()">
+				<!-- <button class="user-wrap-right" @tap="inviteHd()">
 					<img :src="`${constant.imgUrl}/retail/interest/invite-store.png`" mode="widthFix" />
-				</button>
+				</button> -->
 				<button class="user-wrap-right" @tap="inviteGhs()">
 					<img :src="`${constant.imgUrl}/ghs/me/yqghs.png`" mode="widthFix" />
 				</button>
 			</view>
 			<view class="info-list">
 				<view class="info-item">
-					<view class="item-value">{{ invitedNum || 0 }}</view>
-					<view class="item-name">已邀请</view>
+					<view class="item-value">0</view>
+					<view class="item-name">待审核</view>
 				</view>
 				<view class="info-item">
-					<view class="item-value">{{ payNum || 0 }}</view>
-					<view class="item-name">已购买</view>
+					<view class="item-value">0</view>
+					<view class="item-name">已通过</view>
 				</view>
 				<view class="info-item">
-					<view class="item-value">{{ income || 0.00 }}</view>
+					<view class="item-value">0.00</view>
 					<view class="item-name">累计收益</view>
 				</view>
 			</view>
@@ -88,12 +88,8 @@ export default {
 					key: "1"
 				},
 				{
-					name: "试用中",
+					name: "已通过",
 					key: "2"
-				},
-				{
-					name: "已购买",
-					key: "4"
 				}
 			],
 			invitedNum: "", //已邀请
@@ -122,8 +118,6 @@ export default {
 	},
 	methods: {
 		inviteGhs(){
-			this.$msg('开发中')
-			return false
 			this.pageTo({url: '/pagesInvite/inviteGhsShop'})
 		},
 		inviteHd(){

+ 9 - 3
hdApp/src/pagesPurchase/xj.vue

@@ -8,14 +8,14 @@
 				<view class="item_list_bx"  style="width: 100%;">
 					<view v-for="(xjItem,xjIndex) in xjList" :key="xjIndex">
 						<view>
-							<view class="item-cmd_bx">
-								<view class="img_bx" style="background:#eeeeee">
+							<view class="item-cmd_bx" @click="previewImg(xjItem.bigCover)">
+								<view class="img_bx" style="background:#eeeeee;display:inline-block;">
 									<image :src="xjItem.cover"></image>
 								</view>
 								<view class="cmd-info_bx">
 									<view class="tit">{{ xjItem.name || "" }}</view>
 									<view class="kc"></view>
-									<view class="num-open_bx">
+									<view class="num-open_bx" @click.stop>
 										<view class="open-bx warn">
 											数量:<input class="change-input" placeholder-style="color:#CCCCCC" v-model="numList[xjItem.id]" type="digit" placeholder="请填写" />
 										</view>
@@ -70,6 +70,12 @@ export default {
 	onShow(){
 	},
 	methods: {
+		previewImg(url){
+			console.log('abc')
+			uni.previewImage({
+				urls: [url]
+			})
+		},
 		clearXj(){
 			uni.removeStorageSync("ghsXj"+this.option.ghsId)
 			if(!this.$util.isEmpty(this.numList)){