From 02c54ad68456ae85f83375dda258d1784e5c150a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 2 Feb 2024 13:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/admin.js                      |   9 +++
 manifest.json                     |   4 +-
 pages/moreProject/moreProject.vue | 126 ++++++++++++++++++++++++++++++
 pages/product/list/index.vue      |  31 +++++++-
 static/images/index22.png         | Bin 0 -> 2912 bytes
 5 files changed, 165 insertions(+), 5 deletions(-)
 create mode 100644 static/images/index22.png

diff --git a/api/admin.js b/api/admin.js
index 6c6db6b..b76e28a 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -216,6 +216,15 @@ export function getRefundOrderList(where, merId) {
 		login: true
 	});
 }
+/**
+ * 店铺拉新二维码
+ * @returns {*}
+ */
+export function getMerNewQRcode(where, merId) {
+	return request.get(`server/${merId}/qrcode`, where, {
+		login: true
+	});
+}
 /**
  * 营业额统计
  * @returns {*}
diff --git a/manifest.json b/manifest.json
index 66db3ac..0331631 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.1.4",
-    "versionCode" : 114,
+    "versionName" : "1.1.5",
+    "versionCode" : 115,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 88b8d84..d156097 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -243,6 +243,12 @@
                   </image>
                   <text class="text">补货订单</text>
                 </view>
+                
+                <view v-if="no_prod" class="examine" @click="showQRcode">
+                  <image class="icon_img" src="@/static/images/index22.png" mode="aspectFit">
+                  </image>
+                  <text class="text">活动邀请码</text>
+                </view>
 
                 <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png"  mode="aspectFit">
@@ -327,6 +333,12 @@
                   </image>
                   <text class="text">商户设置</text>
                 </view>
+                
+                <view v-if="no_prod" class="examine" @click="showQRcode">
+                  <image class="icon_img" src="@/static/images/index22.png" mode="aspectFit">
+                  </image>
+                  <text class="text">活动邀请码</text>
+                </view>
 
 
                 <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
@@ -397,6 +409,13 @@
                   </image>
                   <text class="text">押金缴纳</text>
                 </view>
+                
+                
+                <view v-if="no_prod" class="examine" @click="showQRcode">
+                  <image class="icon_img" src="@/static/images/index22.png" mode="aspectFit">
+                  </image>
+                  <text class="text">活动邀请码</text>
+                </view>
 
               </view>
             </view>
@@ -553,6 +572,20 @@
         </form>
       </view>
     </uni-popup>
+    <uni-popup ref="QRcodeRef">
+      <view class="new_qr_code">
+        <view style="height: 30rpx;"></view>
+        <image class="n_qr_head" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/34b13202402021017176584.png"></image>
+        <view class="n_qr_body">
+          <image class="n_qr_bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c5898202402021024586923.png"></image>
+          <image class="n_qr_code" :src="qrcodeURL"></image>
+        </view>
+        <view class="n_qr_btn">
+          <button class="btn1" @click="closeQRcode">取消</button>
+          <button class="btn2" @click="saveImageToLocal">保存</button>
+        </view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
@@ -585,6 +618,9 @@ import {
   merchant,
   paymerchant
 } from '@/api/api.js'
+import {
+  getMerNewQRcode
+} from "@/api/admin.js"
 import { ENV } from "@/config/app.js"
 export default {
   components: {
@@ -595,6 +631,7 @@ export default {
   data () {
     return {
       no_prod: false,
+      qrcodeURL: '',
       company: '',
       organization_code: '',
       locationArr: ({}),
@@ -604,6 +641,9 @@ export default {
       userInfoData: {
         mer_info: {
           type_id: 0
+        },
+        service:{
+          mer_id: 0
         }
       },
       prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
@@ -732,6 +772,35 @@ export default {
         this.isFshow = false
       }
     },
+    // 打开活动邀请码
+    showQRcode(){
+      this.$refs.QRcodeRef.open();
+      getMerNewQRcode({}, this.userInfoData.service.mer_id).then(res=>{
+        this.qrcodeURL = res.data.url;
+      })
+    },
+    // 保存图片
+    saveImageToLocal() {
+        uni.saveImageToPhotosAlbum({
+            filePath: this.qrcodeURL,
+            success: ()=> {
+                uni.showToast({
+                    title: '图片保存成功'
+                });
+                this.closeQRcode()
+            },
+            fail: ()=> {
+                console.log(err);
+                uni.showToast({
+                    title: '保存失败',
+                    icon: 'none'
+                });
+            }
+        });
+    },
+    closeQRcode(){
+      this.$refs.QRcodeRef.close();
+    },
     logout () {
       uni.switchTab({
         url: '/pages/index/index'
@@ -1536,4 +1605,61 @@ export default {
     }
   }
 }
+.new_qr_code{
+  background-color: #fff;
+  border-radius: 24rpx;
+  position: relative;
+  
+  .n_qr_head{
+    width: 378rpx;
+    height: 96rpx;
+    position: absolute;
+    top: -32rpx;
+    left: 50%;
+    transform: translate(-50%);
+  }
+  
+  .n_qr_body{
+    height: 650rpx;
+    width: 650rpx;
+    position: relative;
+    .n_qr_bg{
+      width: 600rpx;
+      height: 600rpx;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+    }
+    .n_qr_code{
+      width: 480rpx;
+      height: 480rpx;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+    }
+  }
+  
+  .n_qr_btn{
+    display: flex;
+    padding: 0 80rpx 30rpx 80rpx;
+    justify-content: space-between;
+    .btn1{
+      background-color: #eee;
+      padding: 20rpx 60rpx;
+      border-radius: 60rpx;
+      font-size: 28rpx;
+      color: #666;
+    }
+    .btn2{
+      background-color: #f75335;
+      padding: 20rpx 60rpx;
+      border-radius: 60rpx;
+      font-size: 28rpx;
+      color: #fff;
+    }
+  }
+  
+}
 </style>
\ No newline at end of file
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index e6b68a0..b74ad9d 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -1,6 +1,9 @@
 <template>
 	<view>
 		<view class="order-index" ref="container">
+      <view class="search">
+        <u-search :showAction="true" searchIcon="scan" actionText="搜索" v-model="keyword" :animation="true" :actionStyle="{color: '#fff'}" @search="keywordSearch" @custom="keywordSearch" :clearabled="false" @clickIcon="scanQRcodes"></u-search>
+      </view>
 			<view class="header">
 				<div class="header_count">
 					<swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4"
@@ -278,7 +281,8 @@
 				current: "",
 				where: {
 					page: 1,
-					limit: 20
+					limit: 20,
+          keyword: ''
 				},
 				menuList: [], // 分类菜单
         menuCList: [], //二级分类
@@ -316,6 +320,7 @@
           id: '',
           mer_labels: ''
         }, // 已选择标签
+        keyword: ''
 			}
 		},
 		onLoad(options) {
@@ -358,6 +363,22 @@
 					console.log(res)
 				})
 			},
+      // 搜索
+      keywordSearch(){
+        this.loaded = false;
+        this.where.keyword = this.keyword;
+        this.getList(this.mer_id, true);
+      },
+      // 扫码搜索
+      scanQRcodes(){
+        uni.scanCode({
+          scanType: ['barCode'],
+          success:(res)=>{
+            this.keyword = res.result;
+            this.keywordSearch();
+          }
+        })
+      },
       // 初始化商品标签
       initLable(){
         labelLst({
@@ -668,7 +689,6 @@
 				}
 			},
 			getList: function(mer_id, ispage) {
-        console.log('调用');
 				var that = this;
 				if (that.loading || that.loaded) return;
 				that.loading = true;
@@ -932,7 +952,7 @@
 	}
 
 	.header {
-		padding-top: 40rpx;
+		padding-top: 30rpx;
 		margin: 0 20rpx;
 
 		.header_count {
@@ -1311,4 +1331,9 @@
       }
     }
   }
+  .search{
+    width: 710rpx;
+    margin: 0 auto;
+    padding-top: 30rpx;
+  }
 </style>
\ No newline at end of file
diff --git a/static/images/index22.png b/static/images/index22.png
new file mode 100644
index 0000000000000000000000000000000000000000..64f17825c6c4332aa45cea493545dcdc433b8628
GIT binary patch
literal 2912
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
KMNUMnLSTYOo_-1d

literal 0
HcmV?d00001