zouyanyan 3 weeks ago
parent 220be09de1
commit c874217268

@ -3,7 +3,7 @@
"appid" : "__UNI__B6E0086", "appid" : "__UNI__B6E0086",
"description" : "瑜伽汇", "description" : "瑜伽汇",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : 100, "versionCode" : 101,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"flexible" : true, "flexible" : true,
@ -34,7 +34,6 @@
"VideoPlayer" : {}, "VideoPlayer" : {},
"Camera" : {}, "Camera" : {},
"Barcode" : {}, "Barcode" : {},
"Payment" : {},
"Record" : {}, "Record" : {},
"Geolocation" : {}, "Geolocation" : {},
"Maps" : {} "Maps" : {}
@ -69,14 +68,15 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
"minSdkVersion" : 21 "minSdkVersion" : 21,
"targetSdkVersion" : 30
}, },
"ios" : { "ios" : {
"privacyDescription" : { "privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "需要访问相册上传咨询照片。", "NSPhotoLibraryUsageDescription" : "需要访问相册上传咨询照片。",
"NSPhotoLibraryAddUsageDescription" : "请允许本应用保存咨询图片到相册。", "NSPhotoLibraryAddUsageDescription" : "请允许本应用保存咨询图片到相册。",
"NSCameraUsageDescription" : "拍摄照片或者视频上传对话资料。", "NSCameraUsageDescription" : "拍摄照片或者视频上传对话资料。",
"NSMicrophoneUsageDescription" : "此应用需要访问您的麦克风。", "NSMicrophoneUsageDescription" : "需要访问您的麦克风以录制对话语音。",
"NSLocationWhenInUseUsageDescription" : "请允许获取位置以便记录你当前的位置获取你的发货地址。", "NSLocationWhenInUseUsageDescription" : "请允许获取位置以便记录你当前的位置获取你的发货地址。",
"NSLocationAlwaysUsageDescription" : "请允许获取位置以便记录你当前的位置。", "NSLocationAlwaysUsageDescription" : "请允许获取位置以便记录你当前的位置。",
"NSLocationAlwaysAndWhenInUseUsageDescription" : "请允许获取位置以便记录你当前的位置。" "NSLocationAlwaysAndWhenInUseUsageDescription" : "请允许获取位置以便记录你当前的位置。"
@ -317,23 +317,24 @@
} }
} }
} }
},
"youyacao-Jcore" : {
"__plugin_info__" : {
"name" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
"description" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
"platforms" : "Android",
"url" : "https://ext.dcloud.net.cn/plugin?id=4752",
"android_package_name" : "com.sdlyoga.app",
"ios_bundle_id" : "com.yjhyoga.app",
"isCloud" : true,
"bought" : 1,
"pid" : "4752",
"parameters" : {}
}
} }
} }
}, },
// ,
// "youyacao-Jcore" : {
// "__plugin_info__" : {
// "name" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
// "description" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
// "platforms" : "Android",
// "url" : "https://ext.dcloud.net.cn/plugin?id=4752",
// "android_package_name" : "com.sdlyoga.app",
// "ios_bundle_id" : "com.yjhyoga.app",
// "isCloud" : true,
// "bought" : 1,
// "pid" : "4752",
// "parameters" : {}
// }
// }
"quickapp" : {}, "quickapp" : {},
"mp-weixin" : { "mp-weixin" : {
"appid" : "", "appid" : "",

@ -533,24 +533,18 @@
"iconPath": "static/image/icon/good.png", "iconPath": "static/image/icon/good.png",
"selectedIconPath": "/static/image/icon/good-active.png" "selectedIconPath": "/static/image/icon/good-active.png"
}, },
// {
// "pagePath": "pages/message/group",
// "text": "消息1",
// "iconPath": "/static/image/icon/message.png",
// "selectedIconPath": "/static/image/icon/message-active.png"
// },
{ {
"pagePath": "pages/chatbox/chat", "pagePath": "pages/chatbox/chat",
"text": "消息", "text": "消息",
"iconPath": "/static/image/icon/message.png", "iconPath": "/static/image/icon/message.png",
"selectedIconPath": "/static/image/icon/message-active.png" "selectedIconPath": "/static/image/icon/message-active.png"
}, },
{ // {
"pagePath": "pages/cart/cart", // "pagePath": "pages/cart/cart",
"text": "购物车", // "text": "购物车",
"iconPath": "/static/image/icon/cart.png", // "iconPath": "/static/image/icon/cart.png",
"selectedIconPath": "/static/image/icon/cart-active.png" // "selectedIconPath": "/static/image/icon/cart-active.png"
}, // },
{ {
"pagePath": "pages/user/user", "pagePath": "pages/user/user",
"text": "我的", "text": "我的",

@ -317,20 +317,20 @@
this.userid = user.userid? user.userid:''; this.userid = user.userid? user.userid:'';
this.phone = user.userphone; this.phone = user.userphone;
var cartnum=getcartNum(); // var cartnum=getcartNum();
if(cartnum>0){ // if(cartnum>0){
// 底部菜单消息角标 // // 底部菜单消息角标
uni.setTabBarBadge({ // uni.setTabBarBadge({
//显示未读消息条数 // //显示未读消息条数
index: 4, // index: 4,
text: cartnum+'' // text: cartnum+''
}); // });
} // }
else{ // else{
uni.removeTabBarBadge({ // uni.removeTabBarBadge({
index: 4 // index: 4
}) // })
} // }
var messageNum=getmessageNum(); var messageNum=getmessageNum();
console.log("messageNum",messageNum) console.log("messageNum",messageNum)

@ -269,23 +269,22 @@
return false; return false;
} }
var cartnum=getcartNum(); // var cartnum=getcartNum();
if(cartnum>0){ // if(cartnum>0){
// 底部菜单消息角标 // // 底部菜单消息角标
uni.setTabBarBadge({ // uni.setTabBarBadge({
//显示未读消息条数 // //显示未读消息条数
index: 4, // index: 4,
text: cartnum+'' // text: cartnum+''
}); // });
} // }
else{ // else{
uni.removeTabBarBadge({ // uni.removeTabBarBadge({
index: 4 // index: 4
}) // })
} // }
var messageNum=getmessageNum(); var messageNum=getmessageNum();
console.log("messageNum",messageNum)
if(messageNum>0){ if(messageNum>0){
// 底部菜单消息角标 // 底部菜单消息角标
uni.setTabBarBadge({ uni.setTabBarBadge({

@ -122,7 +122,7 @@
form: { form: {
phonenumber:"", phonenumber:"",
password:"", password:"",
smsCode: "", // 短信验证码 smsCode: "", // 短信验证码
code:"", code:"",
uuid:"", uuid:"",
registerId:"", // 设备id registerId:"", // 设备id

@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import { getcartNum,getmessageNum,myCache } from '../../utils/utils.js'; import { getmessageNum,myCache } from '../../utils/utils.js';
import dateTime from '@/common/dateTime.js'; import dateTime from '@/common/dateTime.js';
export default { export default {
data() { data() {

@ -129,7 +129,7 @@
</view> </view>
<!-- 底部菜单 --> <!-- 底部菜单 -->
<view class="submitcon"> <!-- <view class="submitcon">
<view class="skipbtn"> <view class="skipbtn">
<view class="sitem" @tap="gotoHome"> <view class="sitem" @tap="gotoHome">
<uni-icons type="shop" size="24" color="#919191"></uni-icons> <uni-icons type="shop" size="24" color="#919191"></uni-icons>
@ -147,13 +147,13 @@
</view> </view>
<button type="primary" class="bbtn" @tap="gobuy($event,1)" data-img="/static/image/cart.png">加入购物车</button> <button type="primary" class="bbtn" @tap="gobuy($event,1)" data-img="/static/image/cart.png">加入购物车</button>
<button type="primary" class="bbtn1" @tap="gobuy($event,2)">立即购买</button> <button type="primary" class="bbtn1" @tap="gobuy($event,2)">立即购买</button>
</view> </view> -->
<!-- 是否登录 --> <!-- 是否登录 -->
<openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin> <openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin>
<!-- service 客服--> <!-- service 客服-->
<!-- <service ref="serviceId" @goservice="goservice"></service> --> <service ref="serviceId" @goservice="gotoSevice"></service>
<!-- top 返回顶部--> <!-- top 返回顶部-->
<top ref="topId"></top> <top ref="topId"></top>
@ -1366,8 +1366,13 @@
color: #1f1f1f; color: #1f1f1f;
} }
} }
// .s-list1{
// margin: 6rpx 0 150rpx 0;
// background: #FFF;
// background-image: radial-gradient(#f5f5f5, #ffffff, #f0f0f0);
// }
.s-list1{ .s-list1{
margin: 6rpx 0 150rpx 0; margin: 6rpx 0 0 0;
background: #FFF; background: #FFF;
background-image: radial-gradient(#f5f5f5, #ffffff, #f0f0f0); background-image: radial-gradient(#f5f5f5, #ffffff, #f0f0f0);
} }

@ -12,10 +12,10 @@
<uni-search-bar @confirm="search" @input="input" :focus="false" @focus="focus" v-model="searchValue" <uni-search-bar @confirm="search" @input="input" :focus="false" @focus="focus" v-model="searchValue"
placeholder="请输入商品关键字" bg-color="#FFFFFF" @cancel="cancel" @clear="clear" style="flex:1"> placeholder="请输入商品关键字" bg-color="#FFFFFF" @cancel="cancel" @clear="clear" style="flex:1">
</uni-search-bar> </uni-search-bar>
<view class="cartcon" @tap="gotoCart"> <!-- <view class="cartcon" @tap="gotoCart">
<uni-icons type="cart" size="25" color="#919191"></uni-icons> <uni-icons type="cart" size="25" color="#919191"></uni-icons>
<view class="cnum" v-if="cartnum>0">{{cartnum}}</view> <view class="cnum" v-if="cartnum>0">{{cartnum}}</view>
</view> </view> -->
</view> </view>
</view> </view>
@ -44,7 +44,7 @@
<text class="tint">{{item.price}}</text> <text class="tint">{{item.price}}</text>
<text class="txtt"> /{{item.unit?item.unit:'个'}}</text> <text class="txtt"> /{{item.unit?item.unit:'个'}}</text>
</view> </view>
<image class="cart" src="/static/image/cart.png" data-img="/static/image/cart.png" @tap="addCar($event,item)"></image> <!-- <image class="cart" src="/static/image/cart.png" data-img="/static/image/cart.png" @tap="addCar($event,item)"></image> -->
</view> </view>
</view> </view>
</view> </view>

@ -62,10 +62,10 @@
</view> </view>
</view> </view>
<view class="secon"> <!-- <view class="secon">
<view class="seyg">已选:{{product.sels}} {{product.quantity}} {{product.unit}}</view> <view class="seyg">已选:{{product.sels}} {{product.quantity}} {{product.unit}}</view>
<uni-icons type="forward" color="#b3b3b3" size="20"></uni-icons> <uni-icons type="forward" color="#b3b3b3" size="20"></uni-icons>
</view> </view> -->
<!-- <view class="pjcon">--> <!-- <view class="pjcon">-->
<!-- <view class="pjitem">--> <!-- <view class="pjitem">-->
@ -141,7 +141,7 @@
</view> </view>
<!-- 底部菜单 --> <!-- 底部菜单 -->
<view class="submitcon"> <!-- <view class="submitcon">
<view class="skipbtn"> <view class="skipbtn">
<view class="sitem" @tap="gotoHome"> <view class="sitem" @tap="gotoHome">
<uni-icons type="shop" size="24" color="#919191"></uni-icons> <uni-icons type="shop" size="24" color="#919191"></uni-icons>
@ -159,13 +159,13 @@
</view> </view>
<button type="primary" class="bbtn" @tap="gobuy($event,1)" data-img="/static/image/cart.png">加入购物车</button> <button type="primary" class="bbtn" @tap="gobuy($event,1)" data-img="/static/image/cart.png">加入购物车</button>
<button type="primary" class="bbtn1" @tap="gobuy($event,2)">立即购买</button> <button type="primary" class="bbtn1" @tap="gobuy($event,2)">立即购买</button>
</view> </view> -->
<!-- 是否登录 --> <!-- 是否登录 -->
<openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin> <openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin>
<!-- service 客服--> <!-- service 客服-->
<!-- <service ref="serviceId" @goservice="goservice"></service> --> <service ref="serviceId" @goservice="gotoSevice"></service>
<!-- top 返回顶部--> <!-- top 返回顶部-->
<top ref="topId"></top> <top ref="topId"></top>
@ -1238,8 +1238,13 @@ import { mapState, mapGetters, mapActions } from 'vuex';
color: #1f1f1f; color: #1f1f1f;
} }
} }
// .s-list1{
// margin: 6rpx 0 150rpx 0;
// background: #FFF;
// background-image: radial-gradient(#f5f5f5, #ffffff, #f0f0f0);
// }
.s-list1{ .s-list1{
margin: 6rpx 0 150rpx 0; margin: 6rpx 0 0 0;
background: #FFF; background: #FFF;
background-image: radial-gradient(#f5f5f5, #ffffff, #f0f0f0); background-image: radial-gradient(#f5f5f5, #ffffff, #f0f0f0);
} }

@ -67,7 +67,7 @@
<text class="tint">{{item.price}}</text> <text class="tint">{{item.price}}</text>
<text class="txtt"> /{{item.unit}}</text> <text class="txtt"> /{{item.unit}}</text>
</view> </view>
<image class="cart" src="/static/image/cart.png" data-img="/static/image/cart.png" @tap="addCar($event,item)"></image> <!-- <image class="cart" src="/static/image/cart.png" data-img="/static/image/cart.png" @tap="addCar($event,item)"></image> -->
</view> </view>
</view> </view>
</view> </view>
@ -209,20 +209,20 @@
this.getggList(); this.getggList();
// 购物车 // 购物车
var cartnum=getcartNum(); // var cartnum=getcartNum();
if(cartnum>0){ // if(cartnum>0){
// 底部菜单消息角标 // // 底部菜单消息角标
uni.setTabBarBadge({ // uni.setTabBarBadge({
//显示未读消息条数 // //显示未读消息条数
index: 4, // index: 4,
text: cartnum+'' // text: cartnum+''
}); // });
} // }
else{ // else{
uni.removeTabBarBadge({ // uni.removeTabBarBadge({
index: 4 // index: 4
}) // })
} // }
}, },
onPullDownRefresh() { onPullDownRefresh() {

@ -3,10 +3,10 @@
<view class="swiper-bg"> <view class="swiper-bg">
<uni-search-bar style="display: flex; flex:1" @confirm="search" :focus="false" v-model="searchValue" placeholder="请输入商品关键字" bg-color="#FFFFFF" @cancel="cancel" @clear="clear"> <uni-search-bar style="display: flex; flex:1" @confirm="search" :focus="false" v-model="searchValue" placeholder="请输入商品关键字" bg-color="#FFFFFF" @cancel="cancel" @clear="clear">
</uni-search-bar> </uni-search-bar>
<view class="cartcon" @tap="gotoCart"> <!-- <view class="cartcon" @tap="gotoCart">
<uni-icons type="cart" size="25" color="#919191"></uni-icons> <uni-icons type="cart" size="25" color="#919191"></uni-icons>
<view class="cnum" v-if="cartnum>0">{{cartnum}}</view> <view class="cnum" v-if="cartnum>0">{{cartnum}}</view>
</view> </view> -->
</view> </view>
<!-- 商品列表 --> <!-- 商品列表 -->
<view class="f-list"> <view class="f-list">
@ -25,7 +25,7 @@
<text class="tint">{{item.price}}</text> <text class="tint">{{item.price}}</text>
<text class="txtt"> /{{item.unit}}</text> <text class="txtt"> /{{item.unit}}</text>
</view> </view>
<image class="cart" src="/static/image/cart.png" data-img="/static/image/cart.png" @tap="addCar($event,item)"></image> <!-- <image class="cart" src="/static/image/cart.png" data-img="/static/image/cart.png" @tap="addCar($event,item)"></image> -->
</view> </view>
</view> </view>
</view> </view>

@ -204,7 +204,7 @@
if (ress.confirm) { if (ress.confirm) {
} }
// 跳转 登录 // 跳转 登录
uni.switchTab({ uni.navigateTo({
url: '/pages/login/login' url: '/pages/login/login'
}); });
} }
@ -241,7 +241,7 @@
myCache('alipayuserInfo',''); myCache('alipayuserInfo','');
myCache("signtype",'11'); myCache("signtype",'11');
// 跳转 我的 // 跳转 我的
uni.switchTab({ uni.navigateTo({
url: '/pages/login/login' url: '/pages/login/login'
}); });
} }

@ -14,7 +14,7 @@
</view> </view>
<!-- 菜单1 --> <!-- 菜单1 -->
<view class="s-list"> <!-- <view class="s-list">
<view class="s-header"> <view class="s-header">
<view class="tit-box"> <view class="tit-box">
<text class="tit">我的订单</text> <text class="tit">我的订单</text>
@ -33,13 +33,13 @@
<view class="title">{{item.name}}</view> <view class="title">{{item.name}}</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view> -->
<!-- 菜单2 --> <!-- 菜单2 -->
<view class="s-list"> <view class="s-list">
<view class="s-header"> <view class="s-header">
<view class="tit-box"> <view class="tit-box">
<text class="tit">其它服务</text> <text class="tit">我的服务</text>
<view class="tit2"> <view class="tit2">
</view> </view>
</view> </view>
@ -321,43 +321,54 @@
}; };
}, },
onLoad() { onLoad() {
this.getmember(); // this.getmember();
}, },
onShow() { onShow() {
//判断登录,跳转去登录 //判断登录,跳转去登录
logindo(); logindo();
if(myCache("ifuserEdit"))
{ this.openId = myCache('openId');
myCache("ifuserEdit",false) var user = myCache('userInfo');
this.getmember(); this.userid = user.userId? user.userId:'';
} this.avatar = user.avatar?user.avatar:'../../static/image/logo.png';
else{ this.nickName= user.nickName? user.nickName:'';
this.openId = myCache('openId'); this.phone = user.phonenumber;
var user = myCache('userInfo'); this.signature = user.signature?user.signature:this.signature;
this.userid = user.userId? user.userId:''; this.roleId=user.roleId?user.roleId:[];
this.avatar = user.avatar?user.avatar:'../../static/image/logo.png'; this.getmember();
this.nickName= user.nickName? user.nickName:'';
this.phone = user.phonenumber; // if(myCache("ifuserEdit"))
// this.signature = user.signature?user.signature:this.signature; // {
this.roleId=user.roleId?user.roleId:[]; // myCache("ifuserEdit",false)
} // this.getmember();
// }
// else{
// this.openId = myCache('openId');
// var user = myCache('userInfo');
// this.userid = user.userId? user.userId:'';
// this.avatar = user.avatar?user.avatar:'../../static/image/logo.png';
// this.nickName= user.nickName? user.nickName:'';
// this.phone = user.phonenumber;
// this.signature = user.signature?user.signature:this.signature;
// this.roleId=user.roleId?user.roleId:[];
// }
// 购物车数量 // // 购物车数量
var cartnum=getcartNum(); // var cartnum=getcartNum();
if(cartnum>0){ // if(cartnum>0){
// 底部菜单消息角标 // // 底部菜单消息角标
uni.setTabBarBadge({ // uni.setTabBarBadge({
//显示未读消息条数 // //显示未读消息条数
index: 4, // index: 4,
text: cartnum+'' // text: cartnum+''
}); // });
} // }
else{ // else{
uni.removeTabBarBadge({ // uni.removeTabBarBadge({
index: 4 // index: 4
}) // })
} // }
var messageNum=getmessageNum(); var messageNum=getmessageNum();
console.log("messageNum",messageNum) console.log("messageNum",messageNum)
@ -593,21 +604,21 @@
this.menus[3].num=0; this.menus[3].num=0;
this.favoritesnum=0;// 我的收藏 this.favoritesnum=0;// 我的收藏
// 清空购物车 // // 清空购物车
var cartnum=getcartNum(); // var cartnum=getcartNum();
if(cartnum>0){ // if(cartnum>0){
// 底部菜单消息角标 // // 底部菜单消息角标
uni.setTabBarBadge({ // uni.setTabBarBadge({
//显示未读消息条数 // //显示未读消息条数
index: 4, // index: 4,
text: cartnum+'' // text: cartnum+''
}); // });
} // }
else{ // else{
uni.removeTabBarBadge({ // uni.removeTabBarBadge({
index: 4 // index: 4
}) // })
} // }
// app清除角标的数量 // app清除角标的数量
clearBadgeNumber(); clearBadgeNumber();
@ -686,21 +697,21 @@
this.menus[3].num=0; this.menus[3].num=0;
this.favoritesnum=0;// 我的收藏 this.favoritesnum=0;// 我的收藏
// 清空购物车 // // 清空购物车
var cartnum=getcartNum(); // var cartnum=getcartNum();
if(cartnum>0){ // if(cartnum>0){
// 底部菜单消息角标 // // 底部菜单消息角标
uni.setTabBarBadge({ // uni.setTabBarBadge({
//显示未读消息条数 // //显示未读消息条数
index: 4, // index: 4,
text: cartnum+'' // text: cartnum+''
}); // });
} // }
else{ // else{
uni.removeTabBarBadge({ // uni.removeTabBarBadge({
index: 4 // index: 4
}) // })
} // }
// app清除角标的数量 // app清除角标的数量
clearBadgeNumber(); clearBadgeNumber();

@ -205,6 +205,11 @@
url: this.valiFormData.avatar url: this.valiFormData.avatar
}) })
} }
else{
// if(this.avatars.length<=0){
// this.avatars.push("../../static/image/logo.png")
// }
}
this.$forceUpdate(); this.$forceUpdate();
} }
}, },
@ -391,7 +396,7 @@
.example { .example {
width: 750rpx; width: 750rpx;
height: 800rpx; height: 500rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
opacity: 1; opacity: 1;

Loading…
Cancel
Save