diff --git a/.gitignore b/.gitignore index 48920ed..a23ae00 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store +.hbuilderx/ node_modules unpackage/dist unpackage/release diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 660fce7..7d71a76 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -4,6 +4,9 @@ "version" : "0.0", "configurations" : [ { + "app" : { + "launchtype" : "local" + }, "app-plus" : { "launchtype" : "remote" }, @@ -24,7 +27,7 @@ "type" : "uni-app:app-ios" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/manifest.json b/manifest.json index 578110c..172b059 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,9 @@ "src" : "图片路径" } ], - "versionName" : "1.2.75", - "versionCode" : 1275, + "sassImplementationName" : "node-sass", + "versionName" : "1.2.79", + "versionCode" : 1279, "app-plus" : { "compatible" : { "ignoreVersion" : true diff --git a/pages/acupoint/givenDegree.vue b/pages/acupoint/givenDegree.vue index c023e57..3aa14eb 100644 --- a/pages/acupoint/givenDegree.vue +++ b/pages/acupoint/givenDegree.vue @@ -51,7 +51,7 @@ MonList: { title: '阴经', vlue: '属性', - attribute: ['阴经', '属性', '肺经(金)', '脾经(士)', '心(火)', '肾经(水)', '心包经(冬至前相火,冬至后相水)', '肝经(木)'], + attribute: ['阴经', '属性', '肺经(金)', '脾经(土)', '心(火)', '肾经(水)', '心包经(冬至前相火,冬至后相水)', '肝经(木)'], arry: [ ['井', '木', '少商', '隐白', '少冲(母穴)', '涌泉(子穴)', '中冲(冬至前母穴冬至后子穴)', '大敦(本穴)'], ['荥', '火', '鱼际', '大都(母穴)', '少府(本穴)', '然谷(泄井当泄荥)', '劳宫(冬至前本穴)', '行间(子穴)'], @@ -66,12 +66,12 @@ SunList: { title: '阳经', vlue: '属性', - attribute: ['阳经', '属性', '大肠经(金)', '脾经(士)', '心(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'], + attribute: ['阳经', '属性', '大肠经(金)', '脾经(土)', '心(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'], arry: [ ['井', '金', '商阳(本穴)', '厉兑(子穴)', '少泽', '至阴(母穴)', '关冲(冬至后母穴)', '窍阴'], ['荥', '水', '二间(子穴)', '内庭(泄井当泄荥)', '前谷', '通谷(本穴)', '液门(冬至后本穴)', '侠溪(母穴)'], ['俞', '木', '三间', '陷谷', '后匾(母穴)', '束骨(子穴)', '中渚(冬至前回穴,冬至后子穴)', '临泣(本穴)'], - ['经', '水', '阳溪', '解溪(母穴)', '阳谷(本穴)', '昆仑', '支沟(冬至前本穴)', '阳辅(子穴)'], + ['经', '火', '阳溪', '解溪(母穴)', '阳谷(本穴)', '昆仑', '支沟(冬至前本穴)', '阳辅(子穴)'], ['合', '土', '曲池(母穴)', '足三里(本穴)', '小海(子穴)', '委中(补井当补合)', '天井(冬至前子穴)', '阳陵泉'], ['原', '', '合谷', '冲阳', '腕骨', '京骨', '阳池', '丘墟'], ['郄', '', '温溜', '梁丘', '养老', '金门', '会宗', '外丘'], diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue index df3250f..a2656b0 100644 --- a/pages/bookShop/orderList.vue +++ b/pages/bookShop/orderList.vue @@ -5,8 +5,8 @@ - - + {{item.name}} {{map[item.value]}} diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue index 45830a0..f77c2e6 100644 --- a/pages/peanut/home.vue +++ b/pages/peanut/home.vue @@ -529,7 +529,8 @@ // console.log(res, '营销标签列表') if (res.result.length > 0) { this.yingxiaoTags = res.result; - this.getYXproducts(); + const item = this.yingxiaoTags.length > 0 && this.yingxiaoTags[this.yxCurIndex] + this.getYXproducts(item); } // console.log(res) diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa index 856d96c..50de381 100644 Binary files a/unpackage/debug/iOS_debug.ipa and b/unpackage/debug/iOS_debug.ipa differ