浏览代码

Merge branch 'dev' into AnHuiRelese_4.1.2

tags/安徽版C.4.1.6最终版
meo 6 年前
父节点
当前提交
81656fe582
共有 6 个文件被更改,包括 25 次插入31 次删除
  1. +8
    -8
      ext.json
  2. +4
    -4
      pages/bargain/bargainDatail/bargainDatail.wxss
  3. +3
    -0
      pages/main/spellGroup/index.wxss
  4. +3
    -4
      pages/user/index.wxml
  5. +6
    -14
      pages/user/index.wxss
  6. +1
    -1
      project.config.json

+ 8
- 8
ext.json 查看文件

@@ -1,16 +1,16 @@
{
"extEnable": true,
"extAppid": "wx6a2524a8286d687f",
"extAppid": "wxea71200db93d756b",
"ext": {
"weappId": "wx6a2524a8286d687f",
"name": "富茂链客生产版",
"appVersion": "C.nocar.4.1.3_1",
"weappId": "wxea71200db93d756b",
"name": "富茂客官开发",
"appVersion": "C.3.4.1",
"attr": {
"ifHaveCarModular": "0",
"ifHaveCarModular": "1",
"etcpversion": "release",
"configUrl": "https://c.malls.iformall.com/C/api",
"passCarAppId": "wxc07f9d67923d676d",
"passCarreturnUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
"configUrl": "https://ciformall.youlane.cn/C/api",
"passCarAppId": "wx192b7d2e8dcbefd0",
"passCarreturnUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback"
}
},
"permission": {


+ 4
- 4
pages/bargain/bargainDatail/bargainDatail.wxss 查看文件

@@ -102,7 +102,7 @@ page{

.progress {
width: 519rpx;
padding: 30rpx 84rpx 50rpx;
padding: 30rpx 84rpx;
/* height: 136rpx; */
background: #fff;
border-radius: 15rpx;
@@ -231,7 +231,7 @@ page{
}
.btns .fl{
color: #fff;
background:rgba(255,169,2,1);
background:#FFAF02;
box-shadow:0px 8px 8px 1px rgba(255,169,2,0.32);
}
.goback{
@@ -269,8 +269,8 @@ page{
color: #fff;
line-height: 95rpx;
width: 256rpx;
background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32);
background:linear-gradient(90deg,rgba(229,54,40,1) 0%,rgba(243,75,30,1) 99%);
box-shadow:0px 8px 8px 1px rgba(204,26,13,0.32);
}
.helpDiscount{
display: block;


+ 3
- 0
pages/main/spellGroup/index.wxss 查看文件

@@ -63,7 +63,10 @@
font-size: 24rpx;
color: #000000;
letter-spacing: 0.7rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width:167px;
}

.index-scroll-view .commodity-info-time {


+ 3
- 4
pages/user/index.wxml 查看文件

@@ -78,11 +78,10 @@
<view wx:if="{{flag=='show'}}">版本号:{{appVersion}}</view>
<view wx:if="{{flag=='hidden'}}"></view>
</view>
<view class='of'>
<official-account wx:if="{{canIUse}}" class="gzh"></official-account>
</view>
</view>
<view class='of'>
<official-account wx:if="{{canIUse}}" class="gzh"></official-account>
</view>
<view class='showQrcode' bindtap='hideQrcode' wx:if="{{showQrcode}}">
<view class="canvas-box">
<canvas hidden="{{canvasHidden}}" style="height:500rpx;background:0 0 0 .6;margin-top:10rpx;" canvas-id="mycanvas1" />


+ 6
- 14
pages/user/index.wxss 查看文件

@@ -32,20 +32,10 @@ page{
border-bottom: 6rpx solid #02c0ff;
}

/*
.user-avatar {
padding-right: 30rpx;
width: 126rpx;
height: 126rpx;
border-radius: 16rpx;
overflow: hidden;
border: 1px solid red;
} */

.version {
width: 500rpx;
height: 300rpx;
line-height: 300rpx;
height: 90rpx;
line-height: 90rpx;
text-align: center;
font-size: 30rpx;
color: #999;
@@ -218,9 +208,9 @@ page{
}

.gzh {
display: none;
/* display: none; */
position: absolute;
bottom: 6%;
bottom: 16%;
width: 90%;
left: 0;
right: 0;
@@ -238,6 +228,8 @@ page{

.of {
display: block;
margin-top: 40rpx;
height: 170rpx;
}

.activeimg {


+ 1
- 1
project.config.json 查看文件

@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.2.0",
"appid": "wx453ae0d37f3550d0",
"appid": "wxb11603577a84a86d",
"projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F",
"isGameTourist": false,
"condition": {


正在加载...
取消
保存