Commit 3f5ae249 authored by caimeng's avatar caimeng

花花有米代码提交测试

parent 9acddf70
No preview for this file type
......@@ -2,12 +2,12 @@
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user-hhym.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private-hhym.html\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
"message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"second" : {
"title" : "确认提示",
"message" : "  进入应用前,你需先同意<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user-hhym.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private-hhym.html\">《隐私政策》</a>,否则将退出应用。",
"message" : "  进入应用前,你需先同意<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>,否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
......
No preview for this file type
No preview for this file type
......@@ -40,11 +40,11 @@ export default {
userAgreement: '',
protocols: {
"protocolName": "隐私协议",
"protocolUrl": "https://ddh.yyhock.com/appStatic/protocol/dd-private.html"
"protocolUrl": "https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600"
},
protocolf: {
"protocolName": "用户服务协议",
"protocolUrl": "https://ddh.yyhock.com/appStatic/protocol/dd-user.html"
"protocolUrl": "https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059"
}
}
},
......
......@@ -191,7 +191,9 @@
.i-boxs {
.box-at-home {
// background: #F7FAFF;
box-sizing: border-box;
padding-top: 20rpx;
background: #FBFBFB;
.main-box {
display: flex;
......
......@@ -43,8 +43,7 @@
<view v-if="index['shortcutList']" class="i-list">
<template v-for="(item, index) in JSON.parse(index['shortcutList'])">
<view class='mian-item' v-if="item.tager !== 'uni:/subPackage/indexfinance/index,tab'"
:key="item.id" @click="jump(item, index, 'diamond')">
<view class='mian-item' @click="jump(item, index, 'diamond')">
<image class='item-img' :src='item.url'></image>
<view class='item-text'>{{ item.name }}</view>
</view>
......
......@@ -186,14 +186,13 @@
}
self.$request('/app/user/login', 'POST', params).then(res => {
console.log('登录返回结果',res.result)
const {userInfo,token} = res.result
if (userInfo) {
const {deviceId} = userInfo
uni.setStorageSync('deviceId', deviceId)
if(deviceId) uni.setStorageSync('deviceId', deviceId)
}
console.log('token',token);
uni.setStorageSync('token', token)
uni.setStorageSync('l-mobile', self.mobile)
self.loginNocheck()
......
iosProfile=/Users/admin/Desktop/ermo/uni-app-ddh-shop/app/dev.mobileprovision
ioscertFile=/Users/admin/Desktop/ermo/uni-app-ddh-shop/app/dev.p12
ioscertPassword=zlUOIlsvWaGaS9DZgwBUlQ==
iosProfile=/Users/admin/Desktop/dev.mobileprovision
ioscertFile=/Users/admin/Desktop/dev.p12
ioscertPassword=HfmgbKS6hY8nrLPDa+l0Vw==
{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/7ea1c380-d482-11ef-96a9-79b078e54842/wgtRoot/__UNI__670BD78/"}
\ No newline at end of file
......@@ -2,12 +2,12 @@
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user-hhym.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private-hhym.html\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
"message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"second" : {
"title" : "确认提示",
"message" : "  进入应用前,你需先同意<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user-hhym.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private-hhym.html\">《隐私政策》</a>,否则将退出应用。",
"message" : "  进入应用前,你需先同意<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>,否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment