From 837185da455354648b3f0b19f289a6fa88476020 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Wed, 31 May 2023 17:43:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BE=93=E5=85=A5=E6=A1=86=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/product/addGoods/singleSpecification.vue | 14 +++++++------- pages/product/components/selectForm.vue | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pages/product/addGoods/singleSpecification.vue b/pages/product/addGoods/singleSpecification.vue index b51bbb2..a9c26ce 100644 --- a/pages/product/addGoods/singleSpecification.vue +++ b/pages/product/addGoods/singleSpecification.vue @@ -39,21 +39,21 @@ { id: 1, label: '售价', - type: 'number', + type: 'digit', model: 'price', holder: '请填写售价' }, { id: 2, label: '成本价', - type: 'number', + type: 'digit', holder: '请填写成本价', model: 'cost' }, { id: 3, label: '原价', - type: 'number', + type: 'digit', holder: '请填写原价', model: 'ot_price' }, @@ -76,28 +76,28 @@ { id: 6, label: '重量', - type: 'number', + type: 'digit', holder: '请输入重量', model: 'weight' }, { id: 7, label: '体积', - type: 'number', + type: 'digit', holder: '请输入体积', model: 'volume' }, { id: 8, label: '佣金（一级）', - type: 'number', + type: 'digit', holder: '请输入一级佣金', model: 'extension_one' }, { id: 8, label: '佣金（二级）', - type: 'number', + type: 'digit', holder: '请输入二级佣金', model: 'extension_two' } diff --git a/pages/product/components/selectForm.vue b/pages/product/components/selectForm.vue index 0dacb56..ffd8bae 100644 --- a/pages/product/components/selectForm.vue +++ b/pages/product/components/selectForm.vue @@ -16,6 +16,9 @@ + + + From 23fc590d6f61fa6d5fd0101adf9c234e2e7253a9 Mon Sep 17 00:00:00 2001 From: cc_zbp <487602586@qq.com> Date: Thu, 1 Jun 2023 09:40:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androidPrivacy.json | 4 +- pages.json | 3 +- pages/nongKe/teach_video/teach_video.vue | 242 ++++++++++++++++++++++- 3 files changed, 239 insertions(+), 10 deletions(-) diff --git a/androidPrivacy.json b/androidPrivacy.json index 92c7e9a..812ca90 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -2,9 +2,7 @@ "version": "1", "prompt": "template", "title": "服务协议与隐私政策", - "message": "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\ - t你可以阅读 < a href = \ - "https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。", + "message": "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志、OAID等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\t你可以阅读 < a href = \"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。", "buttonAccept": "同意并接受", "buttonRefuse": "暂不同意", "second": { diff --git a/pages.json b/pages.json index b4a315e..d24dda6 100644 --- a/pages.json +++ b/pages.json @@ -233,7 +233,8 @@ "style" : { "navigationBarTitleText": "教学视频", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } diff --git a/pages/nongKe/teach_video/teach_video.vue b/pages/nongKe/teach_video/teach_video.vue index 280fa48..2278141 100644 --- a/pages/nongKe/teach_video/teach_video.vue +++ b/pages/nongKe/teach_video/teach_video.vue @@ -1,19 +1,57 @@ \ No newline at end of file