Commit 42e557fb authored by Mac's avatar Mac

修改样式

parent 79fa0afa
//app.js //app.js
let md5 = require('utils/md5.js') let md5 = require('utils/md5.js')
let utilMd5 = require('utils/md5_2.js');
App({ App({
// 小程序初始化时 // 小程序初始化时
onLaunch: function(options) {}, onLaunch: function(options) {},
...@@ -43,8 +42,8 @@ App({ ...@@ -43,8 +42,8 @@ App({
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '') let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
wx.request({ wx.request({
// url: 'http://192.168.2.214:8082/api/Common/Post', // url: 'http://192.168.2.214:8082/api/Common/Post',
url: 'http://192.168.2.65:8025/api/Common/Post', //春姐 // url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
// url: 'https://reborn.oytour.com/api/common/post', //线上 url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post', // url: ' http://test.viitto.com/api/common/post',
method: 'POST', method: 'POST',
...@@ -86,8 +85,8 @@ App({ ...@@ -86,8 +85,8 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey) let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({ wx.request({
// url: 'http://efficient.oytour.com/'+ url, //线上 url: 'https://efficient.oytour.com/'+ url, //线上
url: 'http://192.168.2.215:9000/' + url, //测试 亚军 // url: 'http://192.168.2.215:9000/' + url, //测试 亚军
method: 'POST', method: 'POST',
data: { data: {
......
...@@ -58,9 +58,12 @@ ...@@ -58,9 +58,12 @@
</view> </view>
<view class='notice'> <view class='notice'>
<image class='notice_image' bindtap='selectionimg' <view class = 'notice_box' bindtap='selectionimg'>
src="{{selection == false ?'../../../images/product/kuang.png':'../../../images/product/kuang_x.png' }}"></image> <image class='notice_image'
<text class='notice_t'>已查看</text> src="{{selection == false ?'../../../images/product/kuang.png':'../../../images/product/kuang_x.png' }}"></image>
<text class='notice_t'>已查看</text>
</view>
<view class='applicat' bindtap='Applicat' > <view class='applicat' bindtap='Applicat' >
<text class='notice_t_r'>《报名须知》</text> <text class='notice_t_r'>《报名须知》</text>
</view> </view>
......
...@@ -223,6 +223,11 @@ ...@@ -223,6 +223,11 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.notice_box{
display: flex;
flex-direction: row;
align-items: center
}
.notice_t{ .notice_t{
font-size: 12px; font-size: 12px;
color: #333333; color: #333333;
......
...@@ -140,11 +140,9 @@ Page({ ...@@ -140,11 +140,9 @@ Page({
var list = []; var list = [];
// //获取抽奖列表 // //获取抽奖列表
app.$apit('api/sell/lottery/getB2bTaskLottery', {}, groupId, uid, token, secretKey).then(res => { app.$apit('api/sell/lottery/getB2bTaskLottery', {}, groupId, uid, token, secretKey).then(res => {
console.log(res.lotteryAwardItem)
let a = res.lotteryRules ; let a = res.lotteryRules ;
let b = a.replace(/<p>/g, '\n'); let b = a.replace(/<p>/g, '\n');
let c = b.replace(/[</p>]/g, '') let c = b.replace(/[</p>]/g, '')
console.log(c)
this.setData({ this.setData({
lotteryId: res.id, lotteryId: res.id,
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
<view class='page__bd'> <view class='page__bd'>
<view class='header'> <view class='header'>
<view class='header_check'> <view class='header_check'>
<!-- <navigator url='SametradeZW/SametradeZW'>
<text class='header_check_in_text'>占位跳转临时使用</text>
</navigator> -->
<navigator url="productCheck/productCheck" class='header_check_in' hover-class="none"> <navigator url="productCheck/productCheck" class='header_check_in' hover-class="none">
<text class='header_check_in_text'>目的地、旅游路线</text> <text class='header_check_in_text'>目的地、旅游路线</text>
<image class='header_check_in_image' src='../../images/product/product_ico_search.png'></image> <image class='header_check_in_image' src='../../images/product/product_ico_search.png'></image>
......
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