删除相关元素;更换生产环境;优化分享接口;

master
santaner 11 months ago
parent f012d1e350
commit c187bec574
  1. 4
      api/api.js
  2. 2
      components/home/index.vue
  3. 4
      components/productWindow/index.vue
  4. 3
      config/app.js
  5. 4
      pages/goods_details/index.vue
  6. 4
      pages/goods_details/productWindow.vue
  7. 2
      pages/index/component/goodList.vue
  8. 19
      pages/news_details/index.vue
  9. 4
      pages/users/user_info/index.vue
  10. 8
      pages/users/user_setting/index.vue
  11. 3
      project.config.json

@ -112,8 +112,8 @@ export function getArticleDetails(id){
* @param int id
*
*/
export function shareArticle(type){
return request.get('user/brand',{type:3},{noAuth:true});
export function shareArticle(type,id){
return request.get('user/brand',{type:3,id:id},{noAuth:true});
}
/**
* 手机号+验证码登录接口

@ -3,7 +3,7 @@
<view class="home" style="position:fixed;" :style="{ top: top + 'px', bottom: bottom }" id="right-nav" @touchmove.stop.prevent="setTouchMove">
<view class="homeCon" :class="homeActive === true ? 'on' : ''" v-if="homeActive">
<navigator hover-class='none' url='/pages/index/index' open-type='switchTab' class='iconfont icon-shouye-xianxing'></navigator>
<navigator hover-class='none' url='/pages/order_addcart/order_addcart' open-type='switchTab' class='iconfont icon-caigou-xianxing'></navigator>
<!-- <navigator hover-class='none' url='/pages/order_addcart/order_addcart' open-type='switchTab' class='iconfont icon-caigou-xianxing'></navigator> -->
<navigator hover-class='none' url='/pages/user/index' open-type='switchTab' class='iconfont icon-yonghu1'></navigator>
</view>
<view @click="open" class="pictrueBox">

@ -15,7 +15,7 @@
<text class="num">{{ attr.productSelect.price }}</text>
<text v-if="presell_type === 2">定金¥<text class="num">{{ attr.productSelect.down_price }}</text></text>
</view>
<text class="stock" v-if='isShow'>库存: {{ attr.productSelect.stock }}</text>
<!-- <text class="stock" v-if='isShow'>库存: {{ attr.productSelect.stock }}</text> -->
<text class='stock' v-if="limitNum">限量: {{attr.productSelect.quota_show}}</text>
</view>
<view v-else class="money">
@ -31,7 +31,7 @@
</view>
</view>
<view class="stock_count">
<text class="stock" v-if='isShow'>库存: {{ attr.productSelect.stock }}</text>
<!-- <text class="stock" v-if='isShow'>库存: {{ attr.productSelect.stock }}</text> -->
<text class='stock' v-if="limitNum">限量: {{attr.productSelect.quota_show}}</text>
</view>
</view>

@ -7,7 +7,8 @@ let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' //测试
// let httpApi = 'https://mer.crmeb.net' //生产
let httpApi = 'https://b2b2c.njrenzhou.cn' //生产
// let httpApi = 'https://b2b2c.njrenzhou.cn' //生产
let httpApi = 'https://shop.freelycar.cn' //生产
// 聊天接口修改此字符 小程序聊天要求wss 例如:wss://mer.crmeb.net
// let wsApi = 'ws://192.168.3.20:8324'

@ -77,9 +77,9 @@
{{storeInfo.store_name || ''}}
</view>
<view class='label acea-row row-between-wrapper' :style="{'padding-bottom':coupon.list.length || storeInfo.top_pid?0 :10+'px;'}">
<view class="skeleton-rect">市场价:{{storeInfo.ot_price ? storeInfo.ot_price : ''}}</view>
<!-- <view class="skeleton-rect">市场价:{{storeInfo.ot_price ? storeInfo.ot_price : ''}}</view>
<view class="skeleton-rect">库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
<view class="skeleton-rect">销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
<view class="skeleton-rect">销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view> -->
</view>
<navigator v-if="storeInfo.top_pid" hover-class='none' :url="`/pages/activity/rank/index?cate_id=${storeInfo.top_pid}`" class='label' style="padding-bottom: 10px;">
<view class="rank_list acea-row row-between-wrapper">

@ -13,9 +13,9 @@
</view>
<view class="money">
<view class="acea-row row-middle">
<text class="num">{{ attr.productSelect.price }}</text>
<!-- <text class="num">{{ attr.productSelect.price }}</text> -->
</view>
<text class="stock" v-if='isShow'>库存: {{ attr.productSelect.product_stock }}</text>
<!-- <text class="stock" v-if='isShow'>库存: {{ attr.productSelect.product_stock }}</text> -->
</view>
</view>
</view>

@ -23,7 +23,7 @@
¥
<text>{{ item.price }}</text>
</view>
<view v-if="opriceShow" class="ot-price">¥{{item.ot_price}}</view>
<!-- <view v-if="opriceShow" class="ot-price">¥{{item.ot_price}}</view> -->
</view>
</view>
</view>

@ -108,7 +108,20 @@
});
},
listenerActionSheet() {
this.shareInfoStatus = true
let that = this;
that.shareInfoStatus = true
// shareArticle
shareArticle(3,that.articleInfo.id).then(res =>{
that.$util.Tips({
title:res.message
})
})
.catch(res=>{
that.$util.Tips({
title: res.message
})
})
// alert('test');
},
setShareInfoStatus() {
this.shareInfoStatus = false
@ -123,7 +136,7 @@
success: function() {
// shareArticle
// this.shareArticle(this.articleInfo.id);
// conso.log('test')
conso.log('test');
}
};
this.$wechat.wechatEvevt([
@ -131,7 +144,7 @@
"updateTimelineShareData"
], configAppMessage).then(res => {
this.shareArticle(this.articleInfo.id);
console.log('1');
console.log('test shareArticle');
}).catch(err => {
// console.log(err);
console.log('2');

@ -91,13 +91,13 @@
<text class='iconfont icon-you'></text>
</navigator>
</view>
<view class='item acea-row row-between-wrapper'>
<!-- <view class='item acea-row row-between-wrapper'>
<view>发票管理</view>
<navigator url="/pages/users/user_invoice_list/index" hover-class="none" class='input acea-row row-between-wrapper'>
<input type='text' placeholder="立即前往" disabled='true' class='id'></input>
<text class='iconfont icon-you'></text>
</navigator>
</view>
</view> -->
<view class='item acea-row row-between-wrapper'>
<view>注销账号</view>
<view class='input acea-row row-between-wrapper' @click="changeCancel">

@ -7,7 +7,7 @@
</view>
</view>
<view class="list other">
<view class='item acea-row row-between-wrapper' @click="goMultiple('sys_about_us')">
<!-- <view class='item acea-row row-between-wrapper' @click="goMultiple('sys_about_us')">
<view>关于我们</view>
<text class='iconfont icon-you'></text>
</view>
@ -18,12 +18,12 @@
<view class='item acea-row row-between-wrapper' @click="gorules">
<view>协议规则</view>
<text class='iconfont icon-you'></text>
</view>
</view> -->
<!-- #ifdef MP -->
<view class='item acea-row row-between-wrapper' @click="Setting">
<!-- <view class='item acea-row row-between-wrapper' @click="Setting">
<view>隐私设置</view>
<text class='iconfont icon-you'></text>
</view>
</view> -->
<!-- #endif -->
</view>
</view>

@ -45,7 +45,8 @@
},
"compileType": "miniprogram",
"libVersion": "2.14.3",
"appid": "wx5fb1cc8edb3f8baa",
// "appid": "wx5fb1cc8edb3f8baa",
"appid": "wx00776fef020b31d7",
"projectname": "crmeb_merchant_h5",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},

Loading…
Cancel
Save