GithubStar/CoreShop
1
0
Fork 0
mirror of https://github.com/CoreUnion/CoreShop.git synced 2026-10-17 05:12:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

!165 【修复】修复根据id寻三级联动地址使用first导致Sequence contains no matching element 异常。I4HBYB

Browse Source 
Merge pull request !165 from 大灰灰/dahuihui/develop
This commit is contained in:
大灰灰
2021-11-17 16:53:43 +00:00
committed by Gitee
parent 22be34c1d8 1f7733fda8
commit 20ff2c15d5
5 changed files with 168 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreCms.Net.Services/Shop/CoreCmsAreaServices.cs
+1 -1
View File
@@ -322,7 +322,7 @@ namespace CoreCms.Net.Services.Basic
private void GetParentArea(List<CoreCmsArea> cacheAreas, int id, List<CoreCmsArea> outAreas)
{
//获取当前级别
var model = cacheAreas.First(p => p.id == id);
var model = cacheAreas.FirstOrDefault(p => p.id == id);
if (model != null)
{
if (outAreas.All(p => p.id != model.id)) outAreas.Add(model);
CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue
+2 -3
View File
@@ -1,7 +1,7 @@
<template>
<view class="coreshop-copyright">
<view class="u-font-xs" v-if="shopName">
© {{shopName}} 版权所有
<view class="u-font-xs">
Powered by CoreShop
</view>
<view class="beian u-font-xs" v-if="shopBeiAn">
<view v-if="shopBeian"><a href="http://beian.miit.gov.cn/" target="_blank" style="font-size:24upx">备案号：{{shopBeiAn}}</a></view>
@@ -14,7 +14,6 @@
data() {
return {
shopBeiAn: this.$store.state.config.shopBeian || '',
shopName: this.$store.state.config.shopName || ''
}
}
}
CoreCms.Net.Uni-App/CoreShop/manifest.json
+158 -158
View File
@@ -1,168 +1,168 @@
{
"name": "核心商城系统",
"appid": "__UNI__EAACF14",
"description": "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序",
"versionName": "1.0",
"versionCode": 1,
"transformPx": false,
"app-plus": {
/* 5+App特有相关 */
"modules": {
"Payment": {},
"VideoPlayer": {}
},
/* 模块配置 */
"distribute": {
/* 应用发布信息 */
"android": {
/* android打包配置 */
"permissions": [
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters": [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
"ios": {},
/* ios打包配置 */
"sdkConfigs": {
"payment": {
"weixin": {
"appid": "wxd56f71964a318e5d"
},
"alipay": {
"scheme": ""
}
"name" : "核心商城系统",
"appid" : "__UNI__EAACF14",
"description" : "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序",
"versionName" : "1.0",
"versionCode" : 1,
"transformPx" : false,
"app-plus" : {
/* 5+App特有相关 */
"modules" : {
"Payment" : {},
"VideoPlayer" : {}
},
"ad": {},
"maps": {},
"oauth": {
"univerify": {}
}
},
"icons": {
"android": {
"hdpi": "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png"
/* 模块配置 */
"distribute" : {
/* 应用发布信息 */
"android" : {
/* android打包配置 */
"permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
"ios" : {},
/* ios打包配置 */
"sdkConfigs" : {
"payment" : {
"weixin" : {
"appid" : "wxd56f71964a318e5d"
},
"alipay" : {
"scheme" : ""
}
},
"ad" : {},
"maps" : {},
"oauth" : {
"univerify" : {}
}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
}
},
"ios": {
"appstore": "unpackage/res/icons/1024x1024.png",
"ipad": {
"app": "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png"
},
"iphone": {
"app@2x": "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png"
}
"splashscreen" : {
"waiting" : true
}
}
},
"splashscreen": {
"waiting": true
}
},
/* SDK配置 */
"quickapp": {},
/* 快应用特有相关 */
"mp-weixin": {
"appid": "wxd56f71964a318e5d",
"setting": {
"urlCheck": true,
"postcss": true,
"minified": true,
"es6": true,
"checkSiteMap": false
},
"permission": {
"scope.userLocation": {
"desc": "用于获取您附近的门店列表"
}
},
"optimization": {
"subPackages": true
}
},
"h5": {
"title": "核心商城系统",
"domain": "https://h5.demo.coreshop.com.cn/",
"router": {
"base": "./",
"mode": "hash"
},
"template": "index.html",
"devServer": {
"port": 80,
"disableHostCheck": true,
"https": true
},
"sdkConfigs": {
"maps": {
"qqmap": {
"key": "XXXXX-XXXXX-XXXXX-XXXXX-XXXXX-XXXXX"
/* SDK配置 */
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
"appid" : "wx11d95cdaee6058f6",
"setting" : {
"urlCheck" : true,
"postcss" : true,
"minified" : true,
"es6" : true,
"checkSiteMap" : false
},
"permission" : {
"scope.userLocation" : {
"desc" : "用于获取您附近的门店列表"
}
},
"optimization" : {
"subPackages" : true
}
}
},
"optimization": {
"treeShaking": {
"enable": false
}
}
},
"mp-toutiao": {
"setting": {
"es6": true,
"postcss": true,
"minified": true
"h5" : {
"title" : "核心商城系统",
"domain" : "https://h5.demo.coreshop.com.cn/",
"router" : {
"base" : "./",
"mode" : "hash"
},
"template" : "index.html",
"devServer" : {
"port" : 80,
"disableHostCheck" : true,
"https" : true
},
"sdkConfigs" : {
"maps" : {
"qqmap" : {
"key" : "XXXXX-XXXXX-XXXXX-XXXXX-XXXXX-XXXXX"
}
}
},
"optimization" : {
"treeShaking" : {
"enable" : false
}
}
},
"appid": ""
},
"mp-qq": {
"setting": {
"es6": true,
"postcss": true,
"minified": true
"mp-toutiao" : {
"setting" : {
"es6" : true,
"postcss" : true,
"minified" : true
},
"appid" : ""
},
"optimization": {
"subPackages": true
}
},
"mp-alipay": {},
"mp-baidu": {}
"mp-qq" : {
"setting" : {
"es6" : true,
"postcss" : true,
"minified" : true
},
"optimization" : {
"subPackages" : true
}
},
"mp-alipay" : {},
"mp-baidu" : {}
}
CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
+1 -5
View File
@@ -11,7 +11,7 @@
<!--首页模块化组合组件-->
<coreshopPage :coreshopdata="pageData"></coreshopPage>
<!--版权组件-->
<copyright v-if="copy"></copyright>
<copyright></copyright>
<!--客服组件-->
<!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
<view class="floatingButton" @click="showChat()">
@@ -65,14 +65,10 @@
pageCode: 'mobile_home', //页面布局编码
//userInfo: {}, // 用户信息
kefupara: '', //客服传递资料
copy: false,
shareUrl: '/pages/share/jump/jump',
modalShow: true,
};
},
updated() {
this.copy = true;
},
computed: {
...mapState({
hasLogin: state => state.hasLogin,
CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
+6 -2
View File
@@ -226,7 +226,8 @@
</view>
</view>
<!--版权组件-->
<copyright></copyright>
<!-- 登录提示 -->
<coreshop-login-modal></coreshop-login-modal>
</view>
@@ -235,9 +236,12 @@
<script>
import { commonUse, articles } from '@/common/mixins/mixinsHelper.js';
import { mapMutations, mapActions, mapState } from 'vuex';
import copyright from '@/components/coreshop-copyright/coreshop-copyright.vue';
export default {
mixins: [commonUse, articles],
components: {
copyright
},
data() {
return {
afterSaleNums: 0, //售后数量