2023-10-17

api/api.js

@@ -480,7 +480,9 @@ export function getCategoryVersion() {
  * 商品分类类版本
  */
 export function getAppVersion() {
-	return request.get('version');
+	return request.get('version',{},{
+		noAuth: true
+	});
 }
 
 

manifest.json

@@ -2,8 +2,8 @@
     "name" : "壹柒科技",
     "appid" : "__UNI__B0B5BE7",
     "description" : "壹柒科技",
-    "versionName" : "2.6.9",
-    "versionCode" : 269,
+    "versionName" : "2.7.0",
+    "versionCode" : 270,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/index/index.vue

@@ -3,22 +3,6 @@
 	<view v-if="pageShow" class="page"
 		:class="bgTabVal==2?'fullsize noRepeat':bgTabVal==1?'repeat ysize':'noRepeat ysize'"
 		:style="'background-color:'+bgColor+';background-image: url('+bgPic+');min-height:'+windowHeight+'px;'">
-		<!-- #ifdef H5 -->
-		<view class="titleBox titleflex" v-if="showDom">
-			<view class="title">
-				是否下载app
-			</view>
-			<view class="titleflex right">
-				<view class="buttom domApp" @click="domApp">
-					下载App
-				</view>
-				<view class="buttom out" @click="showDom=false">
-					关闭
-				</view>
-			</view>
-
-		</view>
-		<!-- #endif -->
 		<view v-if="!errorNetwork" :style="colorStyle">
 			<skeletons v-if="showSkeleton"></skeletons>
 			<view class="index">
@@ -270,7 +254,6 @@
 		getDiy,
 		getIndexData,
 		getDiyVersion,
-		getAppVersion
 	} from '@/api/api.js';
 	import {
 		getCategoryList,
@@ -333,9 +316,6 @@
 		},
 		data() {
 			return {
-				// #ifdef H5
-				showDom: true,
-				// #endif
 				showSkeleton: true, //骨架屏显示隐藏
 				styleConfig: [],
 				loading: false,
@@ -483,22 +463,7 @@
 		onReady() {},
 		methods: {
 			...mapMutations(['SET_AUTOPLAY']),
-			// #ifdef H5
-			domApp() {
-				const bool = navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger';
-				if (bool) {
-					uni.showModal({
-						title: '提示',
-						content: '无法在微信中下载，请用浏览器打开下载',
-						showCancel: false,
-					});
-				} else {
-					getAppVersion().then((res) => {
-						window.open(res.data.apk)
-					})
-				}
-			},
-			// #endif
+			
 			// 授权关闭
 			authColse: function(e) {
 				this.isShowAuth = e
@@ -1271,34 +1236,4 @@
 			width: 100%;
 		}
 	}
-
-	.titleBox {
-		padding: 10rpx 30rpx;
-		background-color: #FFF;
-
-		.right {
-			.buttom {
-				padding: 10rpx 20rpx;
-				border: 1px solid #e3e3e3;
-				width: 150rpx;
-				flex-shrink: 0;
-				text-align: center;
-				margin-left: 10rpx;
-				font-size: 22rpx;
-				line-height: 1;
-
-				&.domApp {
-					color: #FFF;
-					background-color: $kf-theme;
-				}
-			}
-		}
-	}
-
-	.titleflex {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		flex-shrink: 0;
-	}
 </style>

pages/users/login/index.vue

@@ -98,11 +98,29 @@
 			ref="verify"></Verify>
 		<view class="copyright" v-if="copyrightContext">{{copyrightContext}}</view>	
 		<!-- <view class="copyright" v-else>Copyright ©2014-2023 <text class="domain" @click="domainTap('https://www.crmeb.com')">www.crmeb.com</text></view> -->
+		<!-- #ifdef H5 -->
+			<view class="titleBox titleflex" v-if="showDom">
+				<view class="title">
+					是否下载app
+				</view>
+				<view class="titleflex right">
+					<view class="buttom domApp" @click="domApp">
+						下载App
+					</view>
+					<view class="buttom out" @click="showDom=false">
+						关闭
+					</view>
+				</view>
+			</view>
+		<!-- #endif -->
 	</view>
 </template>
 <script>
 	import dayjs from "@/plugin/dayjs/dayjs.min.js";
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
+	import {
+		getAppVersion
+	} from '@/api/api.js';
 	import {
 		loginH5,
 		loginMobile,
@@ -143,6 +161,9 @@
 		mixins: [sendVerifyCode, colors],
 		data: function() {
 			return {
+				// #ifdef H5
+				showDom: true,
+				// #endif
 				inAnimation: false,
 				protocol: false,
 				navList: [ "账号登录","注册登录"],
@@ -176,7 +197,7 @@
 				}
 			}
 		},
-		onLoad() {
+		onLoad(res) {
 			let self = this
 			uni.getSystemInfo({
 				success: (res) => {
@@ -185,13 +206,38 @@
 					}
 				}
 			});
+			if(res.spid){
+				this.spread_spid =res.spid;
+			}
 		},
 		mounted: function() {
 			// this.getCode();
 			this.getLogoImage();
 			this.spread_spid = this.$Cache.get("spid");
+			if(!this.spid){
+				this.spread_spid = this.$Cache.get("spid");
+			}
 		},
 		methods: {
+			// #ifdef H5
+			domApp() {
+				const bool = navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger';
+				if (bool) {
+					uni.showModal({
+						title: '提示',
+						content: '无法在微信中下载，请用浏览器打开下载',
+						showCancel: false,
+					});
+				} else {
+					getAppVersion().then((res) => {
+						console.log(res,'res');
+						window.open(res.data.apk)
+					}).catch((err)=>{
+						console.log(err,'err');
+					})
+				}
+			},
+			// #endif
 			domainTap(url){
 				// #ifdef H5
 				location.href = url
@@ -1036,4 +1082,35 @@
 			}
 		}
 	}
+	.titleBox {
+		padding: 10rpx 30rpx;
+		background-color: #FFF;
+		position:fixed;
+		top:0;
+		left:0;
+		right:0;
+		.right {
+			.buttom {
+				padding: 10rpx 20rpx;
+				border: 1px solid #e3e3e3;
+				width: 150rpx;
+				flex-shrink: 0;
+				text-align: center;
+				margin-left: 10rpx;
+				font-size: 22rpx;
+				line-height: 1;
+	
+				&.domApp {
+					color: #FFF;
+					background-color: $kf-theme;
+				}
+			}
+		}
+	}
+	.titleflex {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		flex-shrink: 0;
+	}
 </style>

pages/users/user_spread_code/index.vue

@@ -138,7 +138,20 @@
 		},
 		async onReady() {
 			if (this.isLogin) {
+				// #ifdef APP-PLUS
+				this.val = `${HTTP_REQUEST_URL}/pages/users/login/index?spid=${this.uid}`
+				// #endif
+				// #ifndef APP
 				this.val = `${HTTP_REQUEST_URL}?spid=${this.uid}`
+				// #endif
+				// #ifdef H5
+				const bool = navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger';
+				if(bool){
+					this.val = `${HTTP_REQUEST_URL}?spid=${this.uid}`
+				}else{
+					this.val = `${HTTP_REQUEST_URL}/pages/users/login/index?spid=${this.uid}`
+				}
+				// #endif
 				// #ifdef MP
 				await this.spreadMsg()
 				// #endif

unpackage/cache/apk/apkurl

@@ -1 +0,0 @@
-https://ide.dcloud.net.cn/build/download/e94a0690-6286-11ee-bc91-572641a3674b

unpackage/cache/certdata

@@ -1,3 +0,0 @@
-andrCertfile=F:/item/newItem/17科技/uniapp/unpackage/证书/yqke.17kj.keystore
-andrCertAlias=yqkj.17kj.cn
-andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==

unpackage/cache/wgt/__UNI__B0B5BE7/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

unpackage/cache/wgt/__UNI__B0B5BE7/androidPrivacy.json

@@ -1,28 +0,0 @@
-{
-    "version" : "1",
-    "prompt" : "template",
-    "title" : "用户协议与隐私政策",
-    "message" : "\t请务必审慎阅读、充分理解“用户协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>
- 你可以阅读 <a href=\"pages/columnGoods/static/yhxy.html\">《用户协议》</a>与 <a href=\"pages/columnGoods/static/yszc.html\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
-    "buttonAccept" : "同意并接受",
-    "buttonRefuse" : "暂不同意",
-    "second" : {
-        "title" : "确认提示",
-        "message" : "进入应用前，你需先同意<a href=\"pages/columnGoods/static/yhxy.html\">《用户协议》</a>与<a href=\"pages/columnGoods/static/yszc.html\">《隐私政策》</a>，否则将退出应用。",
-        "buttonAccept" : "同意并继续",
-        "buttonRefuse" : "退出应用"
-    },
-    "styles" : {
-        "backgroundColor" : "#fff",
-        "borderRadius" : "5px",
-        "title" : {
-            "color" : "#000"
-        },
-        "buttonAccept" : {
-            "color" : "#fff"
-        },
-        "buttonRefuse" : {
-            "color" : "#ccc"
-        }
-    }
-}

unpackage/cache/wgt/__UNI__B0B5BE7/app-config.js

@@ -1 +0,0 @@
-(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

unpackage/cache/wgt/__UNI__B0B5BE7/pages/extension/static/click.css

@@ -1,119 +0,0 @@
-/**
- * 按钮的点击动画效果,2018年1月12日09:36:48
- **/
-.click {
-	-webkit-transition: -webkit-box-shadow .8s;
-	transition: box-shadow .8s;
-}
-
-.click {
-	-webkit-transition-timing-function: cubic-bezier(0.6, 4, 0.3, 0.8);
-	transition-timing-function: cubic-bezier(0.6, 4, 0.3, 0.8);
-	-webkit-animation: gelatine 0.5s;
-	animation: gelatine 1s;
-	animation-iteration-count: infinite;
-	/* -webkit-box-shadow: 0 0 0 2px #cff09e, 0 0 0 4px #ff0364;
-  box-shadow: 0 0 0 2px #cff09e, 0 0 0 4px #ff0364;
-  -webkit-transition-timing-function: cubic-bezier(0.6, 4, 0.3, 0.8);
-  transition-timing-function: cubic-bezier(0.6, 4, 0.3, 0.8);
-  -webkit-animation: gelatine 0.5s 1;
-  animation: gelatine 0.5s 1; */
-}
-
-.click {
-	-webkit-transition-duration: 0;
-	transition-duration: 0;
-}
-
-/**
- * $keyframes \ gelatine 
- **/
-@keyframes gelatine {
-
-	from,
-	to {
-		-webkit-transform: scale(1);
-		transform: scale(1);
-	}
-
-	25% {
-		-webkit-transform: scale(0.5);
-		transform: scale(0.8);
-	}
-
-	50% {
-		-webkit-transform: scale(1.5);
-		transform: scale(1.2);
-	}
-
-	75% {
-		-webkit-transform: scale(0.95);
-		transform: scale(0.95);
-	}
-
-	from,
-	to {
-		-webkit-transform: scale(1);
-		transform: scale(1);
-	}
-
-	25% {
-		-webkit-transform: scale(0.8);
-		transform: scale(0.8);
-	}
-
-	50% {
-		-webkit-transform: scale(1);
-		transform: scale(1);
-	}
-
-	75% {
-		-webkit-transform: scale(0.8);
-		transform: scale(0.8);
-	}
-}
-
-@-webkit-keyframes gelatine {
-
-	from,
-	to {
-		-webkit-transform: scale(1);
-		transform: scale(1);
-	}
-
-	25% {
-		-webkit-transform: scale(0.5);
-		transform: scale(0.8);
-	}
-
-	50% {
-		-webkit-transform: scale(1.5);
-		transform: scale(1.2);
-	}
-
-	75% {
-		-webkit-transform: scale(0.95);
-		transform: scale(0.95);
-	}
-
-	from,
-	to {
-		-webkit-transform: scale(1);
-		transform: scale(1);
-	}
-
-	25% {
-		-webkit-transform: scale(0.8);
-		transform: scale(0.8);
-	}
-
-	50% {
-		-webkit-transform: scale(1);
-		transform: scale(1);
-	}
-
-	75% {
-		-webkit-transform: scale(0.8);
-		transform: scale(0.8);
-	}
-}

unpackage/cache/wgt/__UNI__B0B5BE7/pages/short_video/appSwiper/index.js.LICENSE.txt

@@ -1,7 +0,0 @@
-/*!
- * vuex v3.6.2
- * (c) 2021 Evan You
- * @license MIT
- */
-
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */